Get rid of some commented-out crud