A few small cleanups of commented-out code