remove some more cruff