Moodytunes cleanup