Removed lots of commented-out code.