various clean-ups