Revert "Additional Context information when Logging"

This reverts commit 731cb3e228e167767736ab878debf07458733588.