diff --git a/core/src/com/unciv/logic/automation/BattleHelper.kt b/core/src/com/unciv/logic/automation/BattleHelper.kt
index c542b05749..487544a4f7 100644
--- a/core/src/com/unciv/logic/automation/BattleHelper.kt
+++ b/core/src/com/unciv/logic/automation/BattleHelper.kt
@@ -75,21 +75,9 @@ object BattleHelper {
     }
 
     fun containsAttackableEnemy(tile: TileInfo, combatant: ICombatant): Boolean {
-        if (combatant is MapUnitCombatant) {
-            if (combatant.unit.isEmbarked()) {
-                if (tile.isWater) return false // can't attack water units while embarked, only land
-                if (combatant.isRanged()) return false
-            }
-            
-            // "Can only attack water" unique deprecated since 3.15.7
-                if (combatant.unit.hasUnique("Can only attack water")) {
-                    if (tile.isLand) return false
-            //
-
-                // trying to attack lake-to-coast or vice versa
-                if ((tile.baseTerrain == Constants.lakes) != (combatant.getTile().baseTerrain == Constants.lakes))
-                    return false
-            }
+        if (combatant is MapUnitCombatant && combatant.unit.isEmbarked()) {
+            if (tile.isWater) return false // can't attack water units while embarked, only land
+            if (combatant.isRanged()) return false
         }
 
         val tileCombatant = Battle.getMapCombatantOfTile(tile) ?: return false
@@ -101,6 +89,7 @@ object BattleHelper {
             combatant.unit.getMatchingUniques("Can only attack [] units").none { tileCombatant.matchesCategory(it.params[0]) }
         )
             return false
+
         if (combatant is MapUnitCombatant &&
             combatant.unit.hasUnique("Can only attack [] tiles") &&
             combatant.unit.getMatchingUniques("Can only attack [] tiles").none { tile.matchesFilter(it.params[0]) }
diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt
index 1fdbedec00..93ab169e17 100644
--- a/core/src/com/unciv/logic/city/CityStats.kt
+++ b/core/src/com/unciv/logic/city/CityStats.kt
@@ -189,10 +189,6 @@ class CityStats {
         for (unique in civInfo.getMatchingUniques("Specialists only produce []% of normal unhappiness")) {
             unhappinessFromSpecialists *= (1f - unique.params[0].toFloat() / 100f)
         }
-        // Deprecated since 3.15
-            if (civInfo.hasUnique("Specialists produce half normal unhappiness"))
-                unhappinessFromSpecialists *= 0.5f
-        //
 
         unhappinessFromCitizens -= cityInfo.population.getNumberOfSpecialists().toFloat() - unhappinessFromSpecialists