Both a draft and non-draft can exist, fix #1624
Remove draft on delete, fix #1625