Remove one piece of leftover from the giant merge

No functional change, just cleaning up the repo.