Remove some dead code leftover from the merge.