Is there any need to keep this commented-out code ?