Removes shortcode from main class
Cleans up if statements and fixes shorttags