diff --git a/Custom_Hooks/eb_hooks.py b/Custom_Hooks/eb_hooks.py
index b96dfd0b7f46edac0311075c33decb13a77af9e8..befaef523c6dcb25d5211f5dcf60460fb351ad95 100644
--- a/Custom_Hooks/eb_hooks.py
+++ b/Custom_Hooks/eb_hooks.py
@@ -8,7 +8,7 @@ from easybuild.tools.build_log import EasyBuildError, print_warning
 from easybuild.tools.toolchain.toolchain import SYSTEM_TOOLCHAIN_NAME
 from easybuild.toolchains.compiler.systemcompiler import TC_CONSTANT_SYSTEM
 
-SUPPORTED_COMPILERS = ["GCC", "iccifort", "intel-compilers", "NVHPC", "PGI", "GCCcore"]
+SUPPORTED_COMPILERS = ["GCC", "iccifort", "intel-compilers", "NVHPC", "PGI"]
 SUPPORTED_MPIS = ["impi", "psmpi", "OpenMPI", "MVAPICH2"]
 # Maintain toplevel list for easy use of --try-toolchain
 SUPPORTED_TOPLEVEL_TOOLCHAIN_FAMILIES = [
@@ -38,6 +38,7 @@ SUPPORTED_MPI_TOOLCHAIN_FAMILIES = [
 SUPPORTED_TOOLCHAIN_FAMILIES = (
     SUPPORTED_COMPILERS
     + ["gcccoremkl"]
+    + ["GCCcore"]
     + SUPPORTED_MPI_TOOLCHAIN_FAMILIES
     + SUPPORTED_TOPLEVEL_TOOLCHAIN_FAMILIES
 )
@@ -257,24 +258,3 @@ def pre_ready_hook(self, *args, **kwargs):
                 path_to_ec,
             )
             exit(1)
-
-
-def end_hook(*args, **kwargs):
-    # If the user is part of the development group and the installation is systemwide,
-    # rebuild the system cache
-    "Refresh Lmod's cache"
-
-    if "stages" in install_path().lower():
-        user = os.getenv("USER")
-        if user == "swmanage":
-            cmd = (
-                "/gpfs/software/juwels/configs/update_system_module_cache.sh"
-            )  # Need to make this generic
-            if os.path.isfile(cmd):
-                print("== Refreshing Lmod's cache...")
-                run_cmd(cmd, log_all=True)
-    else:
-        # Otherwise do nothing, no need to build a user cache, it's very unlikely they 
-        # will have loads of modules
-        pass
-