remove some more of my mess