Remove some done TODOs
Remove Connection class and rename all convenience methods, massive
Add common superclass for not-final consumers – Mediator