Is it time to just delete this commented-out code?