Moved over code for shortcode. Removed any PRO checks I found