Also remove shortcode_class