Remove dependancy to options-resolver