First pass on removing of do_shortcode calls