diff --git a/RotationSolver.Basic/Configuration/OtherConfiguration.cs b/RotationSolver.Basic/Configuration/OtherConfiguration.cs
index 857a67426..f8ff809ae 100644
--- a/RotationSolver.Basic/Configuration/OtherConfiguration.cs
+++ b/RotationSolver.Basic/Configuration/OtherConfiguration.cs
@@ -1,4 +1,5 @@
 using ECommons.DalamudServices;
+using RotationSolver.Basic.Configuration.Timeline;
 
 namespace RotationSolver.Basic.Configuration;
 
@@ -30,23 +31,14 @@ public static void Init()
         }
 
         Task.Run(() => InitOne(ref DangerousStatus, nameof(DangerousStatus)));
-
         Task.Run(() => InitOne(ref PriorityStatus, nameof(PriorityStatus)));
-
         Task.Run(() => InitOne(ref InvincibleStatus, nameof(InvincibleStatus)));
-
         Task.Run(() => InitOne(ref NoHostileNames, nameof(NoHostileNames)));
-
         Task.Run(() => InitOne(ref NoProvokeNames, nameof(NoProvokeNames)));
-
         Task.Run(() => InitOne(ref AnimationLockTime, nameof(AnimationLockTime)));
-
         Task.Run(() => InitOne(ref HostileCastingArea, nameof(HostileCastingArea)));
-
         Task.Run(() => InitOne(ref HostileCastingTank, nameof(HostileCastingTank)));
-
         Task.Run(() => InitOne(ref BeneficialPositions, nameof(BeneficialPositions)));
-
         Task.Run(() => InitOne(ref RotationSolverRecord, nameof(RotationSolverRecord), false));
     }
 
diff --git a/RotationSolver.Basic/Rotations/Basic/GunbreakerRotation.cs b/RotationSolver.Basic/Rotations/Basic/GunbreakerRotation.cs
index 44ce288a1..c9917dee6 100644
--- a/RotationSolver.Basic/Rotations/Basic/GunbreakerRotation.cs
+++ b/RotationSolver.Basic/Rotations/Basic/GunbreakerRotation.cs
@@ -143,11 +143,6 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
         return base.EmergencyAbility(nextGCD, out act);
     }
 
-    static partial void ModifyRoughDividePvE(ref ActionSetting setting)
-    {
-        setting.TargetType = TargetType.Move;
-    }
-
     /// <inheritdoc/>
     [RotationDesc(ActionID.RoughDividePvE)]
     protected sealed override bool MoveForwardAbility(out IAction? act)
diff --git a/RotationSolver.Basic/Rotations/Basic/MonkRotation.cs b/RotationSolver.Basic/Rotations/Basic/MonkRotation.cs
index 1bf588125..13fcd6495 100644
--- a/RotationSolver.Basic/Rotations/Basic/MonkRotation.cs
+++ b/RotationSolver.Basic/Rotations/Basic/MonkRotation.cs
@@ -98,11 +98,6 @@ static partial void ModifyRiddleOfFirePvE(ref ActionSetting setting)
         };
     }
 
-    static partial void ModifyThunderclapPvE(ref ActionSetting setting)
-    {
-        setting.TargetType = TargetType.Move;
-    }
-
     /// <inheritdoc/>
     [RotationDesc(ActionID.ThunderclapPvE)]
     protected sealed override bool MoveForwardAbility(out IAction? act)
diff --git a/RotationSolver.Basic/Rotations/Basic/NinjaRotation.cs b/RotationSolver.Basic/Rotations/Basic/NinjaRotation.cs
index b0695f51c..306b17c8c 100644
--- a/RotationSolver.Basic/Rotations/Basic/NinjaRotation.cs
+++ b/RotationSolver.Basic/Rotations/Basic/NinjaRotation.cs
@@ -139,11 +139,6 @@ static partial void ModifyKatonPvE(ref ActionSetting setting)
         };
     }
 
-    static partial void ModifyShukuchiPvE(ref ActionSetting setting)
-    {
-        setting.TargetType = TargetType.Move;
-    }
-
     /// <inheritdoc/>
     [RotationDesc(ActionID.ShukuchiPvE)]
     protected sealed override bool MoveForwardAbility(out IAction? act)
diff --git a/RotationSolver.Basic/Rotations/Basic/ReaperRotation.cs b/RotationSolver.Basic/Rotations/Basic/ReaperRotation.cs
index b556528bc..fea514818 100644
--- a/RotationSolver.Basic/Rotations/Basic/ReaperRotation.cs
+++ b/RotationSolver.Basic/Rotations/Basic/ReaperRotation.cs
@@ -183,7 +183,6 @@ static partial void ModifyHarpePvE(ref ActionSetting setting)
     static partial void ModifyHellsIngressPvE(ref ActionSetting setting)
     {
         setting.StatusProvide = [StatusID.EnhancedHarpe, StatusID.Bind];
-        setting.TargetType = TargetType.Move;
     }
 
     static partial void ModifyHellsEgressPvE(ref ActionSetting setting)
diff --git a/RotationSolver.Basic/Rotations/Basic/RedMageRotation.cs b/RotationSolver.Basic/Rotations/Basic/RedMageRotation.cs
index 6de795467..aad5daa02 100644
--- a/RotationSolver.Basic/Rotations/Basic/RedMageRotation.cs
+++ b/RotationSolver.Basic/Rotations/Basic/RedMageRotation.cs
@@ -141,11 +141,6 @@ protected sealed override bool HealSingleGCD(out IAction? act)
         return base.HealSingleGCD(out act);
     }
 
-    static partial void ModifyCorpsacorpsPvE(ref ActionSetting setting)
-    {
-        setting.TargetType = TargetType.Move;
-    }
-
     /// <inheritdoc/>
     [RotationDesc(ActionID.CorpsacorpsPvE)]
     protected sealed override bool MoveForwardAbility(out IAction? act)
diff --git a/RotationSolver.Basic/Rotations/Basic/SageRotation.cs b/RotationSolver.Basic/Rotations/Basic/SageRotation.cs
index 4539eca0e..c249a78fd 100644
--- a/RotationSolver.Basic/Rotations/Basic/SageRotation.cs
+++ b/RotationSolver.Basic/Rotations/Basic/SageRotation.cs
@@ -124,11 +124,6 @@ static partial void ModifyPepsisPvE(ref ActionSetting setting)
         };
     }
 
-    static partial void ModifyIcarusPvE(ref ActionSetting setting)
-    {
-        setting.TargetType = TargetType.Move;
-    }
-
     /// <inheritdoc/>
     [RotationDesc(ActionID.IcarusPvE)]
     protected sealed override bool MoveForwardAbility(out IAction? act)
diff --git a/RotationSolver.Basic/Rotations/Basic/SamuraiRotation.cs b/RotationSolver.Basic/Rotations/Basic/SamuraiRotation.cs
index 3a2d40b61..3ad0bfead 100644
--- a/RotationSolver.Basic/Rotations/Basic/SamuraiRotation.cs
+++ b/RotationSolver.Basic/Rotations/Basic/SamuraiRotation.cs
@@ -148,7 +148,6 @@ static partial void ModifyHissatsuShintenPvE(ref ActionSetting setting)
 
     static partial void ModifyHissatsuGyotenPvE(ref ActionSetting setting)
     {
-        setting.TargetType = TargetType.Move;
         setting.ActionCheck = () => Kenki >= 10;
     }
 
diff --git a/RotationSolver.Basic/Rotations/Basic/WarriorRotation.cs b/RotationSolver.Basic/Rotations/Basic/WarriorRotation.cs
index 18499ae07..8e8f0db98 100644
--- a/RotationSolver.Basic/Rotations/Basic/WarriorRotation.cs
+++ b/RotationSolver.Basic/Rotations/Basic/WarriorRotation.cs
@@ -120,11 +120,6 @@ static partial void ModifyChaoticCyclonePvP(ref ActionSetting setting)
         setting.StatusNeed = [StatusID.NascentChaos_1992];
     }
 
-    static partial void ModifyOnslaughtPvE(ref ActionSetting setting)
-    {
-        setting.TargetType = TargetType.Move;
-    }
-
     /// <inheritdoc/>
     protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
     {
diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs
index 118b99bf4..fefd7aeb2 100644
--- a/RotationSolver/Updaters/ActionUpdater.cs
+++ b/RotationSolver/Updaters/ActionUpdater.cs
@@ -70,6 +70,7 @@ internal static IBaseAction? NextGCDAction
             }
         }
     }
+
     internal static IAction? WrongAction { get; set; }
     static readonly Random _wrongRandom = new();