Removed unnecessary files after merge