Minor cleanup of network manager and items.