Remove some more useless legacy cruft...