Improve org remove