Cleaning up draft code.