draft cleanup