Little more cleanup.