some clean-up