some clean-ups