Remove defunct draw_shapes code