draft clean up