Eliminate some commented-out code