more cleanup (#180)