more clean-ups