Removed unneeded classes and files