Cleanup logger

Change-Id: Ie450b0224d9cd7242195225908e156f55d5d3bae