Remove unnecessary list
Implement validating options
Merge branch 'validate-option'