Removed a lot of unused classes