more cleanup 3