Removes duplication between clients of filechoosers.
Cleanup
Fixes compile error