Removed uneeded classes, cleaned up a bit more