Remove rights_and_permissions dependency