Add missing clean-up code.