Remove ref to unused fields.
Fix dragging of selected (see #10554)