more cleanup 2