A little more cleanup.