Update twitch api usage and cleanup