diff --git a/src/modules/idler.cpp b/src/modules/idler.cpp
index 5679001..8eb1feb 100644
--- a/src/modules/idler.cpp
+++ b/src/modules/idler.cpp
@@ -120,9 +120,6 @@ bool Idler::Step() {
         dbg_logic_P(PSTR("Homing Idler Forward"));
         PerformHomeForward();
         return false;
-    case HomeMoveAwayFromForward:
-        PerformMoveAwayFromForward();
-        return false;
     case HomeBack:
         dbg_logic_P(PSTR("Homing Idler Back"));
         PerformHomeBack();
diff --git a/src/modules/movable_base.cpp b/src/modules/movable_base.cpp
index d4818fe..afc1b19 100644
--- a/src/modules/movable_base.cpp
+++ b/src/modules/movable_base.cpp
@@ -47,16 +47,6 @@ void MovableBase::PerformHomeForward() {
         mm::motion.StallGuardReset(axis);
         mm::motion.AbortPlannedMoves(axis, true);
         PlanHomingMoveBack();
-        state = HomeMoveAwayFromForward;
-    } else if (mm::motion.QueueEmpty(axis)) {
-        HomeFailed();
-    }
-}
-
-void MovableBase::PerformMoveAwayFromForward() {
-    // need to wait for the TMC to report "no-stall", otherwise we may get stuck in the forward stalled position forever
-    if (!mm::motion.StallGuard(axis)) {
-        mm::motion.StallGuardReset(axis);
         state = HomeBack;
     } else if (mm::motion.QueueEmpty(axis)) {
         HomeFailed();
diff --git a/src/modules/movable_base.h b/src/modules/movable_base.h
index 999ff36..442ba96 100644
--- a/src/modules/movable_base.h
+++ b/src/modules/movable_base.h
@@ -15,7 +15,6 @@ public:
         Ready = 0, // intentionally set as zero in order to allow zeroing the Idler structure upon startup -> avoid explicit initialization code
         Moving,
         HomeForward,
-        HomeMoveAwayFromForward,
         HomeBack,
         TMCFailed,
         HomingFailed
@@ -99,7 +98,6 @@ protected:
     void PerformMove();
 
     void PerformHomeForward();
-    void PerformMoveAwayFromForward();
     void PerformHomeBack();
 
     void HomeFailed();
diff --git a/src/modules/selector.cpp b/src/modules/selector.cpp
index 6184f9d..0c1cc70 100644
--- a/src/modules/selector.cpp
+++ b/src/modules/selector.cpp
@@ -91,9 +91,6 @@ bool Selector::Step() {
         dbg_logic_P(PSTR("Homing Selector Forward"));
         PerformHomeForward();
         return false;
-    case HomeMoveAwayFromForward:
-        PerformMoveAwayFromForward();
-        return false;
     case HomeBack:
         dbg_logic_P(PSTR("Homing Selector"));
         PerformHomeBack();