Add wildcard and remove unused stuff