various clean-up