Removing a lot unused classes