diff --git a/binaries/data/mods/public/simulation/ai/common-api/terrain-analysis-pathfinder.js b/binaries/data/mods/public/simulation/ai/common-api/terrain-analysis-pathfinder.js
index 96e8c4cceb..4d781040bf 100644
--- a/binaries/data/mods/public/simulation/ai/common-api/terrain-analysis-pathfinder.js
+++ b/binaries/data/mods/public/simulation/ai/common-api/terrain-analysis-pathfinder.js
@@ -31,10 +31,7 @@ m.aStarPath = function(gameState, onWater, disregardEntities, targetTerritory)
 	var passMap = gameState.sharedScript.passabilityMap;
 	var terrMap = gameState.sharedScript.territoryMap;
 	var ratio = terrMap.cellSize / passMap.cellSize;
-	if (passMap.cellSize == 4)
-		var pathObstruction = gameState.sharedScript.passabilityClasses["pathfinderObstruction"];
-	else // new pathFinder branch
-		var pathObstruction = gameState.sharedScript.passabilityClasses["default"];
+	var pathObstruction = gameState.sharedScript.passabilityClasses["default"];
 
 	this.widthMap = new Uint8Array(this.map.length);
 	for (var i = 0; i < this.map.length; ++i)
diff --git a/binaries/data/mods/public/simulation/ai/common-api/terrain-analysis.js b/binaries/data/mods/public/simulation/ai/common-api/terrain-analysis.js
index 9d215b60d5..98ae132a11 100644
--- a/binaries/data/mods/public/simulation/ai/common-api/terrain-analysis.js
+++ b/binaries/data/mods/public/simulation/ai/common-api/terrain-analysis.js
@@ -27,21 +27,12 @@ m.TerrainAnalysis.prototype.init = function(sharedScript,rawState)
 	this.width = passabilityMap.width;
 	this.height = passabilityMap.height;
 	this.cellSize = passabilityMap.cellSize;
-	
-	// the first two won't change, the third is a reference to a value updated by C++
-	if (this.cellSize == 4)
-	{
-		var obstructionMaskLand = rawState.passabilityClasses["default"];
-		var obstructionMaskWater = rawState.passabilityClasses["ship"];
-	}
-	else  // new pathFinder branch
-	{
-		var obstructionMaskLand = rawState.passabilityClasses["default-terrain-only"];
-		var obstructionMaskWater = rawState.passabilityClasses["ship-small"];
-	}
+
+	var obstructionMaskLand = rawState.passabilityClasses["default-terrain-only"];
+	var obstructionMaskWater = rawState.passabilityClasses["ship-small"];
 
 	var obstructionTiles = new Uint8Array(passabilityMap.data.length);
-	
+
 	/* Generated map legend:
 	 0 is impassable
 	 200 is deep water (ie non-passable by land units)
diff --git a/binaries/data/mods/public/simulation/ai/petra/map-module.js b/binaries/data/mods/public/simulation/ai/petra/map-module.js
index bb36a497bf..b958ddce37 100644
--- a/binaries/data/mods/public/simulation/ai/petra/map-module.js
+++ b/binaries/data/mods/public/simulation/ai/petra/map-module.js
@@ -38,9 +38,6 @@ m.createObstructionMap = function(gameState, accessIndex, template)
 		var obstructionMask = gameState.getPassabilityClassMask("building-land");
 	}
 
-	if (passabilityMap.cellSize == 4)	// old pathFinder
-		var obstructionMask = obstructionMask | gameState.getPassabilityClassMask("foundationObstruction");
-
 	for (var k = 0; k < territoryMap.data.length; ++k)
 	{
 		let tilePlayer = (territoryMap.data[k] & m.TERRITORY_PLAYER_MASK);
diff --git a/binaries/data/mods/public/simulation/ai/petra/queueplan-building.js b/binaries/data/mods/public/simulation/ai/petra/queueplan-building.js
index 3360629fdf..fa3758c015 100644
--- a/binaries/data/mods/public/simulation/ai/petra/queueplan-building.js
+++ b/binaries/data/mods/public/simulation/ai/petra/queueplan-building.js
@@ -314,7 +314,7 @@ m.ConstructionPlan.prototype.findGoodPosition = function(gameState)
 	else if (template.resourceDropsiteTypes() === undefined && !template.hasClass("House") && !template.hasClass("Field"))
 		radius = Math.ceil((template.obstructionRadius() + 4) / obstructions.cellSize);
 	else
-		radius = Math.ceil(template.obstructionRadius() / obstructions.cellSize);
+		radius = Math.ceil(template.obstructionRadius() / obstructions.cellSize) + 1;
 
 	if (template.hasClass("House") && !alreadyHasHouses)
 	{