should this commented out code be removed?