Is all this commented-out code necessary?