Remove Empty Shortcodes: And Do It in All the Places

Remove Empty Shortcodes effectively strips out inactive shortcodes and it worked. It just didn't work everywhere. And now it does.