Remove some unused cruft.