finish removing more old stuff