Removed more unnecessary files after merge