Remove some hunks of unused and disabled code cruft.