Cleanup unused code in NetworkManager