Removed some more junk files before the merge