[us-commits] [ehb54/ultrascan3] 8c940b: dad : options cleanup