A little more cleanup ...