removed unnecessary rm's