Remove old classes (should have done that earlier instead of
renaming...)