Cleaning up a few dependencies from other scripts to NetworkManager.