a bit more cleanup.