Removed junk files from bad merge