cleaned up some more old stuff