Remove classes, they make so much trouble