Remove OrganizationRole class