acu170108 A little more cleanup