diff --git a/Golden_Repo/e/ESMF/ESMF-8.4.0-intel-para-2022a.eb b/Golden_Repo/e/ESMF/ESMF-8.4.0-ipsmpi-2022a.eb
similarity index 95%
rename from Golden_Repo/e/ESMF/ESMF-8.4.0-intel-para-2022a.eb
rename to Golden_Repo/e/ESMF/ESMF-8.4.0-ipsmpi-2022a.eb
index 47de5e24db9b4daee8f0e92482e8297565b4d49b..a97dae28aec67e2843ae6ed8c44389377ff40031 100644
--- a/Golden_Repo/e/ESMF/ESMF-8.4.0-intel-para-2022a.eb
+++ b/Golden_Repo/e/ESMF/ESMF-8.4.0-ipsmpi-2022a.eb
@@ -5,7 +5,7 @@ homepage = 'https://www.earthsystemcog.org/projects/esmf/'
 description = """The Earth System Modeling Framework (ESMF) is a suite of software tools for developing
  high-performance, multi-component Earth science modeling applications."""
 
-toolchain = {'name': 'intel-para', 'version': '2022a'}
+toolchain = {'name': 'ipsmpi', 'version': '2022a'}
 toolchainopts = {'usempi': True, 'openmp': True, 'cstd': 'c++11', 'pic': True}
 
 source_urls = ['https://github.com/esmf-org/esmf/archive/']
diff --git a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-intel-para-2022a.eb b/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-intel-para-2022a.eb
deleted file mode 100644
index d06a4c96e7db296907d320fc6cdc107c706fd0a6..0000000000000000000000000000000000000000
--- a/Golden_Repo/n/netCDF-C++4/netCDF-C++4-4.3.1-intel-para-2022a.eb
+++ /dev/null
@@ -1,25 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'netCDF-C++4'
-version = '4.3.1'
-
-homepage = 'https://www.unidata.ucar.edu/software/netcdf/'
-description = """NetCDF (network Common Data Form) is a set of software libraries
- and machine-independent data formats that support the creation, access, and sharing of array-oriented
- scientific data."""
-
-toolchain = {'name': 'intel-para', 'version': '2022a'}
-toolchainopts = {'pic': True}
-
-source_urls = ['https://github.com/Unidata/netcdf-cxx4/archive/']
-sources = ['v%(version)s.tar.gz']
-checksums = ['e3fe3d2ec06c1c2772555bf1208d220aab5fee186d04bd265219b0bc7a978edc']
-
-dependencies = [('netCDF', '4.9.0')]
-
-sanity_check_paths = {
-    'files': ['include/netcdf', 'lib/libnetcdf_c++4.a', 'lib/libnetcdf_c++4.%s' % SHLIB_EXT],
-    'dirs': [],
-}
-
-moduleclass = 'data'