still more clean-up