Removed custom shortcode and will be hooked later