Remove some more unused legacy cruft...