Refactor methods to consider organizaitonal_permission.deleted_at