diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results
deleted file mode 100644
index 5843f41bb..000000000
--- a/sim/druid/balance/TestBalance.results
+++ /dev/null
@@ -1,196 +0,0 @@
-character_stats_results: {
- key: "TestBalance-Phase5-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 217.35
-  final_stats: 200.1
-  final_stats: 300.2075
-  final_stats: 180.55
-  final_stats: 210.45
-  final_stats: 150
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 49.25
-  final_stats: 0
-  final_stats: 25.81519
-  final_stats: 0
-  final_stats: 0
-  final_stats: 1044.7
-  final_stats: 0
-  final_stats: 23.905
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 3672.25
-  final_stats: 0
-  final_stats: 0
-  final_stats: 784.2
-  final_stats: 540
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 10.905
-  final_stats: 5
-  final_stats: 0
-  final_stats: 4835.32875
-  final_stats: 27
-  final_stats: 60
-  final_stats: 60
-  final_stats: 70
-  final_stats: 60
-  final_stats: 384
-  final_stats: 0
-  final_stats: 35
-  final_stats: 0
- }
-}
-stat_weights_results: {
- key: "TestBalance-Phase5-Lvl60-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.41993
-  weights: 0
-  weights: 0.49198
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 4.11318
-  weights: 3.16483
-  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
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Average-Default"
- value: {
-  dps: 502.03576
-  tps: 523.22217
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 520.28089
-  tps: 758.25771
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 409.77009
-  tps: 422.72601
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 536.40526
-  tps: 557.19402
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 246.78487
-  tps: 427.5317
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 195.64652
-  tps: 204.68386
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 361.0815
-  tps: 376.26525
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 495.0913
-  tps: 730.51146
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 393.46144
-  tps: 406.23053
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 534.12213
-  tps: 554.86172
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 241.68414
-  tps: 422.43096
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 192.73883
-  tps: 201.77617
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 361.5953
-  tps: 376.77906
- }
-}
-dps_results: {
- key: "TestBalance-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 494.86012
-  tps: 516.25597
- }
-}
diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results
deleted file mode 100644
index 288b814f9..000000000
--- a/sim/druid/feral/TestFeral.results
+++ /dev/null
@@ -1,364 +0,0 @@
-character_stats_results: {
- key: "TestFeral-Phase5-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 329.82
-  final_stats: 228.85
-  final_stats: 300.2075
-  final_stats: 216.66
-  final_stats: 210.45
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 41.25
-  final_stats: 0
-  final_stats: 26.41822
-  final_stats: 0
-  final_stats: 0
-  final_stats: 1748.49
-  final_stats: 0
-  final_stats: 33.3425
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 6213.9
-  final_stats: 0
-  final_stats: 0
-  final_stats: 841.7
-  final_stats: 580
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 16.3425
-  final_stats: 5
-  final_stats: 0
-  final_stats: 4835.32875
-  final_stats: 27
-  final_stats: 60
-  final_stats: 60
-  final_stats: 70
-  final_stats: 60
-  final_stats: 384
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
- }
-}
-stat_weights_results: {
- key: "TestFeral-Phase5-Lvl60-StatWeights-Default"
- value: {
-  weights: 0.67462
-  weights: 0.53884
-  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.24451
-  weights: 0
-  weights: 5.48958
-  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: "TestFeral-Phase5-Lvl60-Average-Default"
- value: {
-  dps: 709.44416
-  tps: 528.09487
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 405.3226
-  tps: 520.99922
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 384.24199
-  tps: 284.53209
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 452.29707
-  tps: 333.294
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 181.39652
-  tps: 305.24379
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 166.99752
-  tps: 127.4363
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 210.30186
-  tps: 167.41165
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 405.3226
-  tps: 520.99922
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 384.24199
-  tps: 284.53209
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 452.29707
-  tps: 333.294
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 181.39652
-  tps: 305.24379
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 166.99752
-  tps: 127.4363
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 210.30186
-  tps: 167.41165
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 405.3226
-  tps: 520.99922
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 384.24199
-  tps: 284.53209
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 452.29707
-  tps: 333.294
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 181.39652
-  tps: 305.24379
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 166.99752
-  tps: 127.4363
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 210.30186
-  tps: 167.41165
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 420.29532
-  tps: 530.84234
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 399.68342
-  tps: 295.50391
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 472.61736
-  tps: 351.86128
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 180.76748
-  tps: 305.07322
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 166.51698
-  tps: 127.11686
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 210.58222
-  tps: 167.65243
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 420.29532
-  tps: 530.84234
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 399.68342
-  tps: 295.50391
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 472.61736
-  tps: 351.86128
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 180.76748
-  tps: 305.07322
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 166.51698
-  tps: 127.11686
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Default-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 210.58222
-  tps: 167.65243
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 420.29532
-  tps: 530.84234
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 399.68342
-  tps: 295.50391
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 472.61736
-  tps: 351.86128
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 180.76748
-  tps: 305.07322
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 166.51698
-  tps: 127.11686
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-Settings-Tauren-blank-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 210.58222
-  tps: 167.65243
- }
-}
-dps_results: {
- key: "TestFeral-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 376.62744
-  tps: 267.40548
- }
-}
diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results
deleted file mode 100644
index 36900a9d3..000000000
--- a/sim/hunter/TestBM.results
+++ /dev/null
@@ -1,280 +0,0 @@
-character_stats_results: {
- key: "TestBM-Phase2-Lvl40-CharacterStats-Default"
- value: {
-  final_stats: 211.255
-  final_stats: 332.695
-  final_stats: 359.32325
-  final_stats: 163.185
-  final_stats: 191.015
-  final_stats: 162
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 34.75
-  final_stats: 0
-  final_stats: 28.53276
-  final_stats: 0
-  final_stats: 0
-  final_stats: 1127.95
-  final_stats: 0
-  final_stats: 30.08066
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 3272.775
-  final_stats: 0
-  final_stats: 0
-  final_stats: 2503.39
-  final_stats: 1281.39
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 4380.2325
-  final_stats: 13
-  final_stats: 56
-  final_stats: 30
-  final_stats: 30
-  final_stats: 30
-  final_stats: 263
-  final_stats: 0
-  final_stats: 35
-  final_stats: 0
- }
-}
-stat_weights_results: {
- key: "TestBM-Phase2-Lvl40-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0.50664
-  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.13996
-  weights: 4.3644
-  weights: 3.36833
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.07897
-  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: "TestBM-Phase2-Lvl40-Average-Default"
- value: {
-  dps: 653.95169
-  tps: 298.34077
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 938.88875
-  tps: 912.66402
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 667.23482
-  tps: 313.89596
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 701.09983
-  tps: 319.47299
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 389.83157
-  tps: 609.23817
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 199.49201
-  tps: 112.68143
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 214.83784
-  tps: 106.45497
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 787.77778
-  tps: 681.30603
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 698.66246
-  tps: 339.611
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 734.58089
-  tps: 336.78729
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 295.57734
-  tps: 561.83868
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 251.93539
-  tps: 167.86977
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 273.04179
-  tps: 168.58356
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_melee-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 920.3286
-  tps: 894.1469
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_melee-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 652.573
-  tps: 298.23343
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_melee-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 685.67111
-  tps: 300.57623
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_melee-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 394.08419
-  tps: 603.97612
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_melee-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 204.56596
-  tps: 113.66426
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_melee-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 222.20253
-  tps: 107.48562
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_ranged_bm-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 764.88278
-  tps: 717.87402
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_ranged_bm-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 682.45237
-  tps: 326.12824
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_ranged_bm-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 718.89282
-  tps: 322.33991
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_ranged_bm-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 296.4647
-  tps: 559.91976
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_ranged_bm-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 253.84926
-  tps: 166.05371
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-Settings-Orc-placeholder-Basic-p2_ranged_bm-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 274.46254
-  tps: 167.6218
- }
-}
-dps_results: {
- key: "TestBM-Phase2-Lvl40-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 632.37975
-  tps: 278.24115
- }
-}
diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results
deleted file mode 100644
index 54e9f0763..000000000
--- a/sim/hunter/TestMM.results
+++ /dev/null
@@ -1,210 +0,0 @@
-character_stats_results: {
- key: "TestMM-Phase4-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 297.275
-  final_stats: 507.265
-  final_stats: 474.2485
-  final_stats: 215.05
-  final_stats: 246.675
-  final_stats: 162
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 47.25
-  final_stats: 3
-  final_stats: 28.14833
-  final_stats: 0
-  final_stats: 0
-  final_stats: 1602.54
-  final_stats: 3
-  final_stats: 34.58731
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 4665.75
-  final_stats: 0
-  final_stats: 0
-  final_stats: 2852.53
-  final_stats: 1870.53
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 6709.2541
-  final_stats: 27
-  final_stats: 86
-  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: "TestMM-Phase4-Lvl60-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0.15354
-  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.12138
-  weights: 7.19003
-  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
-  weights: 0
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-AllItems-DevilsaurEye-19991"
- value: {
-  dps: 343.41085
-  tps: 355.72397
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-AllItems-DevilsaurTooth-19992"
- value: {
-  dps: 338.0538
-  tps: 350.37503
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Average-Default"
- value: {
-  dps: 337.33348
-  tps: 349.70703
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 419.37663
-  tps: 579.42693
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 274.78179
-  tps: 282.80397
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 266.84113
-  tps: 276.55328
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 174.1017
-  tps: 414.45707
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 112.97901
-  tps: 124.99678
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 111.38138
-  tps: 115.74126
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 449.68521
-  tps: 610.1654
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 296.74888
-  tps: 304.78254
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 301.1019
-  tps: 310.94522
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_ranged-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 173.0927
-  tps: 413.95607
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_ranged-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 113.4107
-  tps: 125.45386
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_ranged-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 116.07029
-  tps: 120.43017
- }
-}
-dps_results: {
- key: "TestMM-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 224.48153
-  tps: 236.67331
- }
-}
diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results
deleted file mode 100644
index a77972337..000000000
--- a/sim/hunter/TestSV.results
+++ /dev/null
@@ -1,210 +0,0 @@
-character_stats_results: {
- key: "TestSV-Phase4-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 297.275
-  final_stats: 583.35475
-  final_stats: 474.2485
-  final_stats: 215.05
-  final_stats: 246.675
-  final_stats: 162
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 47.25
-  final_stats: 3
-  final_stats: 28.14833
-  final_stats: 0
-  final_stats: 0
-  final_stats: 1678.62975
-  final_stats: 3
-  final_stats: 39.0254
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 4665.75
-  final_stats: 0
-  final_stats: 0
-  final_stats: 3004.7095
-  final_stats: 1922.7095
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 6582.6644
-  final_stats: 27
-  final_stats: 86
-  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: "TestSV-Phase4-Lvl60-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0.23711
-  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.13693
-  weights: 7.55342
-  weights: 1.10189
-  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: "TestSV-Phase4-Lvl60-AllItems-DevilsaurEye-19991"
- value: {
-  dps: 466.59017
-  tps: 404.77075
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-AllItems-DevilsaurTooth-19992"
- value: {
-  dps: 462.52818
-  tps: 399.46188
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Average-Default"
- value: {
-  dps: 460.30515
-  tps: 398.87454
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 1324.90663
-  tps: 1909.48506
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 459.93206
-  tps: 397.14761
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 460.26913
-  tps: 394.30809
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 758.08202
-  tps: 1425.79955
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 178.18299
-  tps: 169.04959
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 180.93972
-  tps: 162.40202
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 1325.62601
-  tps: 1934.85365
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 455.40794
-  tps: 396.73842
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 456.19204
-  tps: 391.57823
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_weave-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 754.54603
-  tps: 1415.54554
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_weave-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 176.9543
-  tps: 167.04892
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-Settings-Orc-placeholder-Weave-p4_weave-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 183.63139
-  tps: 160.99185
- }
-}
-dps_results: {
- key: "TestSV-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 323.67628
-  tps: 281.33173
- }
-}
diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results
deleted file mode 100644
index 017e8f275..000000000
--- a/sim/mage/TestArcane.results
+++ /dev/null
@@ -1,196 +0,0 @@
-character_stats_results: {
- key: "TestArcane-Phase5-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 172.5
-  final_stats: 179.4
-  final_stats: 265.8225
-  final_stats: 221.95
-  final_stats: 220.8
-  final_stats: 150
-  final_stats: 0
-  final_stats: 40
-  final_stats: 15
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 41.25
-  final_stats: 0
-  final_stats: 24.92876
-  final_stats: 0
-  final_stats: 0
-  final_stats: 792.5
-  final_stats: 0
-  final_stats: 16.2
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 4688.475
-  final_stats: 0
-  final_stats: 0
-  final_stats: 358.8
-  final_stats: 540
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 3.2
-  final_stats: 5
-  final_stats: 0
-  final_stats: 4148.225
-  final_stats: 52
-  final_stats: 85
-  final_stats: 85
-  final_stats: 85
-  final_stats: 85
-  final_stats: 384
-  final_stats: 0
-  final_stats: 35
-  final_stats: 0
- }
-}
-stat_weights_results: {
- key: "TestArcane-Phase5-Lvl60-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.28967
-  weights: 0
-  weights: 0.43631
-  weights: 0
-  weights: 0.05906
-  weights: 0.37724
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 4.93705
-  weights: 2.55452
-  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
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Average-Default"
- value: {
-  dps: 372.01945
-  tps: 386.74766
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 371.0616
-  tps: 648.00894
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 371.0616
-  tps: 384.90897
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 388.44813
-  tps: 404.27494
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 197.61902
-  tps: 439.20185
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 197.61902
-  tps: 209.69816
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 250.03264
-  tps: 265.51076
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 369.74627
-  tps: 635.6476
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 369.74627
-  tps: 383.04134
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 399.77203
-  tps: 416.03702
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 198.01526
-  tps: 437.80854
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 198.01526
-  tps: 210.00492
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 253.36293
-  tps: 268.84104
- }
-}
-dps_results: {
- key: "TestArcane-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 369.60437
-  tps: 383.11611
- }
-}
diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results
deleted file mode 100644
index fbbdfca19..000000000
--- a/sim/mage/TestFrost.results
+++ /dev/null
@@ -1,196 +0,0 @@
-character_stats_results: {
- key: "TestFrost-Phase5-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 172.5
-  final_stats: 179.4
-  final_stats: 265.8225
-  final_stats: 221.95
-  final_stats: 220.8
-  final_stats: 150
-  final_stats: 0
-  final_stats: 40
-  final_stats: 15
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 41.25
-  final_stats: 0
-  final_stats: 24.92876
-  final_stats: 0
-  final_stats: 0
-  final_stats: 792.5
-  final_stats: 0
-  final_stats: 16.2
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 4262.25
-  final_stats: 0
-  final_stats: 0
-  final_stats: 358.8
-  final_stats: 540
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 3.2
-  final_stats: 5
-  final_stats: 0
-  final_stats: 4148.225
-  final_stats: 31
-  final_stats: 64
-  final_stats: 64
-  final_stats: 64
-  final_stats: 64
-  final_stats: 384
-  final_stats: 0
-  final_stats: 35
-  final_stats: 0
- }
-}
-stat_weights_results: {
- key: "TestFrost-Phase5-Lvl60-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.10653
-  weights: 0
-  weights: 0.46322
-  weights: 0
-  weights: 0.06157
-  weights: 0.40165
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 5.49189
-  weights: 2.56205
-  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
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Average-Default"
- value: {
-  dps: 392.75219
-  tps: 315.3999
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 399.58783
-  tps: 587.87827
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 399.58783
-  tps: 318.94962
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 400.34254
-  tps: 322.31659
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 225.11332
-  tps: 404.6202
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 225.11332
-  tps: 183.3459
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 268.33572
-  tps: 220.57852
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 390.98053
-  tps: 580.85367
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 390.98053
-  tps: 313.15673
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 396.72646
-  tps: 322.21705
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget"
- value: {
-  dps: 224.67699
-  tps: 406.5577
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget"
- value: {
-  dps: 224.67699
-  tps: 182.93016
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget"
- value: {
-  dps: 267.36261
-  tps: 219.59609
- }
-}
-dps_results: {
- key: "TestFrost-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 389.92099
-  tps: 313.27487
- }
-}
diff --git a/sim/mage/TestP1Mage.results b/sim/mage/TestP1Mage.results
index 8a9be8c52..8f5307709 100644
--- a/sim/mage/TestP1Mage.results
+++ b/sim/mage/TestP1Mage.results
@@ -53,7 +53,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.01506
+  weights: 0.01497
   weights: 0
   weights: 0.16867
   weights: 0
@@ -63,8 +63,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.92841
-  weights: 1.33618
+  weights: 0.92368
+  weights: 1.32992
   weights: 0
   weights: 0
   weights: 0
@@ -99,29 +99,29 @@ stat_weights_results: {
 dps_results: {
  key: "TestP1Mage-Phase1-Average-Default"
  value: {
-  dps: 71.27337
-  tps: 78.50702
+  dps: 70.94274
+  tps: 78.17638
  }
 }
 dps_results: {
  key: "TestP1Mage-Phase1-Settings-Gnome-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 74.6557
-  tps: 186.3813
+  dps: 74.30928
+  tps: 186.03488
  }
 }
 dps_results: {
  key: "TestP1Mage-Phase1-Settings-Gnome-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 74.6557
-  tps: 80.24198
+  dps: 74.30928
+  tps: 79.89556
  }
 }
 dps_results: {
  key: "TestP1Mage-Phase1-Settings-Gnome-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 68.75136
-  tps: 74.10736
+  dps: 68.434
+  tps: 73.79
  }
 }
 dps_results: {
@@ -148,22 +148,22 @@ dps_results: {
 dps_results: {
  key: "TestP1Mage-Phase1-Settings-Troll-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 72.74565
-  tps: 202.95578
+  dps: 72.40866
+  tps: 202.61879
  }
 }
 dps_results: {
  key: "TestP1Mage-Phase1-Settings-Troll-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 72.74565
-  tps: 79.25615
+  dps: 72.40866
+  tps: 78.91916
  }
 }
 dps_results: {
  key: "TestP1Mage-Phase1-Settings-Troll-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 66.9292
-  tps: 73.50845
+  dps: 66.62106
+  tps: 73.20031
  }
 }
 dps_results: {
@@ -190,7 +190,7 @@ dps_results: {
 dps_results: {
  key: "TestP1Mage-Phase1-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 71.89682
-  tps: 79.12603
+  dps: 71.56379
+  tps: 78.79299
  }
 }
diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results
deleted file mode 100644
index b3478b8bf..000000000
--- a/sim/priest/shadow/TestShadow.results
+++ /dev/null
@@ -1,196 +0,0 @@
-character_stats_results: {
- key: "TestShadow-Phase5-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 178.25
-  final_stats: 185.15
-  final_stats: 354.1655
-  final_stats: 216.2
-  final_stats: 226.55
-  final_stats: 150
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 40
-  final_stats: 41.25
-  final_stats: 0
-  final_stats: 25.43216
-  final_stats: 0
-  final_stats: 0
-  final_stats: 798.25
-  final_stats: 0
-  final_stats: 16
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 4339
-  final_stats: 0
-  final_stats: 0
-  final_stats: 370.3
-  final_stats: 540
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 3
-  final_stats: 5
-  final_stats: 0
-  final_stats: 5058.655
-  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: "TestShadow-Phase5-Lvl60-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.21637
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.21637
-  weights: 0
-  weights: 1.87704
-  weights: 0.77573
-  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
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Average-Default"
- value: {
-  dps: 286.06733
-  tps: 276.95122
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 644.32784
-  tps: 810.64669
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 280.56029
-  tps: 271.6082
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 286.68517
-  tps: 277.38896
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 286.20154
-  tps: 448.27043
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 192.23402
-  tps: 188.87547
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Settings-NightElf-blank-Basic-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 196.52876
-  tps: 188.66761
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 590.44037
-  tps: 781.1205
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 284.04091
-  tps: 275.05313
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 280.26214
-  tps: 271.34086
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 294.10019
-  tps: 455.85314
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 194.36975
-  tps: 192.39595
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-Settings-Troll-blank-Basic-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 191.14629
-  tps: 183.50044
- }
-}
-dps_results: {
- key: "TestShadow-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 284.04091
-  tps: 275.05313
- }
-}
diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results
deleted file mode 100644
index 0bfa0c765..000000000
--- a/sim/warlock/dps/TestAffliction.results
+++ /dev/null
@@ -1,162 +0,0 @@
-character_stats_results: {
- key: "TestAffliction-Phase4-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 194.35
-  final_stats: 203.55
-  final_stats: 437.7475
-  final_stats: 258.75
-  final_stats: 239.2
-  final_stats: 564.6
-  final_stats: 0
-  final_stats: 40
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 159
-  final_stats: 45.25
-  final_stats: 5
-  final_stats: 28.96938
-  final_stats: 0
-  final_stats: 0
-  final_stats: 814.35
-  final_stats: 0
-  final_stats: 25.1775
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 4974.25
-  final_stats: 0
-  final_stats: 0
-  final_stats: 1353.1
-  final_stats: 540
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 12.1775
-  final_stats: 5
-  final_stats: 0
-  final_stats: 5911.475
-  final_stats: 27
-  final_stats: 76
-  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: "TestAffliction-Phase4-Lvl60-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.02841
-  weights: 0
-  weights: 0.28413
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 3.47155
-  weights: 0.74065
-  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
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Average-Default"
- value: {
-  dps: 503.11693
-  tps: 355.02362
-  hps: 207.21698
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Settings-Orc-placeholder-Affliction Warlock-affliction-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 500.4467
-  tps: 822.12009
-  hps: 206.57229
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Settings-Orc-placeholder-Affliction Warlock-affliction-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 500.4467
-  tps: 352.10643
-  hps: 206.57229
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Settings-Orc-placeholder-Affliction Warlock-affliction-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 523.21588
-  tps: 376.7872
-  hps: 196.21055
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Settings-Orc-placeholder-Affliction Warlock-affliction-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 308.23238
-  tps: 748.95525
-  hps: 119.78727
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Settings-Orc-placeholder-Affliction Warlock-affliction-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 308.23238
-  tps: 224.64519
-  hps: 119.78727
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Settings-Orc-placeholder-Affliction Warlock-affliction-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 334.51601
-  tps: 250.15416
-  hps: 112.94454
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 500.4467
-  tps: 352.10643
-  hps: 206.57229
- }
-}
diff --git a/sim/warlock/dps/TestDemonology.results b/sim/warlock/dps/TestDemonology.results
deleted file mode 100644
index 7574a8037..000000000
--- a/sim/warlock/dps/TestDemonology.results
+++ /dev/null
@@ -1,154 +0,0 @@
-character_stats_results: {
- key: "TestDemonology-Phase2-Lvl40-CharacterStats-Default"
- value: {
-  final_stats: 120.75
-  final_stats: 80.5
-  final_stats: 398.46925
-  final_stats: 189.75
-  final_stats: 158.4125
-  final_stats: 524.20625
-  final_stats: 0
-  final_stats: 40
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 159
-  final_stats: 32.75
-  final_stats: 5
-  final_stats: 29.67145
-  final_stats: 0
-  final_stats: 0
-  final_stats: 566.75
-  final_stats: 0
-  final_stats: 20.6189
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 3489.25
-  final_stats: 0
-  final_stats: 0
-  final_stats: 986
-  final_stats: 440
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 7.6189
-  final_stats: 5
-  final_stats: 0
-  final_stats: 4738.6925
-  final_stats: 13
-  final_stats: 46
-  final_stats: 30
-  final_stats: 30
-  final_stats: 30
-  final_stats: 263
-  final_stats: 0
-  final_stats: 35
-  final_stats: 0
- }
-}
-stat_weights_results: {
- key: "TestDemonology-Phase2-Lvl40-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.004
-  weights: 0
-  weights: 0.0709
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.13387
-  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
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
- }
-}
-dps_results: {
- key: "TestDemonology-Phase2-Lvl40-Average-Default"
- value: {
-  dps: 76.1651
-  tps: 80.20343
- }
-}
-dps_results: {
- key: "TestDemonology-Phase2-Lvl40-Settings-Orc-placeholder-Demonology Warlock-demonology-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 75.78854
-  tps: 89.68818
- }
-}
-dps_results: {
- key: "TestDemonology-Phase2-Lvl40-Settings-Orc-placeholder-Demonology Warlock-demonology-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 75.78854
-  tps: 79.81293
- }
-}
-dps_results: {
- key: "TestDemonology-Phase2-Lvl40-Settings-Orc-placeholder-Demonology Warlock-demonology-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 81.78573
-  tps: 100.98705
- }
-}
-dps_results: {
- key: "TestDemonology-Phase2-Lvl40-Settings-Orc-placeholder-Demonology Warlock-demonology-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 52.79904
-  tps: 54.97303
- }
-}
-dps_results: {
- key: "TestDemonology-Phase2-Lvl40-Settings-Orc-placeholder-Demonology Warlock-demonology-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 52.79904
-  tps: 54.97303
- }
-}
-dps_results: {
- key: "TestDemonology-Phase2-Lvl40-Settings-Orc-placeholder-Demonology Warlock-demonology-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 55.93888
-  tps: 67.23421
- }
-}
-dps_results: {
- key: "TestDemonology-Phase2-Lvl40-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 75.78854
-  tps: 79.81293
- }
-}
diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results
deleted file mode 100644
index 877530544..000000000
--- a/sim/warlock/dps/TestDestruction.results
+++ /dev/null
@@ -1,154 +0,0 @@
-character_stats_results: {
- key: "TestDestruction-Phase4-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 194.35
-  final_stats: 203.55
-  final_stats: 503.40962
-  final_stats: 258.75
-  final_stats: 227.24
-  final_stats: 558.62
-  final_stats: 0
-  final_stats: 40
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 159
-  final_stats: 45.25
-  final_stats: 5
-  final_stats: 28.96938
-  final_stats: 0
-  final_stats: 0
-  final_stats: 814.35
-  final_stats: 0
-  final_stats: 25.1775
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 4974.25
-  final_stats: 0
-  final_stats: 0
-  final_stats: 1353.1
-  final_stats: 540
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 12.1775
-  final_stats: 5
-  final_stats: 0
-  final_stats: 6568.09625
-  final_stats: 27
-  final_stats: 76
-  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: "TestDestruction-Phase4-Lvl60-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.23734
-  weights: 0
-  weights: 0.35633
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 5.08727
-  weights: 2.46119
-  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
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Average-Default"
- value: {
-  dps: 662.52898
-  tps: 495.4123
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Settings-Orc-placeholder-Destruction Warlock-destruction-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 664.84066
-  tps: 1093.96523
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Settings-Orc-placeholder-Destruction Warlock-destruction-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 664.84066
-  tps: 498.74818
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Settings-Orc-placeholder-Destruction Warlock-destruction-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 728.86416
-  tps: 587.44758
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Settings-Orc-placeholder-Destruction Warlock-destruction-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 124.33411
-  tps: 892.43736
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Settings-Orc-placeholder-Destruction Warlock-destruction-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 124.33411
-  tps: 49.90734
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Settings-Orc-placeholder-Destruction Warlock-destruction-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 108.5207
-  tps: 34.05603
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 664.58069
-  tps: 498.37335
- }
-}
diff --git a/sim/warlock/tank/TestAffliction.results b/sim/warlock/tank/TestAffliction.results
deleted file mode 100644
index 6402954b9..000000000
--- a/sim/warlock/tank/TestAffliction.results
+++ /dev/null
@@ -1,162 +0,0 @@
-character_stats_results: {
- key: "TestAffliction-Phase4-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 192.05
-  final_stats: 190.9
-  final_stats: 309.465
-  final_stats: 194.35
-  final_stats: 231.15
-  final_stats: 325.575
-  final_stats: 0
-  final_stats: 40
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 40
-  final_stats: 41.25
-  final_stats: 0
-  final_stats: 25.90678
-  final_stats: 0
-  final_stats: 0
-  final_stats: 812.05
-  final_stats: 0
-  final_stats: 24.545
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 4008.25
-  final_stats: 0
-  final_stats: 0
-  final_stats: 765.8
-  final_stats: 540
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 11.545
-  final_stats: 5
-  final_stats: 0
-  final_stats: 4628.65
-  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: "TestAffliction-Phase4-Lvl60-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: -0.24219
-  weights: 0
-  weights: 0.07296
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 3.66598
-  weights: 1.00627
-  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
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Average-Default"
- value: {
-  dps: 395.84375
-  tps: 281.87701
-  hps: 143.33867
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Settings-Orc-blank-Affliction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 395.57517
-  tps: 703.08928
-  hps: 142.8239
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Settings-Orc-blank-Affliction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 395.57517
-  tps: 283.01063
-  hps: 142.8239
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Settings-Orc-blank-Affliction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 452.30043
-  tps: 318.40647
-  hps: 145.6732
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Settings-Orc-blank-Affliction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 223.03096
-  tps: 698.11297
-  hps: 82.49614
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Settings-Orc-blank-Affliction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 223.03096
-  tps: 179.23118
-  hps: 82.49614
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-Settings-Orc-blank-Affliction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 245.33588
-  tps: 198.82781
-  hps: 87.92117
- }
-}
-dps_results: {
- key: "TestAffliction-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 390.74659
-  tps: 276.99213
-  hps: 143.19304
- }
-}
diff --git a/sim/warlock/tank/TestDemonology.results b/sim/warlock/tank/TestDemonology.results
deleted file mode 100644
index 726842093..000000000
--- a/sim/warlock/tank/TestDemonology.results
+++ /dev/null
@@ -1,162 +0,0 @@
-character_stats_results: {
- key: "TestDemonology-Phase4-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 192.05
-  final_stats: 190.9
-  final_stats: 355.88475
-  final_stats: 194.35
-  final_stats: 219.5925
-  final_stats: 319.79625
-  final_stats: 0
-  final_stats: 61
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 40
-  final_stats: 41.25
-  final_stats: 0
-  final_stats: 25.90678
-  final_stats: 0
-  final_stats: 0
-  final_stats: 812.05
-  final_stats: 0
-  final_stats: 24.545
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 4008.25
-  final_stats: 0
-  final_stats: 0
-  final_stats: 765.8
-  final_stats: 540
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 11.545
-  final_stats: 5
-  final_stats: 0
-  final_stats: 5092.8475
-  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: "TestDemonology-Phase4-Lvl60-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.02972
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.51017
-  weights: 0.29947
-  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
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
- }
-}
-dps_results: {
- key: "TestDemonology-Phase4-Lvl60-Average-Default"
- value: {
-  dps: 47.54011
-  tps: 54.8855
-  hps: 2.70296
- }
-}
-dps_results: {
- key: "TestDemonology-Phase4-Lvl60-Settings-Orc-blank-Demonology Warlock-p4_demo_tank-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 35.20133
-  tps: 97.83623
-  hps: 2.65522
- }
-}
-dps_results: {
- key: "TestDemonology-Phase4-Lvl60-Settings-Orc-blank-Demonology Warlock-p4_demo_tank-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 35.20133
-  tps: 42.64598
-  hps: 2.65522
- }
-}
-dps_results: {
- key: "TestDemonology-Phase4-Lvl60-Settings-Orc-blank-Demonology Warlock-p4_demo_tank-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 57.07716
-  tps: 79.38914
-  hps: 13.78919
- }
-}
-dps_results: {
- key: "TestDemonology-Phase4-Lvl60-Settings-Orc-blank-Demonology Warlock-p4_demo_tank-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 20.24215
-  tps: 78.72015
-  hps: 1.57632
- }
-}
-dps_results: {
- key: "TestDemonology-Phase4-Lvl60-Settings-Orc-blank-Demonology Warlock-p4_demo_tank-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 20.24215
-  tps: 25.67848
-  hps: 1.57632
- }
-}
-dps_results: {
- key: "TestDemonology-Phase4-Lvl60-Settings-Orc-blank-Demonology Warlock-p4_demo_tank-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 33.98654
-  tps: 48.23407
-  hps: 8.38795
- }
-}
-dps_results: {
- key: "TestDemonology-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 41.88046
-  tps: 49.34478
-  hps: 2.65522
- }
-}
diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results
deleted file mode 100644
index e8ddeebe6..000000000
--- a/sim/warlock/tank/TestDestruction.results
+++ /dev/null
@@ -1,162 +0,0 @@
-character_stats_results: {
- key: "TestDestruction-Phase4-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 192.05
-  final_stats: 190.9
-  final_stats: 309.465
-  final_stats: 194.35
-  final_stats: 231.15
-  final_stats: 325.575
-  final_stats: 0
-  final_stats: 40
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 40
-  final_stats: 41.25
-  final_stats: 0
-  final_stats: 25.90678
-  final_stats: 0
-  final_stats: 0
-  final_stats: 812.05
-  final_stats: 0
-  final_stats: 24.545
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 4008.25
-  final_stats: 0
-  final_stats: 0
-  final_stats: 765.8
-  final_stats: 540
-  final_stats: 0
-  final_stats: 5
-  final_stats: 0
-  final_stats: 11.545
-  final_stats: 5
-  final_stats: 0
-  final_stats: 4628.65
-  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: "TestDestruction-Phase4-Lvl60-StatWeights-Default"
- value: {
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0.91009
-  weights: 0
-  weights: 0.11006
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 3.92216
-  weights: 1.09794
-  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
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
-  weights: 0
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Average-Default"
- value: {
-  dps: 389.2209
-  tps: 277.26564
-  hps: 136.1828
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Settings-Orc-blank-Destruction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 388.3852
-  tps: 702.12766
-  hps: 133.92194
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Settings-Orc-blank-Destruction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 388.3852
-  tps: 276.76072
-  hps: 133.92194
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Settings-Orc-blank-Destruction Warlock-p4_destro_aff_tank-FullBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 437.42061
-  tps: 307.31494
-  hps: 140.78957
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Settings-Orc-blank-Destruction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-LongMultiTarget"
- value: {
-  dps: 217.59792
-  tps: 687.37145
-  hps: 79.34399
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Settings-Orc-blank-Destruction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-LongSingleTarget"
- value: {
-  dps: 217.59792
-  tps: 175.07065
-  hps: 79.34399
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-Settings-Orc-blank-Destruction Warlock-p4_destro_aff_tank-NoBuffs-P4-Consumes-ShortSingleTarget"
- value: {
-  dps: 238.92422
-  tps: 192.95731
-  hps: 84.6674
- }
-}
-dps_results: {
- key: "TestDestruction-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 387.76787
-  tps: 277.39069
-  hps: 136.72322
- }
-}