Fix 199 cleanup networking

Addresses #199