some more cleanup.