Clean up admin organizations

Edit, create