draft clean-up