JRH - K471 - Clean up draft creation using new API