Serious cleanup of networking stuff