Deleted some old commented out code.
Did first rework of sender side refactoring.
more Refactoring.