Removed a bunch of class