Changed delete org scenario