[us-commits] [ehb54/ultrascan3] b2c3bf: Cleanup