clean-up some more