Remove some unused cruft