Log module is present but not used

[northwestwitch]

Code is there but doesn't look like it's invoked from anywhere.

When fixing this, unify also with the code from #4830