fix bad logic in options parameter validation
remove repeated test - code was invalid after minor change to data structure anyway.