Deleted files leftover from merges