Remove disabled code cruft.