Added code to clean up orgs