Remove commented-out code
Document old code