more old stuff removed that was breaking it