diff --git a/source/common/execution_states.cc b/source/common/execution_states.cc
index 11e8c3fe7..021c3419b 100644
--- a/source/common/execution_states.cc
+++ b/source/common/execution_states.cc
@@ -91,10 +91,9 @@ get_sstate_description(int sstate) {
            {"entry is missing in password file",                 SSTATE_PASSWD_MISSING},
            {"wrong password",                                    SSTATE_PASSWD_WRONG},
            {"communicating with Cluster Scheduler Helper Service", SSTATE_HELPER_SERVICE_ERROR},
-           {"before job in Cluster Scheduler Helper Service",    SSTATE_HELPER_SERVICE_BEFORE_JOB},
+           {"before job in Cluster Scheduler Helper Service",      SSTATE_HELPER_SERVICE_BEFORE_JOB},
            {"checking configured daemons",                       SSTATE_CHECK_DAEMON_CONFIG},
-           {"qmaster enforced h_rt limit",                       SSTATE_QMASTER_ENFORCED_LIMIT},
-           {"execvp call failed, script or shell not found",     SSTATE_EXEC_FAILED}
+           {"qmaster enforced h_rt limit",                       SSTATE_QMASTER_ENFORCED_LIMIT}
    };
 
    for (i = 0; i < sizeof(state_message) / sizeof(struct _state_message); i++) {
diff --git a/source/common/execution_states.h b/source/common/execution_states.h
index 98cd200b2..e03e68a0b 100644
--- a/source/common/execution_states.h
+++ b/source/common/execution_states.h
@@ -96,7 +96,6 @@
 #define SSTATE_CHECK_DAEMON_CONFIG 36
 #define SSTATE_QMASTER_ENFORCED_LIMIT 37
 #define SSTATE_ADD_GRP_SET_ERROR   38
-#define SSTATE_EXEC_FAILED         39
 
 #define MAX_SSTATE SSTATE_ADD_GRP_SET_ERROR
 
diff --git a/source/daemons/execd/reaper_execd.cc b/source/daemons/execd/reaper_execd.cc
index 145121409..39494634a 100644
--- a/source/daemons/execd/reaper_execd.cc
+++ b/source/daemons/execd/reaper_execd.cc
@@ -712,7 +712,6 @@ static int clean_up_job(lListElem *jr, int failed, int shepherd_exit_status,
    case SSTATE_PROLOG_FAILED:
    case SSTATE_BEFORE_PESTART:
    case SSTATE_PESTART_FAILED:
-   case SSTATE_EXEC_FAILED:
       general_failure = GFSTATE_QUEUE;
       lSetUlong(jr, JR_general_failure, general_failure);
       job_related_adminmail(EXECD, jr, is_array, job_owner);
diff --git a/source/daemons/shepherd/builtin_starter.cc b/source/daemons/shepherd/builtin_starter.cc
index 84942711f..4411de3a8 100644
--- a/source/daemons/shepherd/builtin_starter.cc
+++ b/source/daemons/shepherd/builtin_starter.cc
@@ -1441,7 +1441,7 @@ int use_starter_method /* If this flag is set the shellpath contains the
 
             /* most of the problems here are related to the shell
                i.e. -S /etc/passwd */
-            shepherd_state = SSTATE_EXEC_FAILED;
+            shepherd_state = SSTATE_NO_SHELL;
             /* EXIT HERE IN CASE IF FAILURE */
             shepherd_error(1, failed_str);
          }
diff --git a/source/libs/gdi/sge_gdi.cc b/source/libs/gdi/sge_gdi.cc
index 95f615bae..dbeab7233 100644
--- a/source/libs/gdi/sge_gdi.cc
+++ b/source/libs/gdi/sge_gdi.cc
@@ -370,7 +370,7 @@ lList *sge_gdi(u_long32 target, u_long32 cmd, lList **lpp, lCondition *cp, lEnum
 
 int sge_gdi_multi(lList **alpp, int mode, u_long32 target, u_long32 cmd, lList **lp, lCondition *cp, lEnumeration *enp,
                    state_gdi_multi *state, bool do_copy) {
-   DENTER(TOP_LAYER);
+   DENTER(GDI_LAYER);
    int ret;
 
    /*