fixes 'only vars by ref' notice and 'missing param2' warning in draft_cleanup methods