some more clean-up