Remove some classes; use new classes