Cleanup receiver/lib
Cleanup sender part 1