* more cleanup