Remove some unused legacy cruft