diff --git a/crates/air/src/layout/dex/mod.rs b/crates/air/src/layout/dex/mod.rs
index 38aa76e..80de416 100644
--- a/crates/air/src/layout/dex/mod.rs
+++ b/crates/air/src/layout/dex/mod.rs
@@ -360,10 +360,6 @@ impl LayoutTrait for Layout {
             .get(segments::PROGRAM)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
             .begin_addr;
-        let final_pc = public_segments
-            .get(segments::PROGRAM)
-            .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
-            .stop_ptr;
         let initial_ap = public_segments
             .get(segments::EXECUTION)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::EXECUTION })?
@@ -395,7 +391,6 @@ impl LayoutTrait for Layout {
             .collect::<Vec<Felt>>();
 
         ensure!(initial_pc == INITIAL_PC, PublicInputError::MaxSteps);
-        ensure!(final_pc == INITIAL_PC + FELT_4, PublicInputError::MaxSteps);
 
         let program_end_pc = initial_fp - FELT_2;
 
diff --git a/crates/air/src/layout/dynamic/mod.rs b/crates/air/src/layout/dynamic/mod.rs
index b6b1bd7..91eaad5 100644
--- a/crates/air/src/layout/dynamic/mod.rs
+++ b/crates/air/src/layout/dynamic/mod.rs
@@ -733,10 +733,6 @@ impl LayoutTrait for Layout {
             .get(segments::PROGRAM)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
             .begin_addr;
-        let final_pc = public_segments
-            .get(segments::PROGRAM)
-            .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
-            .stop_ptr;
         let initial_ap = public_segments
             .get(segments::EXECUTION)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::EXECUTION })?
@@ -768,7 +764,6 @@ impl LayoutTrait for Layout {
             .collect::<Vec<Felt>>();
 
         ensure!(initial_pc == INITIAL_PC, PublicInputError::MaxSteps);
-        ensure!(final_pc == INITIAL_PC + FELT_4, PublicInputError::MaxSteps);
 
         let program_end_pc = initial_fp - FELT_2;
 
diff --git a/crates/air/src/layout/recursive/mod.rs b/crates/air/src/layout/recursive/mod.rs
index c49abd7..bfb7e55 100644
--- a/crates/air/src/layout/recursive/mod.rs
+++ b/crates/air/src/layout/recursive/mod.rs
@@ -360,10 +360,6 @@ impl LayoutTrait for Layout {
             .get(segments::PROGRAM)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
             .begin_addr;
-        let final_pc = public_segments
-            .get(segments::PROGRAM)
-            .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
-            .stop_ptr;
         let initial_ap = public_segments
             .get(segments::EXECUTION)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::EXECUTION })?
@@ -395,7 +391,6 @@ impl LayoutTrait for Layout {
             .collect::<Vec<Felt>>();
 
         ensure!(initial_pc == INITIAL_PC, PublicInputError::MaxSteps);
-        ensure!(final_pc == INITIAL_PC + FELT_4, PublicInputError::MaxSteps);
 
         let program_end_pc = initial_fp - FELT_2;
 
diff --git a/crates/air/src/layout/recursive_with_poseidon/mod.rs b/crates/air/src/layout/recursive_with_poseidon/mod.rs
index 8ca2f3e..c948227 100644
--- a/crates/air/src/layout/recursive_with_poseidon/mod.rs
+++ b/crates/air/src/layout/recursive_with_poseidon/mod.rs
@@ -417,10 +417,6 @@ impl LayoutTrait for Layout {
             .get(segments::PROGRAM)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
             .begin_addr;
-        let final_pc = public_segments
-            .get(segments::PROGRAM)
-            .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
-            .stop_ptr;
         let initial_ap = public_segments
             .get(segments::EXECUTION)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::EXECUTION })?
@@ -452,7 +448,6 @@ impl LayoutTrait for Layout {
             .collect::<Vec<Felt>>();
 
         ensure!(initial_pc == INITIAL_PC, PublicInputError::MaxSteps);
-        ensure!(final_pc == INITIAL_PC + FELT_4, PublicInputError::MaxSteps);
 
         let program_end_pc = initial_fp - FELT_2;
 
diff --git a/crates/air/src/layout/small/mod.rs b/crates/air/src/layout/small/mod.rs
index 57ce80a..99952cb 100644
--- a/crates/air/src/layout/small/mod.rs
+++ b/crates/air/src/layout/small/mod.rs
@@ -360,10 +360,6 @@ impl LayoutTrait for Layout {
             .get(segments::PROGRAM)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
             .begin_addr;
-        let final_pc = public_segments
-            .get(segments::PROGRAM)
-            .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
-            .stop_ptr;
         let initial_ap = public_segments
             .get(segments::EXECUTION)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::EXECUTION })?
@@ -395,7 +391,6 @@ impl LayoutTrait for Layout {
             .collect::<Vec<Felt>>();
 
         ensure!(initial_pc == INITIAL_PC, PublicInputError::MaxSteps);
-        ensure!(final_pc == INITIAL_PC + FELT_4, PublicInputError::MaxSteps);
 
         let program_end_pc = initial_fp - FELT_2;
 
diff --git a/crates/air/src/layout/starknet/mod.rs b/crates/air/src/layout/starknet/mod.rs
index 8542fec..bf239e1 100644
--- a/crates/air/src/layout/starknet/mod.rs
+++ b/crates/air/src/layout/starknet/mod.rs
@@ -487,10 +487,6 @@ impl LayoutTrait for Layout {
             .get(segments::PROGRAM)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
             .begin_addr;
-        let final_pc = public_segments
-            .get(segments::PROGRAM)
-            .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
-            .stop_ptr;
         let initial_ap = public_segments
             .get(segments::EXECUTION)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::EXECUTION })?
@@ -522,7 +518,6 @@ impl LayoutTrait for Layout {
             .collect::<Vec<Felt>>();
 
         ensure!(initial_pc == INITIAL_PC, PublicInputError::MaxSteps);
-        ensure!(final_pc == INITIAL_PC + FELT_4, PublicInputError::MaxSteps);
 
         let program_end_pc = initial_fp - FELT_2;
 
diff --git a/crates/air/src/layout/starknet_with_keccak/mod.rs b/crates/air/src/layout/starknet_with_keccak/mod.rs
index a199264..5c91c87 100644
--- a/crates/air/src/layout/starknet_with_keccak/mod.rs
+++ b/crates/air/src/layout/starknet_with_keccak/mod.rs
@@ -536,10 +536,6 @@ impl LayoutTrait for Layout {
             .get(segments::PROGRAM)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
             .begin_addr;
-        let final_pc = public_segments
-            .get(segments::PROGRAM)
-            .ok_or(PublicInputError::SegmentMissing { segment: segments::PROGRAM })?
-            .stop_ptr;
         let initial_ap = public_segments
             .get(segments::EXECUTION)
             .ok_or(PublicInputError::SegmentMissing { segment: segments::EXECUTION })?
@@ -571,7 +567,6 @@ impl LayoutTrait for Layout {
             .collect::<Vec<Felt>>();
 
         ensure!(initial_pc == INITIAL_PC, PublicInputError::MaxSteps);
-        ensure!(final_pc == INITIAL_PC + FELT_4, PublicInputError::MaxSteps);
 
         let program_end_pc = initial_fp - FELT_2;