Get rid of commented-out, old code