Merge "Remove unused code to instantiate bpfNetMaps" into main