Moved remaining logger calls onto emissions