Should this commented out code be removed?