deleted old files that came with a merge for some reason