Clean up in NetworkResources.
Formatting
Updated to use capabilities instead of deprecated methods
Fixed merge