diff --git a/etc/profile.d/25-slurm.csh b/etc/profile.d/25-slurm.csh
index 9edb71667db..8180e1ab83d 100755
--- a/etc/profile.d/25-slurm.csh
+++ b/etc/profile.d/25-slurm.csh
@@ -26,16 +26,12 @@
 #==============================================================================
 set path=($path /opt/flight/opt/slurm/bin)
 
-alias flight_slurm_exit 'set newpath=()\
-  foreach pval ( $path )\
-    if ($pval != "/opt/flight/opt/slurm/bin") then\
-      set newpath=($newpath $pval)\
-    endif\
-  end\
-  set path=($newpath)\
-  unset newpath'
+alias | grep "^flight_HELPER_remove_path" >/dev/null
+if ( $? == 0 ) then
+  alias flight_SLURM_exit set 'path=`flight_HELPER_remove_path /opt/flight/opt/slurm/bin`'
 
-if ($?flight_DEFINES) then
-  setenv flight_DEFINES "${flight_DEFINES} flight_slurm_exit"
-  setenv flight_DEFINES_exits "flight_slurm_exit ${flight_DEFINES_exits}"
+  if ($?flight_DEFINES) then
+    setenv flight_DEFINES "${flight_DEFINES} flight_SLURM_exit"
+    setenv flight_DEFINES_exits "${flight_DEFINES_exits} flight_SLURM_exit"
+  endif
 endif
diff --git a/etc/profile.d/25-slurm.sh b/etc/profile.d/25-slurm.sh
index 946da7f5f85..cc769ddb682 100755
--- a/etc/profile.d/25-slurm.sh
+++ b/etc/profile.d/25-slurm.sh
@@ -26,11 +26,13 @@
 #==============================================================================
 export PATH=$PATH:/opt/flight/opt/slurm/bin
 
-flight_slurm_exit() {
-  PATH=$(echo "$PATH" | sed 's,:/opt/flight/opt/slurm/bin,,g')
-}
+if [ "$(type -t flight_HELPER_remove_path)" == "function" ]; then
+  flight_SLURM_exit() {
+    PATH=$(flight_HELPER_remove_path /opt/flight/opt/slurm/bin)
+  }
 
-if [ "${flight_DEFINES}" ]; then
-  flight_DEFINES+=(flight_slurm_exit)
-  flight_DEFINES_exits=(flight_slurm_exit "${flight_DEFINES_exits[@]}")
+  if [ "${flight_DEFINES}" ]; then
+    flight_DEFINES+=(flight_SLURM_exit)
+    flight_DEFINES_exits+=(flight_SLURM_exit)
+  fi
 fi