Removed more unneeded files and classes