more cleanup: