Move find_config function into Command
Remove unused definitions
Merge branch 'validate-option'