Massive moodbar-code cleanup