-code cleanup, in particular moving towards using client context for storing TCP...