Remove commented-out code