Remove some commented-out code that I am quite sure is never coming
back...