Is this commented out code still needed?