yet more clean-up