Removed a lot of unnecessary classes