Revert "Finalise Socket Comms improvements"

This reverts commit 1702a770c4a074baff056c76d4b7f1f1eacca630.