remove all cruft for draft