Remove some files from the merge.

There were some old test files that made it through the merge that aren’t needed anymore.