Major cleanup!