Remove commented-out code?