Removed unnecessary files
Finished with merge