more cleanup of logging