diff --git a/src/algorithms/digi/CALOROCDigitization.cc b/src/algorithms/digi/CALOROCDigitization.cc
index 9e8f96728a..edbaa10fed 100644
--- a/src/algorithms/digi/CALOROCDigitization.cc
+++ b/src/algorithms/digi/CALOROCDigitization.cc
@@ -2,16 +2,13 @@
 // Copyright (C) 2025 Minho Kim, Wouter Deconinck, Dmitry Kalinkin, Derek Anderson, Simon Gardner, Sylvester Joosten, Maria Zurek
 //
 
-#include <edm4eic/EDM4eicVersion.h>
-#include <tuple>
-
-#if EDM4EIC_VERSION_MAJOR > 8 || (EDM4EIC_VERSION_MAJOR == 8 && EDM4EIC_VERSION_MINOR >= 7)
 #include <edm4eic/CALOROC1ASample.h>
 #include <edm4eic/CALOROC1BSample.h>
 #include <podio/RelationRange.h>
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
+#include <tuple>
 #include <vector>
 
 #include "CALOROCDigitization.h"
@@ -140,4 +137,3 @@ double CALOROCDigitization::get_crossing_time(double thres, double dt, double t,
   return (numerator / denominator) + added;
 }
 } // namespace eicrecon
-#endif
diff --git a/src/algorithms/tracking/TrackSeeding.cc b/src/algorithms/tracking/TrackSeeding.cc
index f6b6b0bf9b..202f589465 100644
--- a/src/algorithms/tracking/TrackSeeding.cc
+++ b/src/algorithms/tracking/TrackSeeding.cc
@@ -19,7 +19,6 @@
 #include <Acts/Utilities/KDTree.hpp> // IWYU pragma: keep FIXME KDTree missing in SeedFinderOrthogonal.hpp until Acts v23.0.0
 #include <Acts/Utilities/Result.hpp>
 #include <edm4eic/Cov6f.h>
-#include <edm4eic/EDM4eicVersion.h>
 #include <edm4hep/Vector2f.h>
 #include <edm4hep/Vector3f.h>
 #include <Eigen/Core>
@@ -136,10 +135,8 @@ void TrackSeeding::process(const Input& input, const Output& output) const {
 
     // Add seed to collection
     auto trk_seed = trk_seeds->create();
-    trk_seed.setPerigee({0.f, 0.f, 0.f});
-#if EDM4EIC_VERSION_MAJOR > 8 || (EDM4EIC_VERSION_MAJOR == 8 && EDM4EIC_VERSION_MINOR > 5)
+    trk_seed.setPerigee({0.F, 0.F, 0.F});
     trk_seed.setQuality(seedToAdd.seedQuality());
-#endif
     trk_seed.setParams(trackParams.value());
     trk_seed.addToHits(*sps[0]->externalSpacePoint());
     trk_seed.addToHits(*sps[1]->externalSpacePoint());
diff --git a/src/detectors/BEMC/BEMC.cc b/src/detectors/BEMC/BEMC.cc
index 18945e83fd..856066a15b 100644
--- a/src/detectors/BEMC/BEMC.cc
+++ b/src/detectors/BEMC/BEMC.cc
@@ -5,7 +5,6 @@
 #include <JANA/JApplication.h>
 #include <JANA/JApplicationFwd.h>
 #include <JANA/Utils/JTypeInfo.h>
-#include <edm4eic/EDM4eicVersion.h>
 #include <edm4eic/unit_system.h>
 #include <edm4hep/SimCalorimeterHit.h>
 #include <cmath>
@@ -33,14 +32,11 @@
 #include "factories/calorimetry/ImagingTopoCluster_factory.h"
 #include "factories/calorimetry/SimCalorimeterHitProcessor_factory.h"
 #include "factories/calorimetry/TruthEnergyPositionClusterMerger_factory.h"
+#include "factories/digi/CALOROCDigitization_factory.h"
 #include "factories/digi/PulseCombiner_factory.h"
 #include "factories/digi/PulseGeneration_factory.h"
 #include "factories/digi/PulseNoise_factory.h"
 
-#if EDM4EIC_VERSION_MAJOR > 8 || (EDM4EIC_VERSION_MAJOR == 8 && EDM4EIC_VERSION_MINOR >= 7)
-#include "factories/digi/CALOROCDigitization_factory.h"
-#endif
-
 extern "C" {
 void InitPlugin(JApplication* app) {
 
@@ -187,7 +183,6 @@ void InitPlugin(JApplication* app) {
       },
       app // TODO: Remove me once fixed
       ));
-#if EDM4EIC_VERSION_MAJOR > 8 || (EDM4EIC_VERSION_MAJOR == 8 && EDM4EIC_VERSION_MINOR >= 7)
   app->Add(new JOmniFactoryGeneratorT<CALOROCDigitization_factory>(
       "EcalBarrelScFiPCALOROCHits", {"EcalBarrelScFiPCombinedPulsesWithNoise"},
       {"EcalBarrelScFiPCALOROCHits"},
@@ -214,7 +209,6 @@ void InitPlugin(JApplication* app) {
       },
       app // TODO: Remove me once fixed
       ));
-#endif
   app->Add(new JOmniFactoryGeneratorT<CalorimeterHitDigi_factory>(
       "EcalBarrelScFiRawHits", {"EventHeader", "EcalBarrelScFiHits"},
       {"EcalBarrelScFiRawHits", "EcalBarrelScFiRawHitLinks", "EcalBarrelScFiRawHitAssociations"},
diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc
index 0eabf0400c..03d691a399 100644
--- a/src/services/io/podio/JEventProcessorPODIO.cc
+++ b/src/services/io/podio/JEventProcessorPODIO.cc
@@ -6,7 +6,6 @@
 #include <JANA/Services/JComponentManager.h>
 #include <JANA/Services/JParameterManager.h>
 #include <JANA/Utils/JTypeInfo.h>
-#include <edm4eic/EDM4eicVersion.h>
 #include <fmt/format.h>
 #include <podio/CollectionBase.h>
 #include <podio/Frame.h>
@@ -377,10 +376,8 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
       "EcalBarrelScFiNAttenuatedHits",
       "EcalBarrelScFiNAttenuatedHitContributions",
       "EcalBarrelScFiRawHits",
-#if EDM4EIC_VERSION_MAJOR > 8 || (EDM4EIC_VERSION_MAJOR == 8 && EDM4EIC_VERSION_MINOR >= 7)
       "EcalBarrelScFiPCALOROCHits",
       "EcalBarrelScFiNCALOROCHits",
-#endif
       "EcalBarrelScFiRecHits",
       "EcalBarrelScFiClusters",
       "EcalBarrelScFiClusterLinks",
diff --git a/src/tests/algorithms_test/digi_CALOROCDigitization.cc b/src/tests/algorithms_test/digi_CALOROCDigitization.cc
index 19bce6e84a..c9292231db 100644
--- a/src/tests/algorithms_test/digi_CALOROCDigitization.cc
+++ b/src/tests/algorithms_test/digi_CALOROCDigitization.cc
@@ -2,13 +2,11 @@
 // Copyright (C) 2026, Minho Kim
 
 #include <catch2/catch_test_macros.hpp>
-#include <edm4eic/EDM4eicVersion.h>
 #include <podio/RelationRange.h>
-#include <stdint.h>
+#include <cstdint>
 #include <cstddef>
 #include <memory>
 
-#if EDM4EIC_VERSION_MAJOR > 8 || (EDM4EIC_VERSION_MAJOR == 8 && EDM4EIC_VERSION_MINOR >= 7)
 #include <edm4eic/RawCALOROCHitCollection.h>
 #include <edm4eic/CALOROC1ASample.h>
 #include <edm4eic/SimPulseCollection.h>
@@ -74,4 +72,3 @@ TEST_CASE("Test TOA calculation", "[CALOROCDigitization][TOACalculation]") {
     REQUIRE(a_samples[0].timeOfArrival == TOA_expected);
   }
 }
-#endif