removed unnecessary code from organization model