Even more clean-up