refactoring to make sure only resources referencing an organisation can block removal of abuse-c. Check if integration tests keep running