remove extended keyword when cleaning up acl
honor local_only flag