Remove draw_rubberband and minor cleanup