more cleanup private