removing more wildcards