Fixes BZ1129635 - Deleting a resource and creation a new one wont lead to conflicts

refactored organization delete
Would this catch non-user errors like an error in the code? If so, we probably don't want to raise a `BadRequest` in those cases.