Remove some old cruft that has been merged in.