more cleanup again