Draft cleanup.