Cleanup/rework for networking.