clean up logging

Change-Id: Ida013961f3804bfa2e3745d0e389606555636d0f
Merge "clean up logging"