Remove commented out code.
Fix editing dialog (see #10706)