Some more clean-up