Clean up draft code