James C - more draw cleanup