Clean up templates and shortcodes