Clean up network APIs
Clean up network APIs