More Draw clean up