- some clean-up