cleanup logging
60 files changed