Restructuring/thread local log context

Necessary clean-ups before new log implementation