Another clean-up