S2S comms simplified

Lots of code removed
UUID updates made far more unique