Move socket syncing into socket service