Continue elimination of wildcard imports