Removing more wildcards