cleaned up networking