Removing organization when that's all there is