Should this commented out code still be here?