Refactor to implement organizational_permission.deleted_at