first cleanup draft