Revert "Minor cleanup of network manager and items."

This reverts commit 5074312850c9a9de18d9c8b5ce8e9cda920bb680.
Minor cleanup of network manager and items.