Remove all dependence from organizations plugin