[NetworkSetup] cleanup