a few more cleanup