clean up of all logging
Merge remote-tracking branch 'github/master'