Remove config validation, refactor with iterator