Draft cleanup.
Draft cleanup.