Fixes #6187,BZ1125358 - Dynflowize environment delete, refactor

refactored organization delete