Merge "Finish the TODO re: deleting drafts"