removed wildcards from rm's