Further clean-ups to network tasks.