misc clean-up