misc clean-ups