diff --git a/package-lock.json b/package-lock.json
index d28cfc3f8b..674b04c706 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,6 +52,9 @@
 				"typescript-formatter": "^7.2.2",
 				"vite": "^5.0.0",
 				"vite-plugin-checker": "^0.6.4"
+			},
+			"engines": {
+				"node": ">=20"
 			}
 		},
 		"node_modules/@aashutoshrathi/word-wrap": {
diff --git a/proto/paladin.proto b/proto/paladin.proto
index 1325ab8b89..ad6f14e06a 100644
--- a/proto/paladin.proto
+++ b/proto/paladin.proto
@@ -80,15 +80,12 @@ enum PaladinSeal {
 	NoSeal = 0;
 	Righteousness = 1;
 	Command = 2;
-	Martyrdom = 3;
 }
 
 message PaladinOptions {
 	PaladinSeal primarySeal = 1;
 	PaladinAura aura = 2;
-	bool IsUsingDivineStormStopAttack = 4;
 	bool IsUsingJudgementStopAttack = 5;
-	bool IsUsingCrusaderStrikeStopAttack = 6;
 
     bool righteousFury = 8;
     Blessings personalBlessing = 9;
diff --git a/sim/paladin/avenging_wrath.go b/sim/paladin/avenging_wrath.go
deleted file mode 100644
index e94d292513..0000000000
--- a/sim/paladin/avenging_wrath.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package paladin
-
-import (
-	"time"
-
-	"github.com/wowsims/classic/sim/core"
-)
-
-func (paladin *Paladin) registerAvengingWrath() {
-	actionID := core.ActionID{SpellID: 407788}
-
-	AvengingWrathAura := paladin.RegisterAura(core.Aura{
-		Label:    "Avenging Wrath",
-		ActionID: actionID,
-		Duration: time.Second * 20,
-		OnGain: func(aura *core.Aura, sim *core.Simulation) {
-			aura.Unit.PseudoStats.DamageDealtMultiplier *= 1.2
-		},
-		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
-			aura.Unit.PseudoStats.DamageDealtMultiplier /= 1.2
-		},
-	})
-	core.RegisterPercentDamageModifierEffect(AvengingWrathAura, 1.2)
-
-	AvengingWrath := paladin.RegisterSpell(core.SpellConfig{
-		ActionID: actionID,
-		Flags:    core.SpellFlagNoOnCastComplete | core.SpellFlagAPL | SpellFlag_Forbearance,
-
-		ManaCost: core.ManaCostOptions{
-			BaseCost: 0.08,
-		},
-		Cast: core.CastConfig{
-			CD: core.Cooldown{
-				Timer:    paladin.NewTimer(),
-				Duration: time.Minute * 3,
-			},
-		},
-		ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) {
-			AvengingWrathAura.Activate(sim)
-		},
-	})
-
-	paladin.AddMajorCooldown(core.MajorCooldown{
-		Spell: AvengingWrath,
-		Type:  core.CooldownTypeDPS,
-	})
-}
diff --git a/sim/paladin/exorcism.go b/sim/paladin/exorcism.go
index a62b146af6..a547797953 100644
--- a/sim/paladin/exorcism.go
+++ b/sim/paladin/exorcism.go
@@ -17,12 +17,12 @@ func (paladin *Paladin) registerExorcism() {
 		maxDamage  float64
 		scale      float64
 	}{
-		{level: 20, spellID: 415068, manaCost: 85, scaleLevel: 25, minDamage: 84, maxDamage: 96, scale: 1.2},
-		{level: 28, spellID: 415069, manaCost: 135, scaleLevel: 33, minDamage: 152, maxDamage: 172, scale: 1.6},
-		{level: 36, spellID: 415070, manaCost: 180, scaleLevel: 41, minDamage: 217, maxDamage: 245, scale: 2.0},
-		{level: 44, spellID: 415071, manaCost: 235, scaleLevel: 49, minDamage: 304, maxDamage: 342, scale: 2.4},
-		{level: 52, spellID: 415072, manaCost: 285, scaleLevel: 57, minDamage: 393, maxDamage: 439, scale: 2.8},
-		{level: 60, spellID: 415073, manaCost: 345, scaleLevel: 60, minDamage: 505, maxDamage: 563, scale: 3.2},
+		{level: 20, spellID: 879, manaCost: 85, scaleLevel: 25, minDamage: 84, maxDamage: 96, scale: 1.2},
+		{level: 28, spellID: 5614, manaCost: 135, scaleLevel: 33, minDamage: 152, maxDamage: 172, scale: 1.6},
+		{level: 36, spellID: 5615, manaCost: 180, scaleLevel: 41, minDamage: 217, maxDamage: 245, scale: 2.0},
+		{level: 44, spellID: 10312, manaCost: 235, scaleLevel: 49, minDamage: 304, maxDamage: 342, scale: 2.4},
+		{level: 52, spellID: 10313, manaCost: 285, scaleLevel: 57, minDamage: 393, maxDamage: 439, scale: 2.8},
+		{level: 60, spellID: 10314, manaCost: 345, scaleLevel: 60, minDamage: 505, maxDamage: 563, scale: 3.2},
 	}
 
 	for i, rank := range ranks {
@@ -64,15 +64,12 @@ func (paladin *Paladin) registerExorcism() {
 
 			BonusCoefficient: 0.429,
 
-			ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-				bonusCrit := 0.0
-				if target.MobType == proto.MobType_MobTypeDemon || target.MobType == proto.MobType_MobTypeUndead {
-					bonusCrit += 100 * core.CritRatingPerCritChance
-				}
+			ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool { 
+				return target.MobType == proto.MobType_MobTypeDemon || target.MobType == proto.MobType_MobTypeUndead
+			},
 
-				spell.BonusCritRating += bonusCrit
+			ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
 				spell.CalcAndDealDamage(sim, target, sim.Roll(minDamage, maxDamage), spell.OutcomeMagicHitAndCrit)
-				spell.BonusCritRating -= bonusCrit
 			},
 		})
 
diff --git a/sim/paladin/paladin.go b/sim/paladin/paladin.go
index b79aa2dd93..7bdcb7aa6c 100644
--- a/sim/paladin/paladin.go
+++ b/sim/paladin/paladin.go
@@ -117,7 +117,6 @@ func (paladin *Paladin) Initialize() {
 	paladin.registerDivineFavor()
 	paladin.registerHammerOfWrath()
 	paladin.registerHolyWrath()
-	paladin.registerAvengingWrath()
 	paladin.registerHolyShield()
 	paladin.registerBlessingOfSanctuary()
 	paladin.registerLayOnHands()
diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results
index 1070fdc6ac..30314ba826 100644
--- a/sim/paladin/protection/TestProtection.results
+++ b/sim/paladin/protection/TestProtection.results
@@ -50,26 +50,26 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestProtection-Phase4-StatWeights-Default"
  value: {
-  weights: 0.26263
-  weights: 0.15662
+  weights: 0.25582
+  weights: 0.15088
   weights: 0
-  weights: 0.00227
+  weights: 0.00224
   weights: 0
-  weights: 0.4582
+  weights: 0.36217
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.39499
+  weights: 0.30055
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.74144
-  weights: 0.28045
+  weights: 0.36537
+  weights: 0.14361
   weights: 0
   weights: 0
-  weights: 0.10381
-  weights: 2.84604
-  weights: 2.4919
+  weights: 0.10111
+  weights: 2.8135
+  weights: 2.42767
   weights: 0
   weights: 0
   weights: 0
@@ -99,154 +99,154 @@ stat_weights_results: {
 dps_results: {
  key: "TestProtection-Phase4-AllItems-Avenger'sBattlegear"
  value: {
-  dps: 513.97134
-  tps: 936.26213
+  dps: 391.5737
+  tps: 624.62765
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-AllItems-FieldMarshal'sAegis"
  value: {
-  dps: 497.25906
-  tps: 902.80481
+  dps: 377.19605
+  tps: 597.00885
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-AllItems-Freethinker'sArmor"
  value: {
-  dps: 412.51732
-  tps: 738.66308
+  dps: 306.21659
+  tps: 464.10001
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-AllItems-JudgementArmor"
  value: {
-  dps: 509.05851
-  tps: 943.82704
+  dps: 382.97042
+  tps: 623.41548
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-AllItems-LawbringerArmor"
  value: {
-  dps: 414.88463
-  tps: 739.77547
+  dps: 308.15791
+  tps: 465.12083
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-AllItems-LieutenantCommander'sRedoubt"
  value: {
-  dps: 480.81834
-  tps: 881.47553
+  dps: 361.49402
+  tps: 575.82328
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-AllItems-RedemptionArmor"
  value: {
-  dps: 394.32849
-  tps: 717.01314
+  dps: 287.38323
+  tps: 443.06167
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 392.16572
-  tps: 716.25616
+  dps: 286.33778
+  tps: 441.88629
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Average-Default"
  value: {
-  dps: 392.65413
-  tps: 715.87402
+  dps: 286.94723
+  tps: 442.16304
  }
 }
 dps_results: {
- key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget"
+ key: "TestProtection-Phase4-Settings-Dwarf-blank-Basic Prot Rotation-basic_prot-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 48.66928
-  tps: 141.78293
+  dps: 12.83424
+  tps: 38.37384
  }
 }
 dps_results: {
- key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget"
+ key: "TestProtection-Phase4-Settings-Dwarf-blank-Basic Prot Rotation-basic_prot-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 48.66928
-  tps: 118.0551
+  dps: 12.83424
+  tps: 31.18076
  }
 }
 dps_results: {
- key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget"
+ key: "TestProtection-Phase4-Settings-Dwarf-blank-Basic Prot Rotation-basic_prot-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 113.55847
-  tps: 274.43324
+  dps: 13.10718
+  tps: 31.75223
  }
 }
 dps_results: {
- key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongMultiTarget"
+ key: "TestProtection-Phase4-Settings-Dwarf-blank-Basic Prot Rotation-basic_prot-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 16.2396
-  tps: 38.97504
+  dps: 7.6828
+  tps: 18.43872
  }
 }
 dps_results: {
- key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongSingleTarget"
+ key: "TestProtection-Phase4-Settings-Dwarf-blank-Basic Prot Rotation-basic_prot-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 16.2396
-  tps: 38.97504
+  dps: 7.6828
+  tps: 18.43872
  }
 }
 dps_results: {
- key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-ShortSingleTarget"
+ key: "TestProtection-Phase4-Settings-Dwarf-blank-Basic Prot Rotation-basic_prot-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 45.93992
-  tps: 110.25581
+  dps: 7.79446
+  tps: 18.7067
  }
 }
 dps_results: {
- key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget"
+ key: "TestProtection-Phase4-Settings-Human-blank-Basic Prot Rotation-basic_prot-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 48.87083
-  tps: 142.46333
+  dps: 12.83424
+  tps: 38.37384
  }
 }
 dps_results: {
- key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget"
+ key: "TestProtection-Phase4-Settings-Human-blank-Basic Prot Rotation-basic_prot-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 48.87083
-  tps: 118.54867
+  dps: 12.83424
+  tps: 31.18076
  }
 }
 dps_results: {
- key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget"
+ key: "TestProtection-Phase4-Settings-Human-blank-Basic Prot Rotation-basic_prot-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 113.55847
-  tps: 274.43324
+  dps: 13.10718
+  tps: 31.75223
  }
 }
 dps_results: {
- key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongMultiTarget"
+ key: "TestProtection-Phase4-Settings-Human-blank-Basic Prot Rotation-basic_prot-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 16.98458
-  tps: 40.76299
+  dps: 7.6828
+  tps: 18.43872
  }
 }
 dps_results: {
- key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongSingleTarget"
+ key: "TestProtection-Phase4-Settings-Human-blank-Basic Prot Rotation-basic_prot-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 16.98458
-  tps: 40.76299
+  dps: 7.6828
+  tps: 18.43872
  }
 }
 dps_results: {
- key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-ShortSingleTarget"
+ key: "TestProtection-Phase4-Settings-Human-blank-Basic Prot Rotation-basic_prot-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 45.93992
-  tps: 110.25581
+  dps: 7.79446
+  tps: 18.7067
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 351.18508
-  tps: 647.98176
+  dps: 248.002
+  tps: 381.02254
  }
 }
diff --git a/sim/paladin/protection/protection.go b/sim/paladin/protection/protection.go
index 19f6c203ad..67ce72d43f 100644
--- a/sim/paladin/protection/protection.go
+++ b/sim/paladin/protection/protection.go
@@ -32,9 +32,7 @@ func NewProtectionPaladin(character *core.Character, options *proto.Player) *Pro
 		Paladin:                         pal,
 		primarySeal:                     protOptions.PrimarySeal,
 		righteousFury:                   protOptions.RighteousFury,
-		IsUsingDivineStormStopAttack:    protOptions.IsUsingDivineStormStopAttack,
 		IsUsingJudgementStopAttack:      protOptions.IsUsingJudgementStopAttack,
-		IsUsingCrusaderStrikeStopAttack: protOptions.IsUsingCrusaderStrikeStopAttack,
 		personalBlessing:                protOptions.PersonalBlessing,
 	}
 
@@ -51,9 +49,7 @@ type ProtectionPaladin struct {
 
 	primarySeal                     proto.PaladinSeal
 	righteousFury                   bool
-	IsUsingDivineStormStopAttack    bool
 	IsUsingJudgementStopAttack      bool
-	IsUsingCrusaderStrikeStopAttack bool
 	personalBlessing                proto.Blessings
 }
 
diff --git a/sim/paladin/protection/protection_test.go b/sim/paladin/protection/protection_test.go
index 945932df84..71153ec712 100644
--- a/sim/paladin/protection/protection_test.go
+++ b/sim/paladin/protection/protection_test.go
@@ -21,10 +21,10 @@ func TestProtection(t *testing.T) {
 
 			Talents:     Phase4ProtTalents,
 			GearSet:     core.GetGearSet("../../../ui/protection_paladin/gear_sets", "blank"),
-			Rotation:    core.GetAplRotation("../../../ui/protection_paladin/apls", "p4prot"),
+			Rotation:    core.GetAplRotation("../../../ui/protection_paladin/apls", "basic_prot"),
 			Buffs:       core.FullBuffs,
 			Consumes:    Phase4Consumes,
-			SpecOptions: core.SpecOptionsCombo{Label: "P4 Prot", SpecOptions: PlayerOptionsSealofMartyrdom},
+			SpecOptions: core.SpecOptionsCombo{Label: "Basic Prot Rotation", SpecOptions: PlayerOptionsSealofRighteousness},
 
 			ItemFilter:      ItemFilters,
 			EPReferenceStat: proto.Stat_StatAttackPower,
@@ -57,12 +57,6 @@ var PlayerOptionsSealofCommand = &proto.Player_ProtectionPaladin{
 	},
 }
 
-var PlayerOptionsSealofMartyrdom = &proto.Player_ProtectionPaladin{
-	ProtectionPaladin: &proto.ProtectionPaladin{
-		Options: optionsSealOfMartyrdom,
-	},
-}
-
 var PlayerOptionsSealofRighteousness = &proto.Player_ProtectionPaladin{
 	ProtectionPaladin: &proto.ProtectionPaladin{
 		Options: optionsSealOfRighteousness,
@@ -74,11 +68,6 @@ var optionsSealOfCommand = &proto.PaladinOptions{
 	RighteousFury: true,
 }
 
-var optionsSealOfMartyrdom = &proto.PaladinOptions{
-	PrimarySeal:   proto.PaladinSeal_Martyrdom,
-	RighteousFury: true,
-}
-
 var optionsSealOfRighteousness = &proto.PaladinOptions{
 	PrimarySeal:   proto.PaladinSeal_Righteousness,
 	RighteousFury: true,
diff --git a/sim/paladin/retribution/TestExodin.results b/sim/paladin/retribution/TestExodin.results
deleted file mode 100644
index 5f6ef07d0d..0000000000
--- a/sim/paladin/retribution/TestExodin.results
+++ /dev/null
@@ -1,252 +0,0 @@
-character_stats_results: {
- key: "TestExodin-Phase5-CharacterStats-Default"
- value: {
-  final_stats: 258.819
-  final_stats: 153.065
-  final_stats: 370.96125
-  final_stats: 166.98
-  final_stats: 193.9245
-  final_stats: 150
-  final_stats: 0
-  final_stats: 10
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 49.6
-  final_stats: 0
-  final_stats: 27.28857
-  final_stats: 0
-  final_stats: 0
-  final_stats: 1669.638
-  final_stats: 3
-  final_stats: 28.44509
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 3736.7
-  final_stats: 0
-  final_stats: 0
-  final_stats: 690.13
-  final_stats: 480
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 8.44509
-  final_stats: 5
-  final_stats: 0
-  final_stats: 5210.6125
-  final_stats: 27
-  final_stats: 60
-  final_stats: 60
-  final_stats: 60
-  final_stats: 60
-  final_stats: 384
-  final_stats: 0
-  final_stats: 35
-  final_stats: 0
- }
-}
-stat_weights_results: {
- key: "TestExodin-Phase5-StatWeights-Default"
- value: {
-  weights: 0.33174
-  weights: 0.1846
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.53084
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 2.46935
-  weights: 0.32631
-  weights: 0
-  weights: 0
-  weights: 0.1192
-  weights: 3.34305
-  weights: 2.92051
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-AllItems-Avenger'sBattlegear"
- value: {
-  dps: 651.83708
-  tps: 694.36061
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-AllItems-FieldMarshal'sAegis"
- value: {
-  dps: 634.38782
-  tps: 677.00108
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-AllItems-Freethinker'sArmor"
- value: {
-  dps: 522.37642
-  tps: 564.55189
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-AllItems-JudgementArmor"
- value: {
-  dps: 648.92824
-  tps: 691.45791
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-AllItems-LawbringerArmor"
- value: {
-  dps: 532.81709
-  tps: 575.25335
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-AllItems-LieutenantCommander'sRedoubt"
- value: {
-  dps: 603.08544
-  tps: 645.14198
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-AllItems-RedemptionArmor"
- value: {
-  dps: 527.02852
-  tps: 569.5573
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-AllItems-SanctifiedOrb-20512"
- value: {
-  dps: 492.03494
-  tps: 533.94399
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Average-Default"
- value: {
-  dps: 493.00659
-  tps: 535.02427
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 351.21526
-  tps: 560.87209
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 79.37861
-  tps: 89.89587
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 172.34152
-  tps: 189.59028
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 157.63726
-  tps: 323.56962
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 35.24239
-  tps: 43.53901
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 86.4435
-  tps: 101.62726
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 350.89921
-  tps: 561.3427
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 80.30935
-  tps: 90.85119
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 171.69148
-  tps: 188.94024
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 190.3591
-  tps: 371.10593
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 36.43544
-  tps: 45.47278
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 84.08524
-  tps: 99.26899
- }
-}
-dps_results: {
- key: "TestExodin-Phase5-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 442.45264
-  tps: 482.01151
- }
-}
diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results
index 1b2a43711c..19ecedfdc9 100644
--- a/sim/paladin/retribution/TestRetribution.results
+++ b/sim/paladin/retribution/TestRetribution.results
@@ -50,12 +50,12 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestRetribution-Phase5-StatWeights-Default"
  value: {
-  weights: 0.34188
-  weights: 0.21827
+  weights: 0.33166
+  weights: 0.18377
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.14211
+  weights: 0.2413
   weights: 0
   weights: 0
   weights: 0
@@ -63,13 +63,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.90904
-  weights: 0.06575
+  weights: 0.78943
+  weights: 0.16822
   weights: 0
   weights: 0
-  weights: 0.12285
-  weights: 2.39141
-  weights: 2.98999
+  weights: 0.11918
+  weights: 2.8357
+  weights: 2.67284
   weights: 0
   weights: 0
   weights: 0
@@ -99,234 +99,154 @@ stat_weights_results: {
 dps_results: {
  key: "TestRetribution-Phase5-AllItems-Avenger'sBattlegear"
  value: {
-  dps: 366.46918
-  tps: 394.86836
+  dps: 402.34936
+  tps: 427.57677
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-AllItems-FieldMarshal'sAegis"
  value: {
-  dps: 356.49427
-  tps: 384.90328
+  dps: 394.77296
+  tps: 420.30521
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-AllItems-Freethinker'sArmor"
  value: {
-  dps: 311.07533
-  tps: 339.48926
+  dps: 320.10045
+  tps: 344.3937
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-AllItems-JudgementArmor"
  value: {
-  dps: 346.20663
-  tps: 374.64022
+  dps: 399.85618
+  tps: 425.85551
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-AllItems-LawbringerArmor"
  value: {
-  dps: 315.56124
-  tps: 343.97517
+  dps: 334.99133
+  tps: 360.69074
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-AllItems-LieutenantCommander'sRedoubt"
  value: {
-  dps: 337.9715
-  tps: 366.38543
+  dps: 363.99549
+  tps: 388.41657
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-AllItems-RedemptionArmor"
  value: {
-  dps: 286.91702
-  tps: 315.41945
+  dps: 322.42266
+  tps: 349.59216
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 287.71966
-  tps: 316.09917
+  dps: 291.80675
+  tps: 315.75091
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Average-Default"
  value: {
-  dps: 286.51324
-  tps: 314.77694
+  dps: 292.10631
+  tps: 316.03209
  }
 }
 dps_results: {
- key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget"
+ key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Ret-basic_ret-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 52.84577
-  tps: 255.1276
+  dps: 34.53035
+  tps: 51.54201
  }
 }
 dps_results: {
- key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget"
+ key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Ret-basic_ret-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 37.59587
-  tps: 47.75913
+  dps: 22.6148
+  tps: 23.48996
  }
 }
 dps_results: {
- key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-ShortSingleTarget"
+ key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Ret-basic_ret-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 46.77168
-  tps: 63.13544
+  dps: 30.2895
+  tps: 31.322
  }
 }
 dps_results: {
- key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongMultiTarget"
+ key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Ret-basic_ret-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 22.14
-  tps: 197.93187
+  dps: 11.15525
+  tps: 11.15525
  }
 }
 dps_results: {
- key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongSingleTarget"
+ key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Ret-basic_ret-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 15.16236
-  tps: 23.95195
+  dps: 6.28939
+  tps: 6.28939
  }
 }
 dps_results: {
- key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-ShortSingleTarget"
+ key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Ret-basic_ret-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 19.30788
-  tps: 34.49164
+  dps: 10.40251
+  tps: 10.40251
  }
 }
 dps_results: {
- key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget"
+ key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Righteousness Ret-basic_ret-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 7.55154
-  tps: 190.06837
+  dps: 33.11421
+  tps: 49.73254
  }
 }
 dps_results: {
- key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget"
+ key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Righteousness Ret-basic_ret-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 6.56804
-  tps: 15.69388
+  dps: 21.01391
+  tps: 21.87433
  }
 }
 dps_results: {
- key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-ShortSingleTarget"
+ key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Righteousness Ret-basic_ret-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  tps: 15.18376
+  dps: 30.22899
+  tps: 31.26149
  }
 }
 dps_results: {
- key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongMultiTarget"
+ key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Righteousness Ret-basic_ret-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 2.43419
-  tps: 147.02991
+  dps: 10.96564
+  tps: 10.96564
  }
 }
 dps_results: {
- key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongSingleTarget"
+ key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Righteousness Ret-basic_ret-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 2.43419
-  tps: 9.66397
+  dps: 6.66052
+  tps: 6.66052
  }
 }
 dps_results: {
- key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-ShortSingleTarget"
+ key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Righteousness Ret-basic_ret-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  tps: 15.18376
- }
-}
-dps_results: {
- key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 53.52148
-  tps: 256.3933
- }
-}
-dps_results: {
- key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 37.49478
-  tps: 47.66296
- }
-}
-dps_results: {
- key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 48.07929
-  tps: 64.41847
- }
-}
-dps_results: {
- key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 22.6547
-  tps: 203.40152
- }
-}
-dps_results: {
- key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 13.94671
-  tps: 22.98405
- }
-}
-dps_results: {
- key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 20.11592
-  tps: 35.29968
- }
-}
-dps_results: {
- key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 7.38453
-  tps: 189.80302
- }
-}
-dps_results: {
- key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 6.40102
-  tps: 15.52195
- }
-}
-dps_results: {
- key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  tps: 15.18376
- }
-}
-dps_results: {
- key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 5.67317
-  tps: 186.42
- }
-}
-dps_results: {
- key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 4.95067
-  tps: 13.98801
- }
-}
-dps_results: {
- key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  tps: 15.18376
+  dps: 12.90257
+  tps: 12.90257
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 254.6428
-  tps: 282.74206
+  dps: 253.47379
+  tps: 276.27729
  }
 }
diff --git a/sim/paladin/retribution/TestShockadin.results b/sim/paladin/retribution/TestShockadin.results
deleted file mode 100644
index 6e119adb93..0000000000
--- a/sim/paladin/retribution/TestShockadin.results
+++ /dev/null
@@ -1,252 +0,0 @@
-character_stats_results: {
- key: "TestShockadin-Phase5-CharacterStats-Default"
- value: {
-  final_stats: 258.819
-  final_stats: 153.065
-  final_stats: 370.96125
-  final_stats: 183.678
-  final_stats: 193.9245
-  final_stats: 150
-  final_stats: 0
-  final_stats: 10
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 49.6
-  final_stats: 0
-  final_stats: 27.56742
-  final_stats: 0
-  final_stats: 0
-  final_stats: 1669.638
-  final_stats: 0
-  final_stats: 28.44509
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 3987.17
-  final_stats: 0
-  final_stats: 0
-  final_stats: 690.13
-  final_stats: 480
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 8.44509
-  final_stats: 5
-  final_stats: 0
-  final_stats: 5210.6125
-  final_stats: 27
-  final_stats: 60
-  final_stats: 60
-  final_stats: 60
-  final_stats: 60
-  final_stats: 384
-  final_stats: 0
-  final_stats: 35
-  final_stats: 0
- }
-}
-stat_weights_results: {
- key: "TestShockadin-Phase5-StatWeights-Default"
- value: {
-  weights: 0.28168
-  weights: 0.14833
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.48361
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 2.02814
-  weights: 0.38293
-  weights: 0
-  weights: 0
-  weights: 0.10121
-  weights: 0
-  weights: 2.55349
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-AllItems-Avenger'sBattlegear"
- value: {
-  dps: 593.17776
-  tps: 635.5796
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-AllItems-FieldMarshal'sAegis"
- value: {
-  dps: 577.97317
-  tps: 620.32585
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-AllItems-Freethinker'sArmor"
- value: {
-  dps: 481.15317
-  tps: 523.45668
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-AllItems-JudgementArmor"
- value: {
-  dps: 599.19454
-  tps: 641.77338
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-AllItems-LawbringerArmor"
- value: {
-  dps: 493.02691
-  tps: 535.56641
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-AllItems-LieutenantCommander'sRedoubt"
- value: {
-  dps: 553.96189
-  tps: 596.28998
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-AllItems-RedemptionArmor"
- value: {
-  dps: 487.30607
-  tps: 530.25857
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-AllItems-SanctifiedOrb-20512"
- value: {
-  dps: 452.41975
-  tps: 494.39876
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Average-Default"
- value: {
-  dps: 451.16907
-  tps: 493.15815
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 289.43751
-  tps: 505.781
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 88.68912
-  tps: 99.46696
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 182.51076
-  tps: 200.00536
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 118.24052
-  tps: 298.98735
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 41.8665
-  tps: 50.90384
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 94.349
-  tps: 109.53276
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 289.17688
-  tps: 506.50371
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 88.89921
-  tps: 99.68197
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 183.03576
-  tps: 200.55493
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 120.05059
-  tps: 300.79741
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 42.23114
-  tps: 51.26848
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 94.96835
-  tps: 110.1521
- }
-}
-dps_results: {
- key: "TestShockadin-Phase5-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 405.621
-  tps: 445.08759
- }
-}
diff --git a/sim/paladin/retribution/retribution.go b/sim/paladin/retribution/retribution.go
index 93809ab4f7..5237303cab 100644
--- a/sim/paladin/retribution/retribution.go
+++ b/sim/paladin/retribution/retribution.go
@@ -31,9 +31,7 @@ func NewRetributionPaladin(character *core.Character, options *proto.Player) *Re
 	ret := &RetributionPaladin{
 		Paladin:                         pal,
 		primarySeal:                     retOptions.PrimarySeal,
-		IsUsingDivineStormStopAttack:    retOptions.IsUsingDivineStormStopAttack,
 		IsUsingJudgementStopAttack:      retOptions.IsUsingJudgementStopAttack,
-		IsUsingCrusaderStrikeStopAttack: retOptions.IsUsingCrusaderStrikeStopAttack,
 	}
 
 	ret.EnableAutoAttacks(ret, core.AutoAttackOptions{
@@ -48,9 +46,7 @@ type RetributionPaladin struct {
 	*paladin.Paladin
 
 	primarySeal                     proto.PaladinSeal
-	IsUsingDivineStormStopAttack    bool
 	IsUsingJudgementStopAttack      bool
-	IsUsingCrusaderStrikeStopAttack bool
 }
 
 func (ret *RetributionPaladin) GetPaladin() *paladin.Paladin {
diff --git a/sim/paladin/retribution/retribution_test.go b/sim/paladin/retribution/retribution_test.go
index aec9718a06..cb479b0afe 100644
--- a/sim/paladin/retribution/retribution_test.go
+++ b/sim/paladin/retribution/retribution_test.go
@@ -21,11 +21,11 @@ func TestRetribution(t *testing.T) {
 
 			Talents:        Phase45RetTalents,
 			GearSet:        core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "blank"),
-			Rotation:       core.GetAplRotation("../../../ui/retribution_paladin/apls", "p5ret-twist-4DR-3.5-3.6"),
-			OtherRotations: []core.RotationCombo{core.GetAplRotation("../../../ui/retribution_paladin/apls", "p5ret-twist-4DR-3.7-4.0")},
+			Rotation:       core.GetAplRotation("../../../ui/retribution_paladin/apls", "basic_ret"),
+			OtherRotations: []core.RotationCombo{core.GetAplRotation("../../../ui/retribution_paladin/apls", "basic_ret")},
 			Buffs:          core.FullBuffs,
 			Consumes:       Phase5Consumes,
-			SpecOptions:    core.SpecOptionsCombo{Label: "P5 Seal of Martyrdom Ret", SpecOptions: PlayerOptionsSealofMartyrdom},
+			SpecOptions:    core.SpecOptionsCombo{Label: "P5 Seal of Righteousness Ret", SpecOptions: PlayerOptionsSealofRighteousness},
 
 			ItemFilter:      ItemFilters,
 			EPReferenceStat: proto.Stat_StatAttackPower,
@@ -34,56 +34,7 @@ func TestRetribution(t *testing.T) {
 	}))
 }
 
-func TestExodin(t *testing.T) {
-	core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{
-		{
-			Class:      proto.Class_ClassPaladin,
-			Phase:      5,
-			Race:       proto.Race_RaceHuman,
-			OtherRaces: []proto.Race{proto.Race_RaceDwarf},
-
-			Talents:     Phase45RetTalents,
-			GearSet:     core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "blank"),
-			Rotation:    core.GetAplRotation("../../../ui/retribution_paladin/apls", "p5ret-exodin-6CF2DR"),
-			Buffs:       core.FullBuffs,
-			Consumes:    Phase5Consumes,
-			SpecOptions: core.SpecOptionsCombo{Label: "P5 Seal of Martyrdom Ret", SpecOptions: PlayerOptionsSealofMartyrdom},
-
-			ItemFilter:      ItemFilters,
-			EPReferenceStat: proto.Stat_StatAttackPower,
-			StatsToWeigh:    Stats,
-		},
-	}))
-}
-
-func TestShockadin(t *testing.T) {
-	core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{
-		{
-			Class:      proto.Class_ClassPaladin,
-			Phase:      5,
-			Race:       proto.Race_RaceHuman,
-			OtherRaces: []proto.Race{proto.Race_RaceDwarf},
-
-			Talents:     Phase45ShockadinTalents,
-			GearSet:     core.GetGearSet("../../../ui/retribution_paladin/gear_sets", "blank"),
-			Rotation:    core.GetAplRotation("../../../ui/retribution_paladin/apls", "p5Shockadin"),
-			Buffs:       core.FullBuffs,
-			Consumes:    Phase5Consumes,
-			SpecOptions: core.SpecOptionsCombo{Label: "P5 Seal of Righteousness Shockadin", SpecOptions: PlayerOptionsSealofRighteousness},
-
-			ItemFilter:      ItemFilters,
-			EPReferenceStat: proto.Stat_StatSpellPower,
-			StatsToWeigh:    Stats,
-		},
-	}))
-}
-
-var Phase1RetTalents = "--05230051"
-var Phase2RetTalents = "--532300512003151"
-var Phase2ShockadinTalents = "55050100521151--"
-var Phase3RetTalents = "500501--53230051200315"
 var Phase45RetTalents = "500501-503-52230351200315"
-var Phase45ShockadinTalents = "55053100501051--052303511"
 
 var Phase1Consumes = core.ConsumesCombo{
 	Label: "P1-Consumes",
@@ -133,12 +84,6 @@ var PlayerOptionsSealofCommand = &proto.Player_RetributionPaladin{
 	},
 }
 
-var PlayerOptionsSealofMartyrdom = &proto.Player_RetributionPaladin{
-	RetributionPaladin: &proto.RetributionPaladin{
-		Options: optionsSealOfMartyrdom,
-	},
-}
-
 var PlayerOptionsSealofRighteousness = &proto.Player_RetributionPaladin{
 	RetributionPaladin: &proto.RetributionPaladin{
 		Options: optionsSealOfRighteousness,
@@ -149,10 +94,6 @@ var optionsSealOfCommand = &proto.PaladinOptions{
 	PrimarySeal: proto.PaladinSeal_Command,
 }
 
-var optionsSealOfMartyrdom = &proto.PaladinOptions{
-	PrimarySeal: proto.PaladinSeal_Martyrdom,
-}
-
 var optionsSealOfRighteousness = &proto.PaladinOptions{
 	PrimarySeal: proto.PaladinSeal_Righteousness,
 }
diff --git a/ui/index.html b/ui/index.html
index 03bb3da0d9..bbd0978520 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -250,25 +250,25 @@ <h3 class="expansion-title w-100 mb-0">Classic</h3>
 								</a>
 								<ul class="dropdown-menu w-100">
 									<li>
-										<a href="#" class="sim-link text-paladin">
+										<a href="/classic/protection_paladin/" class="sim-link text-paladin">
 											<div class="sim-link-content">
 												<img src="https://wow.zamimg.com/images/wow/icons/large/spell_holy_devotionaura.jpg" class="sim-link-icon" />
 												<div class="d-flex flex-column">
 													<span class="sim-link-label">Paladin</span>
 													<span class="sim-link-title">Protection</span>
-													<span class="launch-status-label text-brand">Phase 1 - Unreleased</span>
+													<span class="launch-status-label text-brand">Phase 1 - Alpha</span>
 												</div>
 											</div>
 										</a>
 									</li>
 									<li>
-										<a href="#" class="sim-link text-paladin">
+										<a href="/classic/retribution_paladin/" class="sim-link text-paladin">
 											<div class="sim-link-content">
 												<img src="https://wow.zamimg.com/images/wow/icons/large/spell_holy_auraoflight.jpg" class="sim-link-icon" />
 												<div class="d-flex flex-column">
 													<span class="sim-link-label">Paladin</span>
 													<span class="sim-link-title">Retribution</span>
-													<span class="launch-status-label text-brand">Phase 6 - Alpha</span>
+													<span class="launch-status-label text-brand">Phase 1 - Alpha</span>
 												</div>
 											</div>
 										</a>
diff --git a/ui/protection_paladin/apls/basic_prot.apl.json b/ui/protection_paladin/apls/basic_prot.apl.json
new file mode 100644
index 0000000000..57b1369302
--- /dev/null
+++ b/ui/protection_paladin/apls/basic_prot.apl.json
@@ -0,0 +1,14 @@
+{
+	"type": "TypeAPL",
+	"prepullActions": [
+		{ "action": { "castPaladinPrimarySeal": {} }, "doAtValue": { "const": { "val":"-3.5s" } } },
+        { "action": { "castSpell": { "spellId": { "spellId":20928,"rank":3 } } },"doAtValue": { "const": { "val":"-2s" } } },
+        { "action": { "castSpell": { "spellId": { "itemId":11832 } } },"doAtValue": { "const": { "val":"-0.5s" } } }
+	],
+	"priorityList": [
+        { "action": {"condition": { "cmp": { "op":"OpLt","lhs": { "currentSealRemainingTime": {} },"rhs": { "const": { "val":"2s" } } } },"castSpell": { "spellId": { "spellId":20271 } } } },
+        { "action": {"condition": { "cmp": { "op":"OpLe","lhs": { "currentSealRemainingTime": {} },"rhs": { "const":{"val":"1" } } } },"castPaladinPrimarySeal": {} } },
+        { "action": {"castSpell": { "spellId": { "spellId":20924,"rank":5 } } } },
+        { "action": {"condition": { "auraIsActive": { "auraId": { "spellId":20134 } } },"castSpell": { "spellId": { "spellId":20928,"rank":3 } } } }
+	]
+}
diff --git a/ui/protection_paladin/apls/p4prot.apl.json b/ui/protection_paladin/apls/p4prot.apl.json
deleted file mode 100644
index 3bfe3b9387..0000000000
--- a/ui/protection_paladin/apls/p4prot.apl.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-	"type": "TypeAPL",
-	"prepullActions": [
-		{ "action": { "castPaladinPrimarySeal": {} }, "doAtValue": { "const": { "val": "-3.0s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 20928, "rank": 3 } } }, "doAtValue": { "const": { "val": "-1.5s" } } },
-		{ "action": { "castSpell": { "spellId": { "itemId": 18641 } } }, "doAtValue": { "const": { "val": "-1s" } } }
-	],
-	"priorityList": [
-		{
-			"action": {
-				"condition": { "cmp": { "op": "OpLt", "lhs": { "currentHealthPercent": {} }, "rhs": { "const": { "val": "10%" } } } },
-				"castSpell": { "spellId": { "spellId": 10310, "rank": 3 } }
-			}
-		},
-		{
-			"action": {
-				"condition": { "cmp": { "op": "OpLt", "lhs": { "currentHealthPercent": {} }, "rhs": { "const": { "val": "40%" } } } },
-				"castSpell": { "spellId": { "spellId": 458371 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{
-								"cmp": {
-									"op": "OpGe",
-									"lhs": { "spellTimeToReady": { "spellId": { "spellId": 458371 } } },
-									"rhs": { "const": { "val": "1m" } }
-								}
-							},
-							{ "not": { "val": { "auraIsActive": { "auraId": { "spellId": 25771 } } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 407788 } }
-			}
-		},
-		{
-			"action": {
-				"condition": { "cmp": { "op": "OpLe", "lhs": { "currentSealRemainingTime": {} }, "rhs": { "const": { "val": "1.5s" } } } },
-				"castPaladinPrimarySeal": {}
-			}
-		},
-		{ "action": { "castSpell": { "spellId": { "spellId": 20928, "rank": 3 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 407669 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 407632 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 440658 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 415073 } } } },
-		{ "action": { "strictSequence": { "actions": [{ "castSpell": { "spellId": { "spellId": 20271 } } }, { "castPaladinPrimarySeal": {} }] } } }
-	]
-}
diff --git a/ui/protection_paladin/apls/p5prot.apl.json b/ui/protection_paladin/apls/p5prot.apl.json
index eb636f2316..fccae752d2 100644
--- a/ui/protection_paladin/apls/p5prot.apl.json
+++ b/ui/protection_paladin/apls/p5prot.apl.json
@@ -15,26 +15,7 @@
 		{
 			"action": {
 				"condition": { "cmp": { "op": "OpLt", "lhs": { "currentHealthPercent": {} }, "rhs": { "const": { "val": "40%" } } } },
-				"castSpell": { "spellId": { "spellId": 458371 } }
-			}
-		},
-		{
-			"action": {
-				"condition": {
-					"and": {
-						"vals": [
-							{
-								"cmp": {
-									"op": "OpGe",
-									"lhs": { "spellTimeToReady": { "spellId": { "spellId": 458371 } } },
-									"rhs": { "const": { "val": "1m" } }
-								}
-							},
-							{ "not": { "val": { "auraIsActive": { "auraId": { "spellId": 25771 } } } } }
-						]
-					}
-				},
-				"castSpell": { "spellId": { "spellId": 407788 } }
+				"castSpell": { "spellId": { "spellId": 10278, "rank": 3 } }
 			}
 		},
 		{
@@ -49,10 +30,6 @@
 				"castPaladinPrimarySeal": {}
 			}
 		},
-		{ "action": { "castSpell": { "spellId": { "spellId": 20928, "rank": 3 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 407669 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 407632 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 415073 } } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 440658 } } } }
+		{ "action": { "castSpell": { "spellId": { "spellId": 20928, "rank": 3 } } } }
 	]
 }
diff --git a/ui/protection_paladin/inputs.ts b/ui/protection_paladin/inputs.ts
index 4c9c2a60e7..aadf6dfff2 100644
--- a/ui/protection_paladin/inputs.ts
+++ b/ui/protection_paladin/inputs.ts
@@ -53,10 +53,6 @@ export const PrimarySealSelection = InputHelpers.makeSpecOptionsEnumIconInput<Sp
 			value: PaladinSeal.Command,
 			showWhen: (player: Player<Spec.SpecProtectionPaladin>) => player.getTalents().sealOfCommand,
 		},
-		{
-			actionId: () => ActionId.fromSpellId(407798),
-			value: PaladinSeal.Martyrdom,
-		},
 	],
 	changeEmitter: (player: Player<Spec.SpecProtectionPaladin>) =>
 		TypedEvent.onAny([player.gearChangeEmitter, player.talentsChangeEmitter, player.specOptionsChangeEmitter]),
diff --git a/ui/protection_paladin/presets.ts b/ui/protection_paladin/presets.ts
index 4c4488596e..24238dc7e6 100644
--- a/ui/protection_paladin/presets.ts
+++ b/ui/protection_paladin/presets.ts
@@ -26,7 +26,7 @@ import {
 } from '../core/proto/common.js';
 import { Blessings, PaladinAura, PaladinOptions as ProtectionPaladinOptions,PaladinSeal } from '../core/proto/paladin.js';
 import { SavedTalents } from '../core/proto/ui.js';
-import APLP4ProtJson from './apls/p4prot.apl.json';
+import APLBasicProtectionJson from './apls/basic_prot.apl.json';
 import APLP5ProtJson from './apls/p5prot.apl.json';
 import BlankGear from './gear_sets/blank.gear.json';
 
@@ -49,14 +49,14 @@ export const DefaultGear = GearBlank;
 ///////////////////////////////////////////////////////////////////////////
 
 export const APLP5Prot = PresetUtils.makePresetAPLRotation('P5 Prot', APLP5ProtJson);
-export const APLP4Prot = PresetUtils.makePresetAPLRotation('P4 Prot', APLP4ProtJson);
+export const APLBasicProt = PresetUtils.makePresetAPLRotation('Basic Prot', APLBasicProtectionJson);
 
 export const APLPresets = {
 	[Phase.Phase1]: [],
 	[Phase.Phase2]: [],
 	[Phase.Phase3]: [],
-	[Phase.Phase4]: [APLP4Prot, APLP5Prot],
-	[Phase.Phase5]: [APLP4Prot, APLP5Prot],
+	[Phase.Phase4]: [APLBasicProt, APLP5Prot],
+	[Phase.Phase5]: [APLP5Prot, APLP5Prot],
 };
 
 export const DefaultAPL = APLPresets[Phase.Phase5][0];
@@ -98,7 +98,7 @@ export const DefaultTalents = TalentPresets[Phase.Phase5][0];
 
 export const DefaultOptions = ProtectionPaladinOptions.create({
 	aura: PaladinAura.SanctityAura,
-	primarySeal: PaladinSeal.Martyrdom,
+	primarySeal: PaladinSeal.Righteousness,
 	personalBlessing: Blessings.BlessingOfSanctuary,
 	righteousFury: true,
 });
diff --git a/ui/retribution_paladin/apls/basic_ret.apl.json b/ui/retribution_paladin/apls/basic_ret.apl.json
new file mode 100644
index 0000000000..817654ac8d
--- /dev/null
+++ b/ui/retribution_paladin/apls/basic_ret.apl.json
@@ -0,0 +1,12 @@
+{
+  "type": "TypeAPL",
+  "prepullActions": [
+    {"action":{"castPaladinPrimarySeal":{}},"doAtValue":{"const":{"val":"-1.5s"}}}
+  ],
+  "priorityList": [
+    {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":20271}}},"castSpell":{"spellId":{"spellId":20271}}}},
+    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentSealRemainingTime":{}},"rhs":{"const":{"val":"1"}}}},"castPaladinPrimarySeal":{}}},
+    {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"autoTimeToNext":{"autoType":"Melee"}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":20293,"rank":8}}}]}},"castSpell":{"spellId":{"spellId":20375,"rank":1}}}},
+    {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"autoTimeToNext":{"autoType":"Melee"}},"rhs":{"const":{"val":"1s"}}}},{"auraIsActive":{"auraId":{"spellId":20375,"rank":1}}}]}},"castSpell":{"spellId":{"spellId":20293,"rank":8}}}}
+  ]
+}
\ No newline at end of file
diff --git a/ui/retribution_paladin/apls/p1ret.apl.json b/ui/retribution_paladin/apls/p1ret.apl.json
deleted file mode 100644
index 13f2ae2fd0..0000000000
--- a/ui/retribution_paladin/apls/p1ret.apl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "type": "TypeAPL",
-  "prepullActions": [
-    {"action":{"castPaladinPrimarySeal":{}},"doAtValue":{"const":{"val":"-1.5s"}}}
-  ],
-  "priorityList": [
-    {"action":{"autocastOtherCooldowns":{}}},
-    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentSealRemainingTime":{}},"rhs":{"const":{"val":"1.5s"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}},{"castPaladinPrimarySeal":{}}]}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407676}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407778}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":26573}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":415068,"rank":1}}}},
-    {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":20271}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}},{"castPaladinPrimarySeal":{}}]}}}
-  ]
-}
diff --git a/ui/retribution_paladin/apls/p2ret.apl.json b/ui/retribution_paladin/apls/p2ret.apl.json
deleted file mode 100644
index 64d1739d3d..0000000000
--- a/ui/retribution_paladin/apls/p2ret.apl.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "type": "TypeAPL",
-  "prepullActions": [
-    {"action":{"castPaladinPrimarySeal":{}},"doAtValue":{"const":{"val":"-2.5s"}}},
-    {"action":{"castSpell":{"spellId":{"itemId":215168}}},"doAtValue":{"const":{"val":"-1s"}}}
-  ],
-  "priorityList": [
-    {"action":{"autocastOtherCooldowns":{}}},
-    {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentSealRemainingTime":{}},"rhs":{"const":{"val":"1.5s"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}},{"castPaladinPrimarySeal":{}}]}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407676}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407778}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":415070,"rank":3}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":20473}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":20922}}}},
-    {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":20271}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}},{"castPaladinPrimarySeal":{}}]}}}
-  ]
-}
\ No newline at end of file
diff --git a/ui/retribution_paladin/apls/p3ret.apl.json b/ui/retribution_paladin/apls/p3ret.apl.json
deleted file mode 100644
index 4f112d4a32..0000000000
--- a/ui/retribution_paladin/apls/p3ret.apl.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "type": "TypeAPL",
-  "prepullActions": [
-    {"action":{"castPaladinPrimarySeal":{}},"doAtValue":{"const":{"val":"-2.5s"}}},
-    {"action":{"castSpell":{"spellId":{"itemId":215168}}},"doAtValue":{"const":{"val":"-1s"}}}
-  ],
-  "priorityList": [
-    {"action":{"autocastOtherCooldowns":{}}},
-    {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentSealRemainingTime":{}},"rhs":{"const":{"val":"1.5s"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}},{"castPaladinPrimarySeal":{}}]}}},
-    {"action":{"castSpell":{"spellId":{"spellId":24275,"rank":1}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":415071}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407676}}}},
-    {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":20271}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}},{"castPaladinPrimarySeal":{}}]}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407778}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":20929,"rank":2}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":20923,"rank":4}}}}
-  ]
-}
\ No newline at end of file
diff --git a/ui/retribution_paladin/apls/p4ret-exodin-6pcT1.apl.json b/ui/retribution_paladin/apls/p4ret-exodin-6pcT1.apl.json
deleted file mode 100644
index ba978c3ba7..0000000000
--- a/ui/retribution_paladin/apls/p4ret-exodin-6pcT1.apl.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "type": "TypeAPL",
-  "prepullActions": [
-        {"action":{"castSpell":{"spellId":{"spellId":407798}}},"doAtValue":{"const":{"val":"-1.5s"}}},
-        {"action":{"castSpell":{"spellId":{"spellId":20293,"rank":8}}},"doAtValue":{"const":{"val":"-3s"}}}
-  ],
-  "priorityList": [
-        {"action":{"autocastOtherCooldowns":{}}},
-        {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentSealRemainingTime":{}},"rhs":{"const":{"val":"1.5s"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}},{"castSpell":{"spellId":{"spellId":407798}}}]}}},
-        {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":20293,"rank":8}}},"rhs":{"const":{"val":"1.5s"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20293,"rank":8}}}]}}},
-        {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":407798}}},"rhs":{"const":{"val":"1.5s"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":407798}}}]}}},
-        {"hide":true,"action":{"castSpell":{"spellId":{"spellId":407632}}}},
-        {"hide":true,"action":{"condition":{"isExecutePhase":{"threshold":"E20"}},"castSpell":{"spellId":{"spellId":24239,"rank":3}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":415073}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":20271}}},{"gcdIsReady":{}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}},{"castSpell":{"spellId":{"spellId":407798}}}]}}},
-        {"action":{"castSpell":{"spellId":{"spellId":407676}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":20924,"rank":5}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":407778}}}},
-        {"hide":true,"action":{"castSpell":{"spellId":{"spellId":20473}}}}
-  ]
-}
diff --git a/ui/retribution_paladin/apls/p4ret-exodin.apl.json b/ui/retribution_paladin/apls/p4ret-exodin.apl.json
deleted file mode 100644
index fcfaee286a..0000000000
--- a/ui/retribution_paladin/apls/p4ret-exodin.apl.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "type": "TypeAPL",
-  "prepullActions": [
-    {"action":{"castPaladinPrimarySeal":{}},"doAtValue":{"const":{"val":"-2.5s"}}}
-  ],
-  "priorityList": [
-        {"action":{"autocastOtherCooldowns":{}}},
-        {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentSealRemainingTime":{}},"rhs":{"const":{"val":"1.5s"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}},{"castSpell":{"spellId":{"spellId":407798}}}]}}},
-        {"hide":true,"action":{"castSpell":{"spellId":{"spellId":407632}}}},
-        {"hide":true,"action":{"condition":{"isExecutePhase":{"threshold":"E20"}},"castSpell":{"spellId":{"spellId":24239,"rank":3}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":415073}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":407676}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":20924,"rank":5}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":20271}}},{"gcdIsReady":{}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}},{"castSpell":{"spellId":{"spellId":407798}}}]}}},
-        {"action":{"castSpell":{"spellId":{"spellId":407778}}}},
-        {"hide":true,"action":{"castSpell":{"spellId":{"spellId":20473}}}}
-  ]
-}
diff --git a/ui/retribution_paladin/apls/p4ret-twisting-6pcT1.apl.json b/ui/retribution_paladin/apls/p4ret-twisting-6pcT1.apl.json
deleted file mode 100644
index 8e5baaed31..0000000000
--- a/ui/retribution_paladin/apls/p4ret-twisting-6pcT1.apl.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "type": "TypeAPL",
-  "prepullActions": [
-        {"action":{"castSpell":{"spellId":{"spellId":20920,"rank":5}}},"doAtValue":{"const":{"val":"-3s"}}},
-        {"action":{"castSpell":{"spellId":{"spellId":407798}}},"doAtValue":{"const":{"val":"-1.5s"}}}
-  ],
-  "priorityList": [
-        {"action":{"autocastOtherCooldowns":{}}},
-        {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentSealRemainingTime":{}},"rhs":{"const":{"val":"1.5s"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}},{"castSpell":{"spellId":{"spellId":407798}}}]}}},
-        {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":20920,"rank":5}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpLe","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":20920,"rank":5}}}},
-        {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":407798}}},"rhs":{"const":{"val":"1.5s"}}}},{"cmp":{"op":"OpLe","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":407798}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":20271}}},{"gcdIsReady":{}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}},{"castSpell":{"spellId":{"spellId":407798}}}]}}},
-        {"action":{"condition":{"runeIsEquipped":{"runeId":{"spellId":429152}}},"castSpell":{"spellId":{"spellId":24239,"rank":3}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":407778}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":407676}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":415073}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":20924,"rank":5}}}}
-  ]
-}
diff --git a/ui/retribution_paladin/apls/p4ret.apl.json b/ui/retribution_paladin/apls/p4ret.apl.json
deleted file mode 100644
index 564ff2509c..0000000000
--- a/ui/retribution_paladin/apls/p4ret.apl.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "type": "TypeAPL",
-  "prepullActions": [
-    {"action":{"castSpell":{"spellId":{"spellId":20920,"rank":5}}},"doAtValue":{"const":{"val":"-1.5"}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407798}}},"doAtValue":{"const":{"val":"0"}}}
-  ],
-  "priorityList": [
-          {"action":{"autocastOtherCooldowns":{}}},
-        {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}},{"cmp":{"op":"OpLt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"200ms"}}}},{"gcdIsReady":{}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":407798}}},{"wait":{"duration":{"const":{"val":"300ms"}}}},{"castSpell":{"spellId":{"spellId":20271},"target":{"type":"Target"}}}]}}},
-        {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":407798}}},{"cmp":{"op":"OpLt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"200ms"}}}},{"gcdIsReady":{}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20920,"rank":5}}},{"wait":{"duration":{"const":{"val":"300ms"}}}},{"castSpell":{"spellId":{"spellId":20271},"target":{"type":"Target"}}}]}}},
-        {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"const":{"val":"180ms"}},"rhs":{"autoTimeToNext":{"autoType":"Melee"}}}},{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}}]}},"castSpell":{"spellId":{"spellId":407798}}}},
-        {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"const":{"val":"180ms"}},"rhs":{"autoTimeToNext":{"autoType":"Melee"}}}},{"auraIsActive":{"auraId":{"spellId":407798}}},{"not":{"val":{"isExecutePhase":{"threshold":"E20"}}}}]}},"castSpell":{"spellId":{"spellId":20920,"rank":5}}}},
-        {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":407798}}}}},{"gcdIsReady":{}},{"isExecutePhase":{"threshold":"E20"}}]}},"castSpell":{"spellId":{"spellId":407798}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":24239,"rank":3}}},{"isExecutePhase":{"threshold":"E20"}}]}},"castSpell":{"spellId":{"spellId":24239,"rank":3}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":407778}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}},{"gcdIsReady":{}},{"auraIsActive":{"auraId":{"spellId":407798}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":407975}}},"rhs":{"const":{"val":"0"}}}}]}},"castSpell":{"spellId":{"spellId":407778}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":407676}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}},{"gcdIsReady":{}},{"auraIsActive":{"auraId":{"spellId":407798}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":407975}}},"rhs":{"const":{"val":"0"}}}}]}},"castSpell":{"spellId":{"spellId":407676}}}},
-        {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":407798}}}}},{"gcdIsReady":{}},{"not":{"val":{"isExecutePhase":{"threshold":"E20"}}}}]}},"castSpell":{"spellId":{"spellId":20920,"rank":5}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":415073}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}},{"gcdIsReady":{}},{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}}]}},"castSpell":{"spellId":{"spellId":415073}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":407778}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}},{"gcdIsReady":{}},{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":407975}}},"rhs":{"const":{"val":"0"}}}}]}},"castSpell":{"spellId":{"spellId":407778}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":407676}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}},{"gcdIsReady":{}},{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":407975}}},"rhs":{"const":{"val":"0"}}}}]}},"castSpell":{"spellId":{"spellId":407676}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":415073}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}},{"gcdIsReady":{}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":407676}}},"rhs":{"math":{"op":"OpSub","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":407778}}},"rhs":{"math":{"op":"OpSub","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}}}},{"auraIsActive":{"auraId":{"spellId":407798}}}]}},"castSpell":{"spellId":{"spellId":415073}}}}
-  ]
-}
diff --git a/ui/retribution_paladin/apls/p5Shockadin.apl.json b/ui/retribution_paladin/apls/p5Shockadin.apl.json
deleted file mode 100644
index 225cdd940d..0000000000
--- a/ui/retribution_paladin/apls/p5Shockadin.apl.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "type": "TypeAPL",
-  "prepullActions": [
-    {"action":{"castPaladinPrimarySeal":{}},"doAtValue":{"const":{"val":"-2.5s"}}},
-    {"action":{"castSpell":{"spellId":{"itemId":215168}}},"doAtValue":{"const":{"val":"-1s"}}}
-  ],
-  "priorityList": [
-    {"action":{"autocastOtherCooldowns":{}}},
-    {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentSealRemainingTime":{}},"rhs":{"const":{"val":"0.5s"}}}},"castPaladinPrimarySeal":{}}},
-    {"action":{"condition":{"spellCanCast":{"spellId":{"spellId":20271}}},"castSpell":{"spellId":{"spellId":20271}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":20930,"rank":3}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":415073}}}},
-    {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":470246}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":470246}}},"rhs":{"const":{"val":"5"}}}}]}},"castSpell":{"spellId":{"spellId":10318,"rank":2}}}},
-    {"action":{"condition":{"isExecutePhase":{"threshold":"E20"}},"castSpell":{"spellId":{"spellId":24239,"rank":3}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":20924,"rank":5}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407669}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407676}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407632}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407778}}}}
-  ]
-}
diff --git a/ui/retribution_paladin/apls/p5ret-exodin-6CF2DR.apl.json b/ui/retribution_paladin/apls/p5ret-exodin-6CF2DR.apl.json
deleted file mode 100644
index eff10be35f..0000000000
--- a/ui/retribution_paladin/apls/p5ret-exodin-6CF2DR.apl.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "type": "TypeAPL",
-  "prepullActions": [
-    {"action":{"castSpell":{"spellId":{"spellId":407798}}},"doAtValue":{"const":{"val":"-1.5s"}}},
-    {"action":{"castSpell":{"spellId":{"spellId":20293,"rank":8}}},"doAtValue":{"const":{"val":"-3s"}}}
-  ],
-  "priorityList": [
-    {"action":{"autocastOtherCooldowns":{}}},
-    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentSealRemainingTime":{}},"rhs":{"const":{"val":"1.5s"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}}]}}},
-    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":20293,"rank":8}}},"rhs":{"const":{"val":"0.5s"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20293,"rank":8}}}]}}},
-    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":407798}}},"rhs":{"const":{"val":"0.5s"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":407798}}}]}}},
-    {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":20271}}},{"gcdIsReady":{}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20271}}}]}}},
-    {"action":{"castSpell":{"spellId":{"spellId":415073}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407676}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":20924,"rank":5}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":407778}}}}
-  ]
-}
diff --git a/ui/retribution_paladin/apls/p5ret-twist-4DR-3.5-3.6.apl.json b/ui/retribution_paladin/apls/p5ret-twist-4DR-3.5-3.6.apl.json
deleted file mode 100644
index 4bf54e6763..0000000000
--- a/ui/retribution_paladin/apls/p5ret-twist-4DR-3.5-3.6.apl.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-      "type": "TypeAPL",
-      "prepullActions": [
-        {"action":{"castSpell":{"spellId":{"spellId":20920,"rank":5}}},"doAtValue":{"const":{"val":"-1.5"}}},
-        {"action":{"castSpell":{"spellId":{"spellId":407798}}},"doAtValue":{"const":{"val":"0"}}}
-      ],
-      "priorityList": [
-        {"action":{"autocastOtherCooldowns":{}}},
-        {"action":{"castSpell":{"spellId":{"spellId":20271}}}},
-        {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"const":{"val":"200ms"}},"rhs":{"autoTimeToNext":{"autoType":"Melee"}}}},{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}}]}},"castSpell":{"spellId":{"spellId":407798}}}},
-        {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"const":{"val":"200ms"}},"rhs":{"autoTimeToNext":{"autoType":"Melee"}}}},{"auraIsActive":{"auraId":{"spellId":407798}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":429152}}}}},{"not":{"val":{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"10%"}}}}}}]}}]}},"castSpell":{"spellId":{"spellId":20920,"rank":5}}}},
-        {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":407798}}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"10%"}}}},{"runeIsEquipped":{"runeId":{"spellId":429152}}}]}},"castSpell":{"spellId":{"spellId":407798}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":24239,"rank":3}}},{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"10%"}}}},{"runeIsEquipped":{"runeId":{"spellId":429152}}}]}},"castSpell":{"spellId":{"spellId":24239,"rank":3}}}},
-        {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":407798}}}}},{"gcdIsReady":{}},{"not":{"val":{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"10%"}}}}}}]}},"castSpell":{"spellId":{"spellId":20920,"rank":5}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":24239,"rank":3}}},{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"20%"}}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.1s"}}}},{"runeIsEquipped":{"runeId":{"spellId":429152}}}]}},"castSpell":{"spellId":{"spellId":24239,"rank":3}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":407778}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":407778}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":407676}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"spellId":407676}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":415073}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}},{"gcdIsReady":{}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":407676}}},"rhs":{"math":{"op":"OpSub","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":407778}}},"rhs":{"math":{"op":"OpSub","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}}}}]}},"castSpell":{"spellId":{"spellId":415073}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":20924,"rank":5}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}},{"gcdIsReady":{}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":407676}}},"rhs":{"math":{"op":"OpSub","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":407778}}},"rhs":{"math":{"op":"OpSub","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}}}}]}},"castSpell":{"spellId":{"spellId":20924,"rank":5}}}}
-      ]
-}
diff --git a/ui/retribution_paladin/apls/p5ret-twist-4DR-3.7-4.0.apl.json b/ui/retribution_paladin/apls/p5ret-twist-4DR-3.7-4.0.apl.json
deleted file mode 100644
index bcb089e87e..0000000000
--- a/ui/retribution_paladin/apls/p5ret-twist-4DR-3.7-4.0.apl.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-      "type": "TypeAPL",
-      "prepullActions": [
-        {"action":{"castSpell":{"spellId":{"spellId":20920,"rank":5}}},"doAtValue":{"const":{"val":"-1.5"}}},
-        {"action":{"castSpell":{"spellId":{"spellId":407798}}},"doAtValue":{"const":{"val":"0"}}}
-      ],
-      "priorityList": [
-        {"action":{"autocastOtherCooldowns":{}}},
-        {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"const":{"val":"200ms"}},"rhs":{"autoTimeToNext":{"autoType":"Melee"}}}},{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}}]}},"castSpell":{"spellId":{"spellId":407798}}}},
-        {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"const":{"val":"200ms"}},"rhs":{"autoTimeToNext":{"autoType":"Melee"}}}},{"auraIsActive":{"auraId":{"spellId":407798}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":429152}}}}},{"not":{"val":{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"10%"}}}}}}]}}]}},"castSpell":{"spellId":{"spellId":20920,"rank":5}}}},
-        {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":407798}}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"10%"}}}},{"runeIsEquipped":{"runeId":{"spellId":429152}}}]}},"castSpell":{"spellId":{"spellId":407798}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":24239,"rank":3}}},{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"10%"}}}},{"runeIsEquipped":{"runeId":{"spellId":429152}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":24239,"rank":3}}},{"castSpell":{"spellId":{"spellId":20271}}}]}}},
-        {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":24239,"rank":3}}},{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"10%"}}}},{"runeIsEquipped":{"runeId":{"spellId":429152}}}]}},"castSpell":{"spellId":{"spellId":24239,"rank":3}}}},
-        {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":20920,"rank":5}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":407798}}}}},{"gcdIsReady":{}},{"not":{"val":{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"10%"}}}}}}]}},"castSpell":{"spellId":{"spellId":20920,"rank":5}}}},
-        {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":24239,"rank":3}}},{"cmp":{"op":"OpLt","lhs":{"remainingTimePercent":{}},"rhs":{"const":{"val":"20%"}}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.1s"}}}},{"runeIsEquipped":{"runeId":{"spellId":429152}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":24239,"rank":3}}},{"castSpell":{"spellId":{"spellId":20271}}}]}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":407778}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}},{"gcdIsReady":{}},{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraInternalCooldown":{"auraId":{"spellId":407975}}},"rhs":{"const":{"val":"0s"}}}},{"cmp":{"op":"OpLt","lhs":{"autoSwingTime":{"autoType":"MainHand"}},"rhs":{"const":{"val":"3.18s"}}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":407778}}},{"castSpell":{"spellId":{"spellId":20271}}}]}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":407676}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}},{"gcdIsReady":{}},{"or":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraInternalCooldown":{"auraId":{"spellId":407975}}},"rhs":{"const":{"val":"0s"}}}},{"cmp":{"op":"OpLt","lhs":{"autoSwingTime":{"autoType":"MainHand"}},"rhs":{"const":{"val":"3.18s"}}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":407676}}},{"castSpell":{"spellId":{"spellId":20271}}}]}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":415073}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}},{"gcdIsReady":{}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":407676}}},"rhs":{"math":{"op":"OpSub","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":407778}}},"rhs":{"math":{"op":"OpSub","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":415073}}},{"castSpell":{"spellId":{"spellId":20271}}}]}}},
-        {"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":20924,"rank":5}}},{"cmp":{"op":"OpGt","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.5s"}}}},{"gcdIsReady":{}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":407676}}},"rhs":{"math":{"op":"OpSub","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":407778}}},"rhs":{"math":{"op":"OpSub","lhs":{"autoTimeToNext":{"autoType":"Any"}},"rhs":{"const":{"val":"1.6s"}}}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":20924,"rank":5}}},{"castSpell":{"spellId":{"spellId":20271}}}]}}}
-      ]
-}
diff --git a/ui/retribution_paladin/inputs.ts b/ui/retribution_paladin/inputs.ts
index 6d2002532d..57e0d6e5cc 100644
--- a/ui/retribution_paladin/inputs.ts
+++ b/ui/retribution_paladin/inputs.ts
@@ -36,28 +36,12 @@ export const PrimarySealSelection = InputHelpers.makeSpecOptionsEnumIconInput<Sp
 			value: PaladinSeal.Command,
 			showWhen: (player: Player<Spec.SpecRetributionPaladin>) => player.getTalents().sealOfCommand,
 		},
-		{
-			actionId: () => ActionId.fromSpellId(407798),
-			value: PaladinSeal.Martyrdom,
-		},
 	],
 	// changeEmitter: (player: Player<Spec.SpecRetributionPaladin>) => player.changeEmitter,
 	changeEmitter: (player: Player<Spec.SpecRetributionPaladin>) =>
 		TypedEvent.onAny([player.gearChangeEmitter, player.talentsChangeEmitter, player.specOptionsChangeEmitter]),
 });
 
-export const CrusaderStrikeStopAttack = InputHelpers.makeSpecOptionsBooleanInput<Spec.SpecRetributionPaladin>({
-	fieldName: 'isUsingCrusaderStrikeStopAttack',
-	label: 'Using Crusader Strike StopAttack Macro',
-	labelTooltip: 'Allows saving of extra attacks',
-});
-
-export const DivineStormStopAttack = InputHelpers.makeSpecOptionsBooleanInput<Spec.SpecRetributionPaladin>({
-	fieldName: 'isUsingDivineStormStopAttack',
-	label: 'Using Divine Storm StopAttack Macro',
-	labelTooltip: 'Allows saving of extra attacks',
-});
-
 export const JudgementStopAttack = InputHelpers.makeSpecOptionsBooleanInput<Spec.SpecRetributionPaladin>({
 	fieldName: 'isUsingJudgementStopAttack',
 	label: 'Using Judgement StopAttack Macro',
diff --git a/ui/retribution_paladin/presets.ts b/ui/retribution_paladin/presets.ts
index b32d7a9082..5c8dca8477 100644
--- a/ui/retribution_paladin/presets.ts
+++ b/ui/retribution_paladin/presets.ts
@@ -23,17 +23,7 @@ import {
 } from '../core/proto/common.js';
 import { PaladinAura, PaladinOptions as RetributionPaladinOptions, PaladinSeal } from '../core/proto/paladin.js';
 import { SavedTalents } from '../core/proto/ui.js';
-import APLP1RetJson from './apls/p1ret.apl.json';
-import APLP2RetJson from './apls/p2ret.apl.json';
-import APLP3RetJson from './apls/p3ret.apl.json';
-import APLP4RetJson from './apls/p4ret.apl.json';
-import APLP4RetExodinJson from './apls/p4ret-exodin.apl.json';
-import APLP4RetExodin6PcT1Json from './apls/p4ret-exodin-6pcT1.apl.json';
-import APLP4RetTwisting6PcT1Json from './apls/p4ret-twisting-6pcT1.apl.json';
-import APLPP5ExodinJson from './apls/p5ret-exodin-6CF2DR.apl.json';
-import APLPP5TwistingSlowJson from './apls/p5ret-twist-4DR-3.5-3.6.apl.json';
-import APLPP5TwistingSlowerJson from './apls/p5ret-twist-4DR-3.7-4.0.apl.json';
-import APLPP5ShockadinJson from './apls/p5Shockadin.apl.json';
+import APLBasicRetJson from './apls/basic_ret.apl.json';
 import BlankGear from './gear_sets/blank.gear.json';
 
 // Preset options for this spec.
@@ -54,27 +44,17 @@ export const DefaultGear = GearBlank;
 //                                 APL Presets
 ///////////////////////////////////////////////////////////////////////////
 
-export const APLP1Ret = PresetUtils.makePresetAPLRotation('P1 Ret', APLP1RetJson);
-export const APLP2Ret = PresetUtils.makePresetAPLRotation('P2 Ret/Shockadin', APLP2RetJson);
-export const APLP3Ret = PresetUtils.makePresetAPLRotation('P3 Ret/Shockadin', APLP3RetJson);
-export const APLP4RetTwist = PresetUtils.makePresetAPLRotation('P4 Ret Twist', APLP4RetJson);
-export const APLP4RetTwist6pT1 = PresetUtils.makePresetAPLRotation('P4 Ret Twist 6pT1', APLP4RetTwisting6PcT1Json);
-export const APLP4RetExodin = PresetUtils.makePresetAPLRotation('P4 Ret Exodin', APLP4RetExodinJson);
-export const APLP4RetExodin6pT1 = PresetUtils.makePresetAPLRotation('P4 Ret Exodin 6pT1', APLP4RetExodin6PcT1Json);
-export const APLPP5Twisting4DRSlow = PresetUtils.makePresetAPLRotation('P5 Twist 4DR Slow 3.5-3.6', APLPP5TwistingSlowJson);
-export const APLPP5Twisting4DRSlower = PresetUtils.makePresetAPLRotation('P5 Twist 4DR Slower 3.7+', APLPP5TwistingSlowerJson);
-export const APLPP5Exodin = PresetUtils.makePresetAPLRotation('P5 Exodin', APLPP5ExodinJson);
-export const APLPP5Shockadin = PresetUtils.makePresetAPLRotation('P5 Shockadin', APLPP5ShockadinJson);
+export const APLBasicRet = PresetUtils.makePresetAPLRotation('Basic Ret', APLBasicRetJson);
 
 export const APLPresets = {
-	[Phase.Phase1]: [APLP1Ret],
-	[Phase.Phase2]: [APLP2Ret],
-	[Phase.Phase3]: [APLP3Ret],
-	[Phase.Phase4]: [APLP4RetTwist, APLP4RetTwist6pT1, APLP4RetExodin, APLP4RetExodin6pT1],
-	[Phase.Phase5]: [APLPP5Twisting4DRSlow, APLPP5Twisting4DRSlower, APLPP5Exodin, APLPP5Shockadin],
+	[Phase.Phase1]: [],
+	[Phase.Phase2]: [],
+	[Phase.Phase3]: [],
+	[Phase.Phase4]: [APLBasicRet],
+	[Phase.Phase5]: [],
 };
 
-export const DefaultAPL = APLPresets[Phase.Phase5][0];
+export const DefaultAPL = APLPresets[Phase.Phase4][0];
 
 ///////////////////////////////////////////////////////////////////////////
 //                                 Talent presets
@@ -83,27 +63,17 @@ export const DefaultAPL = APLPresets[Phase.Phase5][0];
 // Default talents. Uses the wowhead calculator format, make the talents on
 // https://wowhead.com/classic/talent-calc and copy the numbers in the url.
 
-export const P1RetTalents = PresetUtils.makePresetTalents('P1 Ret', SavedTalents.create({ talentsString: '--05230051' }));
-
-export const P2RetTalents = PresetUtils.makePresetTalents('P2 Ret', SavedTalents.create({ talentsString: '--532300512003151' }));
-
-export const P2ShockadinTalents = PresetUtils.makePresetTalents('P2 Shockadin', SavedTalents.create({ talentsString: '55050100521151--' }));
-
-export const P3RetTalents = PresetUtils.makePresetTalents('P3 Ret', SavedTalents.create({ talentsString: '500501--53230051200315' }));
-
 export const P4RetTalents = PresetUtils.makePresetTalents('P4/P5 Ret', SavedTalents.create({ talentsString: '500501-503-52230351200315' }));
 
-export const P5ShockadinTalents = PresetUtils.makePresetTalents('P5 Shockadin', SavedTalents.create({ talentsString: '55053100501051--052303511' }));
 
 export const TalentPresets = {
-	[Phase.Phase1]: [P1RetTalents],
-	[Phase.Phase2]: [P2RetTalents, P2ShockadinTalents],
-	[Phase.Phase3]: [P3RetTalents],
+	[Phase.Phase1]: [],
+	[Phase.Phase2]: [],
+	[Phase.Phase3]: [],
 	[Phase.Phase4]: [P4RetTalents],
-	[Phase.Phase5]: [P4RetTalents, P5ShockadinTalents],
 };
 
-export const DefaultTalents = TalentPresets[Phase.Phase5][0];
+export const DefaultTalents = TalentPresets[Phase.Phase4][0];
 
 ///////////////////////////////////////////////////////////////////////////
 //                                 Options
@@ -111,7 +81,7 @@ export const DefaultTalents = TalentPresets[Phase.Phase5][0];
 
 export const DefaultOptions = RetributionPaladinOptions.create({
 	aura: PaladinAura.SanctityAura,
-	primarySeal: PaladinSeal.Martyrdom,
+	primarySeal: PaladinSeal.Righteousness,
 });
 
 export const DefaultConsumes = Consumes.create({
diff --git a/ui/retribution_paladin/sim.ts b/ui/retribution_paladin/sim.ts
index 9fb75d3e15..16e71fa7b5 100644
--- a/ui/retribution_paladin/sim.ts
+++ b/ui/retribution_paladin/sim.ts
@@ -125,9 +125,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, {
 		inputs: [
 			OtherInputs.TankAssignment,
 			OtherInputs.InFrontOfTarget,
-			RetributionPaladinInputs.CrusaderStrikeStopAttack,
 			RetributionPaladinInputs.JudgementStopAttack,
-			RetributionPaladinInputs.DivineStormStopAttack,
 		],
 	},
 	encounterPicker: {
@@ -137,7 +135,6 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, {
 
 	presets: {
 		rotations: [
-			...Presets.APLPresets[Phase.Phase5],
 			...Presets.APLPresets[Phase.Phase4],
 			...Presets.APLPresets[Phase.Phase3],
 			...Presets.APLPresets[Phase.Phase2],
@@ -145,7 +142,6 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, {
 		],
 		// Preset talents that the user can quickly select.
 		talents: [
-			...Presets.TalentPresets[Phase.Phase5],
 			...Presets.TalentPresets[Phase.Phase4],
 			...Presets.TalentPresets[Phase.Phase3],
 			...Presets.TalentPresets[Phase.Phase2],