kill some commented-out code