Removed a lot of commented-out code.