Delete unneeded files that went through the merge.