eb-8038: cleaned up logging