Takes take care of some left over references to Draw.