Remove extra classes