Remove Twitch shortcode, bug fix