Removed classes that weren't necessary for the core functionality