more gon, remove depencies on delete, set back orgs