Cleaned up the files after merge