diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java
index b627aef3..9178f347 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java
@@ -104,7 +104,6 @@ public class MovingConfig extends ACheckConfig {
 	public final boolean    passableCheck;
 	public final boolean	passableRayTracingCheck;
 	public final boolean	passableRayTracingBlockChangeOnly;
-	public final boolean	passableRayTracingVclipOnly;
 	// TODO: passableAccuracy: also use if not using ray-tracing
 	public final ActionList passableActions;
 
@@ -196,7 +195,6 @@ public class MovingConfig extends ACheckConfig {
         passableCheck = config.getBoolean(ConfPaths.MOVING_PASSABLE_CHECK);
     	passableRayTracingCheck = config.getBoolean(ConfPaths.MOVING_PASSABLE_RAYTRACING_CHECK);
     	passableRayTracingBlockChangeOnly = config.getBoolean(ConfPaths.MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY);
-    	passableRayTracingVclipOnly = config.getBoolean(ConfPaths.MOVING_PASSABLE_RAYTRACING_VCLIPONLY);
         passableActions = config.getOptimizedActionList(ConfPaths.MOVING_PASSABLE_ACTIONS, Permissions.MOVING_PASSABLE);
 
         survivalFlyCheck = config.getBoolean(ConfPaths.MOVING_SURVIVALFLY_CHECK);
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/Passable.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/Passable.java
index ab15d757..1e44ece0 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/Passable.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/Passable.java
@@ -34,7 +34,8 @@ public class Passable extends Check {
 		}
 		boolean toPassable = to.isPassable();
 		// General condition check for using ray-tracing.
-		if (toPassable && cc.passableRayTracingCheck && (!cc.passableRayTracingVclipOnly || from.getY() != to.getY()) && (!cc.passableRayTracingBlockChangeOnly || manhattan > 0)) {
+		// TODO: Optimize: manhattan <= 1 and all blocks are completely passable.
+		if (toPassable && cc.passableRayTracingCheck && (!cc.passableRayTracingBlockChangeOnly || manhattan > 0)) {
 			rayTracing.set(from, to);
 			rayTracing.loop();
 			if (rayTracing.collides() || rayTracing.getStepsDone() >= rayTracing.getMaxSteps()) {
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java
index 000eb3b2..d0dc3384 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java
@@ -530,7 +530,6 @@ public abstract class ConfPaths {
 	private static final String MOVING_PASSABLE_RAYTRACING				 = MOVING_PASSABLE + "raytracing.";
 	public static final String MOVING_PASSABLE_RAYTRACING_CHECK 		 = MOVING_PASSABLE_RAYTRACING + "active";
 	public static final String MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY= MOVING_PASSABLE_RAYTRACING + "blockchangeonly";
-	public static final String MOVING_PASSABLE_RAYTRACING_VCLIPONLY      = MOVING_PASSABLE_RAYTRACING + "vcliponly";
 	public static final String MOVING_PASSABLE_ACTIONS                   = MOVING_PASSABLE + "actions";
 
 	private static final String MOVING_SURVIVALFLY						= MOVING + "survivalfly.";
@@ -639,5 +638,8 @@ public abstract class ConfPaths {
 	public static final String  MISCELLANEOUS_REPORTTOMETRICS			 = "miscellaneous.reporttometrics";
 	@Deprecated
 	public static final String  BLOCKBREAK_FASTBREAK_MOD_CREATIVE        = "checks.blockbreak.fastbreak.intervalcreative";
+	@Deprecated
+	public static final String MOVING_PASSABLE_RAYTRACING_VCLIPONLY      = "checks.moving.passable.raytracing.vcliponly";
+
 	
 }
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java
index 70d16991..0d16e9d9 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java
@@ -377,8 +377,7 @@ public class DefaultConfig extends ConfigFile {
         
         set(ConfPaths.MOVING_PASSABLE_CHECK, true);
         set(ConfPaths.MOVING_PASSABLE_RAYTRACING_CHECK, true);
-        set(ConfPaths.MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY, true);
-        set(ConfPaths.MOVING_PASSABLE_RAYTRACING_VCLIPONLY, false);
+        set(ConfPaths.MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY, false);
         set(ConfPaths.MOVING_PASSABLE_ACTIONS, "cancel vl>10 log:passable:0:5:if cancel vl>50 log:passable:0:5:icf cancel");
 
         set(ConfPaths.MOVING_SURVIVALFLY_CHECK, true);