Remove some massively obsolete cruft...