Clean some more dead code from draw.