Additional clean-up