Network: fixed by syncing with upstream; more improvements by removals.