Removed excess files and cleaned up code

No functionality changed