open-file-selector: cleanup and simplifications