diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
index c8f4cc926..3fc3af77b 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
@@ -12,19 +12,16 @@ public enum SubSkillType {
     /* ACROBATICS */
     ACROBATICS_DODGE(1),
     ACROBATICS_ROLL,
-    ACROBATICS_MASTERY(1),
 
     /* ALCHEMY */
     ALCHEMY_CATALYSIS(1),
     ALCHEMY_CONCOCTIONS(8),
-    ALCHEMY_MASTERY(1),
 
     /* ARCHERY */
     ARCHERY_ARROW_RETRIEVAL(1),
     ARCHERY_DAZE,
     ARCHERY_SKILL_SHOT(20),
     ARCHERY_ARCHERY_LIMIT_BREAK(10),
-    ARCHERY_MASTERY(1),
 
     /* Axes */
     AXES_ARMOR_IMPACT(20),
@@ -33,7 +30,6 @@ public enum SubSkillType {
     AXES_CRITICAL_STRIKES(1),
     AXES_GREATER_IMPACT(1),
     AXES_SKULL_SPLITTER(1),
-    AXES_MASTERY(1),
 
     /* Excavation */
     EXCAVATION_ARCHAEOLOGY(8),
@@ -46,7 +42,6 @@ public enum SubSkillType {
     FISHING_MASTER_ANGLER(8),
     FISHING_TREASURE_HUNTER(8),
     FISHING_SHAKE(1),
-    FISHING_MASTERY(1),
 
     /* Herbalism */
     HERBALISM_DOUBLE_DROPS(1),
@@ -56,7 +51,6 @@ public enum SubSkillType {
     HERBALISM_GREEN_THUMB(4),
     HERBALISM_HYLIAN_LUCK,
     HERBALISM_SHROOM_THUMB,
-    HERBALISM_MASTERY(1),
 
     /* Mining */
     MINING_BIGGER_BOMBS(1),
@@ -70,7 +64,6 @@ public enum SubSkillType {
     REPAIR_ARCANE_FORGING(8),
     REPAIR_REPAIR_MASTERY(1),
     REPAIR_SUPER_REPAIR(1),
-    REPAIR_MASTERY(1),
 
     /* Salvage */
     SALVAGE_SCRAP_COLLECTOR(8),
@@ -87,7 +80,6 @@ public enum SubSkillType {
     SWORDS_SERRATED_STRIKES(1),
     SWORDS_STAB(2),
     SWORDS_SWORDS_LIMIT_BREAK(10),
-    SWORDS_MASTERY(1),
 
     /* Taming */
     TAMING_BEAST_LORE(1),
@@ -100,7 +92,6 @@ public enum SubSkillType {
     TAMING_SHARPENED_CLAWS(1),
     TAMING_SHOCK_PROOF(1),
     TAMING_THICK_FUR(1),
-    TAMING_MASTERY(1),
 
     /* Unarmed */
     UNARMED_ARROW_DEFLECT(1),
@@ -110,15 +101,11 @@ public enum SubSkillType {
     UNARMED_STEEL_ARM_STYLE(20),
     UNARMED_IRON_GRIP(1),
     UNARMED_UNARMED_LIMIT_BREAK(10),
-    UNARMED_MASTERY(1),
 
     /* Woodcutting */
-/*    WOODCUTTING_BARK_SURGEON(3),*/
     WOODCUTTING_KNOCK_ON_WOOD(2),
     WOODCUTTING_HARVEST_LUMBER(1),
     WOODCUTTING_LEAF_BLOWER(1),
-/*    WOODCUTTING_NATURES_BOUNTY(3),
-    WOODCUTTING_SPLINTER(3),*/
     WOODCUTTING_TREE_FELLER(1),
     WOODCUTTING_CLEAN_CUTS(1);
 
diff --git a/src/main/resources/skillranks.yml b/src/main/resources/skillranks.yml
index fa300973b..f5980b8d4 100644
--- a/src/main/resources/skillranks.yml
+++ b/src/main/resources/skillranks.yml
@@ -6,11 +6,6 @@
 # Retro Mode has 10x faster leveling and 10x higher skill requirements, if you do the math you can see its the same as Standard and only cosmetic!.
 ###
 Alchemy:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     Catalysis:
         Standard:
             Rank_1: 0
@@ -36,11 +31,6 @@ Alchemy:
             Rank_7: 900
             Rank_8: 1000
 Archery:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     ArcheryLimitBreak:
         Standard:
             Rank_1: 10
@@ -113,22 +103,12 @@ Archery:
             Rank_19: 950
             Rank_20: 1000
 Acrobatics:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     Dodge:
         Standard:
             Rank_1: 1
         RetroMode:
             Rank_1: 1
 Axes:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     AxesLimitBreak:
         Standard:
             Rank_1: 10
@@ -222,11 +202,6 @@ Axes:
             Rank_3: 150
             Rank_4: 200
 Taming:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     BeastLore:
         Standard:
             Rank_1: 1
@@ -278,11 +253,6 @@ Taming:
         RetroMode:
             Rank_1: 750
 Smelting:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     FuelEfficiency:
         Standard:
             Rank_1: 10
@@ -312,11 +282,6 @@ Smelting:
             Rank_7: 850
             Rank_8: 1000
 Salvage:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     ScrapCollector:
         Standard:
             Rank_1: 1
@@ -403,11 +368,6 @@ Mining:
             Rank_7: 850
             Rank_8: 1000
 Herbalism:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     DoubleDrops:
         Standard:
             Rank_1: 1
@@ -520,11 +480,6 @@ Fishing:
             Rank_7: 850
             Rank_8: 1000
 Swords:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     SwordsLimitBreak:
         Standard:
             Rank_1: 10
@@ -577,11 +532,6 @@ Swords:
         RetroMode:
             Rank_1: 50
 Unarmed:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     UnarmedLimitBreak:
         Standard:
             Rank_1: 10
@@ -670,11 +620,6 @@ Unarmed:
             Rank_20: 1000
 
 Woodcutting:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     TreeFeller:
         Standard:
             Rank_1: 5
@@ -715,11 +660,6 @@ Woodcutting:
             Rank_2: 350
             Rank_3: 650
 Excavation:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     GigaDrillBreaker:
         Standard:
             Rank_1: 5
@@ -745,11 +685,6 @@ Excavation:
             Rank_7: 850
             Rank_8: 1000
 Repair:
-    Mastery:
-        Standard:
-            Rank_1: 100
-        RetroMode:
-            Rank_1: 1000
     RepairMastery:
         Standard:
             Rank_1: 1