more cleanup in main