Remove registration, use wildcards in client