diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java
index 2b917cdbd..9a17644ff 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java
@@ -156,30 +156,26 @@ public class MonkEnergy extends Buff implements ActionIndicator.Action {
 				int points = hero.pointsInTalent(Talent.UNENCUMBERED_SPIRIT);
 
 				if (hero.belongings.armor() != null){
-					if (hero.belongings.armor().tier == 3 && points >= 1){
-						enGainMulti += 0.25f;
-					}
-					if (hero.belongings.armor().tier == 2 && points >= 2){
-						enGainMulti += 0.50f;
-					}
-					if (hero.belongings.armor().tier == 1 && points >= 3){
+					if (hero.belongings.armor().tier <= 1 && points >= 3){
 						enGainMulti += 1.00f;
+					} else if (hero.belongings.armor().tier <= 2 && points >= 2){
+						enGainMulti += 0.50f;
+					} else if (hero.belongings.armor().tier <= 3 && points >= 1){
+						enGainMulti += 0.25f;
 					}
 				}
 
 				if (hero.belongings.weapon() instanceof MeleeWeapon
 						&& hero.buff(RingOfForce.BrawlersStance.class) == null){
-					if (((MeleeWeapon) hero.belongings.weapon()).tier == 3 && points >= 1){
+					if (((MeleeWeapon) hero.belongings.weapon()).tier <= 1 && points >= 3){
+						enGainMulti += 1.00f;
+					} else if (((MeleeWeapon) hero.belongings.weapon()).tier <= 2 && points >= 2){
+						enGainMulti += 0.50f;
+					} else if (((MeleeWeapon) hero.belongings.weapon()).tier <= 3 && points >= 1){
 						enGainMulti += 0.25f;
 					}
-					if (((MeleeWeapon) hero.belongings.weapon()).tier == 2 && points >= 2){
-						enGainMulti += 0.50f;
-					}
-					if (((MeleeWeapon) hero.belongings.weapon()).tier == 1 && points >= 3){
-						enGainMulti += 1.00f;
-					}
 				} else if (hero.belongings.weapon == null) {
-					if (hero.buff(RingOfForce.Force.class) == null && points == 3){
+					if (hero.buff(RingOfForce.Force.class) == null && points >= 3){
 						enGainMulti += 1.50f;
 					}
 				}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
index c536b8e47..bceb3b0e8 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
@@ -870,8 +870,6 @@ public enum Talent {
 	static{
 		//v2.0.0
 		renamedTalents.put("ARMSMASTERS_INTUITION",     "VETERANS_INTUITION");
-		//v2.0.0 BETA
-		renamedTalents.put("LIGHTLY_ARMED",             "UNENCUMBERED_SPIRIT");
 	}
 
 	public static void restoreTalentsFromBundle( Bundle bundle, Hero hero ){