diff --git a/Framework/API/src/FileBackedExperimentInfo.cpp b/Framework/API/src/FileBackedExperimentInfo.cpp
index 262db3c28fe8..c5cfbf15fb46 100644
--- a/Framework/API/src/FileBackedExperimentInfo.cpp
+++ b/Framework/API/src/FileBackedExperimentInfo.cpp
@@ -6,15 +6,12 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidAPI/FileBackedExperimentInfo.h"
 #include "MantidKernel/Logger.h"
+#include "MantidNexusCpp/NeXusException.hpp"
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <sstream>
 #include <utility>
 
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
-#include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
-
 namespace Mantid::API {
 
 namespace {
diff --git a/Framework/API/test/WorkspaceHistoryIOTest.h b/Framework/API/test/WorkspaceHistoryIOTest.h
index 1bee210a60e6..74bad015ac45 100644
--- a/Framework/API/test/WorkspaceHistoryIOTest.h
+++ b/Framework/API/test/WorkspaceHistoryIOTest.h
@@ -203,15 +203,11 @@ class WorkspaceHistoryIOTest : public CxxTest::TestSuite {
       testHistory.addHistory(std::make_shared<AlgorithmHistory>(algHist));
     }
 
-    // clang-format off
-    auto savehandle = std::make_shared< ::NeXus::File >("WorkspaceHistoryTest_test_SaveNexus.nxs",NXACC_CREATE5);
-    // clang-format on
+    auto savehandle = std::make_shared<::NeXus::File>("WorkspaceHistoryTest_test_SaveNexus.nxs", NXACC_CREATE5);
     TS_ASSERT_THROWS_NOTHING(testHistory.saveNexus(savehandle.get()));
     savehandle->close();
 
-    // clang-format off
-    auto loadhandle = std::make_shared< ::NeXus::File >("WorkspaceHistoryTest_test_SaveNexus.nxs");
-    // clang-format on
+    auto loadhandle = std::make_shared<::NeXus::File>("WorkspaceHistoryTest_test_SaveNexus.nxs");
     std::string rootstring = "/process/";
     for (int i = 1; i < 5; i++) {
       TS_ASSERT_THROWS_NOTHING(
@@ -237,15 +233,11 @@ class WorkspaceHistoryIOTest : public CxxTest::TestSuite {
     algHist.addChildHistory(std::make_shared<AlgorithmHistory>(childHist));
     testHistory.addHistory(std::make_shared<AlgorithmHistory>(algHist));
 
-    // clang-format off
-    auto savehandle = std::make_shared< ::NeXus::File >("WorkspaceHistoryTest_test_SaveNexus.nxs",NXACC_CREATE5);
-    // clang-format on
+    auto savehandle = std::make_shared<::NeXus::File>("WorkspaceHistoryTest_test_SaveNexus.nxs", NXACC_CREATE5);
     TS_ASSERT_THROWS_NOTHING(testHistory.saveNexus(savehandle.get()));
     savehandle->close();
 
-    // clang-format off
-    auto loadhandle = std::make_shared< ::NeXus::File >("WorkspaceHistoryTest_test_SaveNexus.nxs");
-    // clang-format on
+    auto loadhandle = std::make_shared<::NeXus::File>("WorkspaceHistoryTest_test_SaveNexus.nxs");
     std::string rootstring = "/process/";
     TS_ASSERT_THROWS_NOTHING(loadhandle->openPath(rootstring + "MantidAlgorithm_1/"));
     TS_ASSERT_THROWS_NOTHING(loadhandle->openPath(rootstring + "MantidAlgorithm_1/author"));
@@ -264,15 +256,11 @@ class WorkspaceHistoryIOTest : public CxxTest::TestSuite {
   void test_SaveNexus_Empty() {
     WorkspaceHistory testHistory;
 
-    // clang-format off
-    auto savehandle = std::make_shared< ::NeXus::File >("WorkspaceHistoryTest_test_SaveNexus.nxs",NXACC_CREATE5);
-    // clang-format on
+    auto savehandle = std::make_shared<::NeXus::File>("WorkspaceHistoryTest_test_SaveNexus.nxs", NXACC_CREATE5);
     TS_ASSERT_THROWS_NOTHING(testHistory.saveNexus(savehandle.get()));
     savehandle->close();
 
-    // clang-format off
-    auto loadhandle = std::make_shared< ::NeXus::File >("WorkspaceHistoryTest_test_SaveNexus.nxs");
-    // clang-format on
+    auto loadhandle = std::make_shared<::NeXus::File>("WorkspaceHistoryTest_test_SaveNexus.nxs");
     std::string rootstring = "/process/";
     TS_ASSERT_THROWS_NOTHING(loadhandle->openPath(rootstring));
     TS_ASSERT_THROWS_NOTHING(loadhandle->openPath(rootstring + "MantidEnvironment"));
@@ -284,9 +272,7 @@ class WorkspaceHistoryIOTest : public CxxTest::TestSuite {
 
   void test_LoadNexus() {
     std::string filename = FileFinder::Instance().getFullPath("GEM38370_Focussed_Legacy.nxs");
-    // clang-format off
-    auto loadhandle = std::make_shared< ::NeXus::File >(filename);
-    // clang-format on
+    auto loadhandle = std::make_shared<::NeXus::File>(filename);
     loadhandle->openPath("/mantid_workspace_1");
 
     WorkspaceHistory emptyHistory;
@@ -306,9 +292,7 @@ class WorkspaceHistoryIOTest : public CxxTest::TestSuite {
 
   void test_LoadNexus_NestedHistory() {
     std::string filename = FileFinder::Instance().getFullPath("HistoryTest_CreateTransmissionAuto.nxs");
-    // clang-format off
-    auto loadhandle = std::make_shared< ::NeXus::File >(filename);
-    // clang-format on
+    auto loadhandle = std::make_shared<::NeXus::File>(filename);
     loadhandle->openPath("/mantid_workspace_1");
 
     WorkspaceHistory wsHistory;
diff --git a/Framework/Algorithms/test/RebinByPulseTimesTest.h b/Framework/Algorithms/test/RebinByPulseTimesTest.h
index 2a05e7fe4f81..5e6407060fb7 100644
--- a/Framework/Algorithms/test/RebinByPulseTimesTest.h
+++ b/Framework/Algorithms/test/RebinByPulseTimesTest.h
@@ -125,10 +125,8 @@ class RebinByPulseTimesTest : public CxxTest::TestSuite, public Super {
 //=====================================================================================
 // Performance Tests
 //=====================================================================================
-// clang-format off
-class RebinByPulseTimesTestPerformance : public CxxTest::TestSuite, public RebinByTimeBaseTestPerformance<RebinByPulseTimes>
-// clang-format on
-{
+class RebinByPulseTimesTestPerformance : public CxxTest::TestSuite,
+                                         public RebinByTimeBaseTestPerformance<RebinByPulseTimes> {
 
 public:
   static RebinByPulseTimesTestPerformance *createSuite() { return new RebinByPulseTimesTestPerformance(); }
diff --git a/Framework/Algorithms/test/RebinByTimeAtSampleTest.h b/Framework/Algorithms/test/RebinByTimeAtSampleTest.h
index 6e297d97263a..340b6100eb4e 100644
--- a/Framework/Algorithms/test/RebinByTimeAtSampleTest.h
+++ b/Framework/Algorithms/test/RebinByTimeAtSampleTest.h
@@ -245,11 +245,8 @@ class RebinByTimeAtSampleTest : public CxxTest::TestSuite, public Super {
 //=====================================================================================
 // Performance Tests
 //=====================================================================================
-// clang-format off
-class RebinByTimeAtSampleTestPerformance: public CxxTest::TestSuite,
-    public RebinByTimeBaseTestPerformance<RebinByTimeAtSample>
-// clang-format on
-{
+class RebinByTimeAtSampleTestPerformance : public CxxTest::TestSuite,
+                                           public RebinByTimeBaseTestPerformance<RebinByTimeAtSample> {
 
 public:
   static RebinByTimeAtSampleTestPerformance *createSuite() { return new RebinByTimeAtSampleTestPerformance(); }
diff --git a/Framework/Crystal/src/AddPeakHKL.cpp b/Framework/Crystal/src/AddPeakHKL.cpp
index ec515b9bcdce..7647a06721b7 100644
--- a/Framework/Crystal/src/AddPeakHKL.cpp
+++ b/Framework/Crystal/src/AddPeakHKL.cpp
@@ -40,9 +40,8 @@ const std::string AddPeakHKL::summary() const { return "Add a peak in the hkl fr
 void AddPeakHKL::init() {
   declareProperty(std::make_unique<WorkspaceProperty<Mantid::API::IPeaksWorkspace>>("Workspace", "", Direction::InOut),
                   "An input workspace.");
-  // clang-format off
-    declareProperty(std::make_unique<ArrayProperty<double>>("HKL", std::make_shared<ArrayLengthValidator<double> > (3)), "HKL point to add");
-  // clang-format on
+  declareProperty(std::make_unique<ArrayProperty<double>>("HKL", std::make_shared<ArrayLengthValidator<double>>(3)),
+                  "HKL point to add");
 }
 
 //----------------------------------------------------------------------------------------------
diff --git a/Framework/Crystal/src/SetUB.cpp b/Framework/Crystal/src/SetUB.cpp
index 38c6bae49e88..f883b96d6d15 100644
--- a/Framework/Crystal/src/SetUB.cpp
+++ b/Framework/Crystal/src/SetUB.cpp
@@ -38,10 +38,8 @@ void SetUB::init() {
   auto reasonableAngle = std::make_shared<BoundedValidator<double>>();
   reasonableAngle->setLower(5.0);
   reasonableAngle->setUpper(175.0);
-  // clang-format off
-  auto mustBe3D = std::make_shared<ArrayLengthValidator<double> >(3);
-  auto threeVthree = std::make_shared<ArrayLengthValidator<double> >(9);
-  // clang-format on
+  auto mustBe3D = std::make_shared<ArrayLengthValidator<double>>(3);
+  auto threeVthree = std::make_shared<ArrayLengthValidator<double>>(9);
   std::vector<double> zeroes(9, 0.), u0(3, 0), v0(3, 0);
   u0[0] = 1.;
   v0[1] = 1.;
diff --git a/Framework/Crystal/src/TransformHKL.cpp b/Framework/Crystal/src/TransformHKL.cpp
index 4c73cd77318d..d8f5c518e0e0 100644
--- a/Framework/Crystal/src/TransformHKL.cpp
+++ b/Framework/Crystal/src/TransformHKL.cpp
@@ -48,9 +48,7 @@ void TransformHKL::init() {
   identity_matrix[0] = 1;
   identity_matrix[4] = 1;
   identity_matrix[8] = 1;
-  // clang-format off
-  auto threeBythree = std::make_shared<ArrayLengthValidator<double> >(9);
-  // clang-format on
+  auto threeBythree = std::make_shared<ArrayLengthValidator<double>>(9);
   this->declareProperty(
       std::make_unique<ArrayProperty<double>>("HKLTransform", std::move(identity_matrix), std::move(threeBythree)),
       "Specify 3x3 HKL transform matrix as a comma separated list of 9 "
diff --git a/Framework/Crystal/test/IndexPeaksTest.h b/Framework/Crystal/test/IndexPeaksTest.h
index 49713e455c52..394a9cf10da5 100644
--- a/Framework/Crystal/test/IndexPeaksTest.h
+++ b/Framework/Crystal/test/IndexPeaksTest.h
@@ -73,16 +73,12 @@ PeaksWorkspace_sptr createTestPeaksWorkspaceMainReflOnly() {
                                   0.0045884,  0.0273738,  -0.08973560, 0.0252595};
   // peaks from TOPAZ_3007.peaks: 0, 1, 2, 10, 42 with sign for Q swapped
   // as we don't use the crystallographic convention
-  // clang-format off
-  GNU_DIAG_OFF("missing-braces")
-  // clang-format on
+  GNU_DIAG_OFF("missing-braces");
   constexpr std::array<MinimalPeak, npeaks> testPeaksInfo = {
       MinimalPeak{3008, V3D(-3.52961, 3.13589, 1.0899)}, MinimalPeak{3007, V3D(-2.42456, 2.29581, 1.71147)},
       MinimalPeak{3007, V3D(-3.04393, 3.05739, 2.03727)}, MinimalPeak{3007, V3D(-4.02271, 2.4073, 1.62228)},
       MinimalPeak{3008, V3D(-4.04552, 1.59916, 3.71776)}};
-  // clang-format off
-  GNU_DIAG_ON("missing-braces")
-  // clang-format on
+  GNU_DIAG_ON("missing-braces");
   return createPeaksWorkspace<npeaks>(testPeaksInfo, ub);
 }
 
@@ -91,9 +87,7 @@ PeaksWorkspace_sptr createTestPeaksWorkspaceWithSatellites(const int maxOrder =
                                                            const bool crossTerms = false) {
   constexpr int npeaks{5};
   const std::vector<double> ub = {0.269, -0.01, 0.033, 0.081, -0.191, -0.039, 0.279, 0.347, -0.02};
-  // clang-format off
-  GNU_DIAG_OFF("missing-braces")
-  // clang-format on
+  GNU_DIAG_OFF("missing-braces");
   constexpr std::array<MinimalPeak, npeaks> testPeaksInfo = {
       MinimalPeak{1, V3D(-3.691, -0.694, 3.762)},     // main
       MinimalPeak{2, V3D(-1.234, -0.225, 1.25212)},   // satellite
@@ -101,9 +95,7 @@ PeaksWorkspace_sptr createTestPeaksWorkspaceWithSatellites(const int maxOrder =
       MinimalPeak{1, V3D(0.872, -0.1998, 2.7476)},    // satellite
       MinimalPeak{2, V3D(-1.54093, 0.129343, 1.445)}, // satellite
   };
-  // clang-format off
-  GNU_DIAG_ON("missing-braces")
-  // clang-format on
+  GNU_DIAG_ON("missing-braces");
   return createPeaksWorkspace<npeaks>(testPeaksInfo, ub, maxOrder, modVectors, crossTerms);
 }
 
diff --git a/Framework/Crystal/test/IntegratePeaksUsingClustersTest.h b/Framework/Crystal/test/IntegratePeaksUsingClustersTest.h
index 340e33105de7..223323950680 100644
--- a/Framework/Crystal/test/IntegratePeaksUsingClustersTest.h
+++ b/Framework/Crystal/test/IntegratePeaksUsingClustersTest.h
@@ -248,10 +248,7 @@ class IntegratePeaksUsingClustersTest : public CxxTest::TestSuite, public Cluste
 //=====================================================================================
 // Performance Tests
 //=====================================================================================
-// clang-format off
-class IntegratePeaksUsingClustersTestPerformance : public CxxTest::TestSuite, public ClusterIntegrationBaseTest
-// clang-format on
-{
+class IntegratePeaksUsingClustersTestPerformance : public CxxTest::TestSuite, public ClusterIntegrationBaseTest {
 
 private:
   // Input data
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
index 5556b57f2d64..e43b53e077d5 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
@@ -23,18 +23,16 @@
 #include "MantidKernel/Exception.h"
 #include "MantidKernel/NexusHDF5Descriptor.h"
 #include "MantidKernel/OptionalBool.h"
-#include "MantidKernel/TimeSeriesProperty.h"
 
-#include <Poco/Path.h>
-#include <boost/lexical_cast.hpp>
-#include <boost/scoped_array.hpp>
+#include "MantidKernel/TimeSeriesProperty.h"
 
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
+#include "MantidNexusCpp/NeXusFile.hpp"
 
+#include <Poco/Path.h>
 #include <algorithm>
+#include <boost/lexical_cast.hpp>
+#include <boost/scoped_array.hpp>
 #include <cstdint>
 #include <functional>
 #include <memory>
@@ -389,9 +387,9 @@ void adjustTimeOfFlightISISLegacy(::NeXus::File &file, T localWorkspace, const s
   if (classType == "NXmonitor") {
     std::vector<std::string> bankNames;
     for (string_map_t::const_iterator it = entries.begin(); it != entries.end(); ++it) {
-      std::string entryName(it->first);
-      std::string entry_class(it->second);
+      const std::string entry_class(it->second);
       if (entry_class == classType) {
+        const std::string entryName(it->first);
         bankNames.emplace_back(entryName);
       }
     }
@@ -703,17 +701,15 @@ void LoadEventNexus::loadEntryMetadata(const std::string &nexusfilename, T WS, c
     file.getDataCoerce(duration);
     if (duration.size() == 1) {
       // get the units
-      // clang-format off
-    std::vector< ::NeXus::AttrInfo> infos = file.getAttrInfos();
-    std::string units;
-    for (std::vector< ::NeXus::AttrInfo>::const_iterator it = infos.begin();
-         it != infos.end(); ++it) {
-      if (it->name == "units") {
-        units = file.getStrAttr(*it);
-        break;
+      std::vector<::NeXus::AttrInfo> infos = file.getAttrInfos();
+      std::string units;
+      for (auto it = infos.begin(); it != infos.end(); ++it) {
+        // cppcheck-suppress useStlAlgorithm
+        if (it->name == "units") {
+          units = file.getStrAttr(*it);
+          break;
+        }
       }
-    }
-      // clang-format on
 
       // set the property
       WS->mutableRun().addProperty("duration", duration[0], units, true);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h
index 0054cb1fc86d..313791370a42 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h
@@ -168,9 +168,7 @@ class MANTID_DATAHANDLING_DLL LoadISISNexus2 : public API::IFileLoader<Kernel::N
   /// Personal wrapper for sqrt to allow msvs to compile
   static double dblSqrt(double in);
   // Handle to the NeXus file
-  // clang-format off
-  boost::scoped_ptr< ::NeXus::File> m_nexusFile;
-  // clang-format on
+  boost::scoped_ptr<::NeXus::File> m_nexusFile;
 
   bool findSpectraDetRangeInFile(const NeXus::NXEntry &entry, std::vector<specnum_t> &spectrum_index, int64_t ndets,
                                  int64_t n_vms_compat_spectra, const std::map<specnum_t, std::string> &monitors,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/PrecompiledHeader.h b/Framework/DataHandling/inc/MantidDataHandling/PrecompiledHeader.h
index 801009811726..af8ff2d8d497 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/PrecompiledHeader.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/PrecompiledHeader.h
@@ -14,10 +14,8 @@
 // STL
 
 // NeXus
-// clang-format off
 #include "MantidNexusCpp/NeXusException.hpp"
 #include "MantidNexusCpp/NeXusFile.hpp"
-// clang-format on
 
 // Poco
 #include <Poco/DOM/DOMParser.h>
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h b/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h
index 2e4facf16ad2..a89f1829f520 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h
@@ -14,11 +14,10 @@
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/Workspace2D_fwd.h"
 #include "MantidGeometry/Instrument/RectangularDetector.h"
-#include <climits>
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
+#include "MantidNexusCpp/NeXusFile.hpp"
+
+#include <climits>
 
 namespace Mantid {
 namespace DataHandling {
diff --git a/Framework/DataHandling/src/CreateChunkingFromInstrument.cpp b/Framework/DataHandling/src/CreateChunkingFromInstrument.cpp
index 2d79ba92d912..52924f37868f 100644
--- a/Framework/DataHandling/src/CreateChunkingFromInstrument.cpp
+++ b/Framework/DataHandling/src/CreateChunkingFromInstrument.cpp
@@ -15,11 +15,11 @@
 #include "MantidGeometry/IDetector.h"
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/OptionalBool.h"
+
 #include "MantidKernel/StringTokenizer.h"
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
+
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <algorithm>
 
diff --git a/Framework/DataHandling/src/CreateSimulationWorkspace.cpp b/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
index d995196fd8af..f4ee9d5abe25 100644
--- a/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
+++ b/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
@@ -5,14 +5,14 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidDataHandling/CreateSimulationWorkspace.h"
+#include "LoadRaw/isisraw2.h"
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/Run.h"
 #include "MantidAPI/WorkspaceFactory.h"
-#include "MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h"
-
 #include "MantidDataHandling/LoadRawHelper.h"
+#include "MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/ListValidator.h"
 #include "MantidKernel/MandatoryValidator.h"
@@ -20,14 +20,8 @@
 #include "MantidKernel/RebinParamsValidator.h"
 #include "MantidKernel/UnitFactory.h"
 #include "MantidKernel/VectorHelper.h"
-
-#include "LoadRaw/isisraw2.h"
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
-
-#include <Poco/File.h>
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 namespace {
 
diff --git a/Framework/DataHandling/src/DetermineChunking.cpp b/Framework/DataHandling/src/DetermineChunking.cpp
index f30cd36d83e6..323de9e0a440 100644
--- a/Framework/DataHandling/src/DetermineChunking.cpp
+++ b/Framework/DataHandling/src/DetermineChunking.cpp
@@ -15,11 +15,8 @@
 #include "MantidDataHandling/LoadTOFRawNexus.h"
 #include "MantidKernel/BinaryFile.h"
 #include "MantidKernel/BoundedValidator.h"
-
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <Poco/File.h>
 #include <exception>
diff --git a/Framework/DataHandling/src/LoadBankFromDiskTask.cpp b/Framework/DataHandling/src/LoadBankFromDiskTask.cpp
index 0bd10e5b44b6..134892bc2bee 100644
--- a/Framework/DataHandling/src/LoadBankFromDiskTask.cpp
+++ b/Framework/DataHandling/src/LoadBankFromDiskTask.cpp
@@ -14,11 +14,8 @@
 #include "MantidKernel/Unit.h"
 #include "MantidKernel/VectorHelper.h"
 #include "MantidNexus/NexusIOHelper.h"
-
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <algorithm>
 #include <utility>
diff --git a/Framework/DataHandling/src/LoadMcStasNexus.cpp b/Framework/DataHandling/src/LoadMcStasNexus.cpp
index 3c645e294f9a..c1ef146e74dd 100644
--- a/Framework/DataHandling/src/LoadMcStasNexus.cpp
+++ b/Framework/DataHandling/src/LoadMcStasNexus.cpp
@@ -12,10 +12,8 @@
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidKernel/Unit.h"
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 namespace Mantid::DataHandling {
 using namespace Kernel;
diff --git a/Framework/DataHandling/src/LoadNXSPE.cpp b/Framework/DataHandling/src/LoadNXSPE.cpp
index fca81f7d0841..f886e1b7ebd6 100644
--- a/Framework/DataHandling/src/LoadNXSPE.cpp
+++ b/Framework/DataHandling/src/LoadNXSPE.cpp
@@ -14,19 +14,15 @@
 #include "MantidAPI/SpectraAxis.h"
 #include "MantidAPI/SpectrumInfo.h"
 #include "MantidAPI/WorkspaceFactory.h"
-#include "MantidKernel/DeltaEMode.h"
-#include "MantidKernel/UnitFactory.h"
-
-#include "MantidNexus/NexusClasses.h"
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
-#include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
-
 #include "MantidGeometry/Instrument.h"
 #include "MantidGeometry/Instrument/Detector.h"
 #include "MantidGeometry/Instrument/Goniometer.h"
 #include "MantidGeometry/Objects/ShapeFactory.h"
+#include "MantidKernel/DeltaEMode.h"
+#include "MantidKernel/UnitFactory.h"
+#include "MantidNexus/NexusClasses.h"
+#include "MantidNexusCpp/NeXusException.hpp"
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <boost/regex.hpp>
 
diff --git a/Framework/DataHandling/src/LoadRKH.cpp b/Framework/DataHandling/src/LoadRKH.cpp
index 9d1b1dd3cb0e..4c558ce09790 100644
--- a/Framework/DataHandling/src/LoadRKH.cpp
+++ b/Framework/DataHandling/src/LoadRKH.cpp
@@ -15,16 +15,14 @@
 #include "MantidDataHandling/SaveRKH.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidKernel/ListValidator.h"
+#include "MantidKernel/StringTokenizer.h"
 #include "MantidKernel/UnitFactory.h"
 #include "MantidKernel/VectorHelper.h"
 #include "MantidKernel/cow_ptr.h"
 
-// clang-format off
-#include <boost/date_time/gregorian/gregorian.hpp>
-#include <boost/date_time/date_parsing.hpp>
-// clang-format on
-#include "MantidKernel/StringTokenizer.h"
 #include <boost/algorithm/string.hpp>
+#include <boost/date_time/date_parsing.hpp>
+#include <boost/date_time/gregorian/gregorian.hpp>
 #include <boost/lexical_cast.hpp>
 
 #include <boost/regex.hpp>
@@ -513,12 +511,10 @@ const std::string LoadRKH::readUnit(const std::string &line) {
 
   // this is a syntax check the line before returning its data
   if (codes.count() >= 3) {
-    // For the next line it is possible to use str.compare instead of str.find,
-    // this would be more efficient if the line was very long
-    // however to use is safely other checks would be required that would impair
-    // readability, therefore in this case the unlikely performance hit is
-    // accepted.
-    if (unit.find('(') != 0 || unit.find(')') != unit.size()) {
+    // For the next line it is possible to use str.compare instead of str.find, this would be more efficient if the line
+    // was very long however to use is safely other checks would be required that would impair readability, therefore in
+    // this case the unlikely performance hit is accepted.
+    if ((!unit.starts_with('(')) || (unit.find(')') != unit.size())) {
       std::string qCode = std::to_string(SaveRKH::Q_CODE);
       if (symbol == qCode && theQuantity == "q" &&
           (unit == "(1/Angstrom)" || unit == "(Angstrom^-1)")) { // 6 q (1/Angstrom) is the synatx for
diff --git a/Framework/DataHandling/src/SNSAppendGeometryToNexus.cpp b/Framework/DataHandling/src/SNSAppendGeometryToNexus.cpp
index c3f1297fb155..bf425c7df87b 100644
--- a/Framework/DataHandling/src/SNSAppendGeometryToNexus.cpp
+++ b/Framework/DataHandling/src/SNSAppendGeometryToNexus.cpp
@@ -6,17 +6,17 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidDataHandling/SNSAppendGeometryToNexus.h"
 #include "MantidAPI/FileProperty.h"
+
 #include "MantidAPI/InstrumentFileFinder.h"
 #include "MantidAPI/WorkspaceFactory.h"
+
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidGeometry/Instrument.h"
 
 #include "MantidKernel/OptionalBool.h"
 
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <Poco/Exception.h>
 #include <Poco/File.h>
diff --git a/Framework/DataHandling/src/SaveNXTomo.cpp b/Framework/DataHandling/src/SaveNXTomo.cpp
index 0c40912fe6c6..5903bab4b6f9 100644
--- a/Framework/DataHandling/src/SaveNXTomo.cpp
+++ b/Framework/DataHandling/src/SaveNXTomo.cpp
@@ -18,12 +18,12 @@
 #include "MantidGeometry/Instrument.h"
 
 #include "MantidKernel/CompositeValidator.h"
+
 #include "MantidKernel/MantidVersion.h"
 
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
+
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 namespace Mantid::DataHandling {
 // Register the algorithm into the algorithm factory
diff --git a/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp b/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
index 0852baf3d850..04e815a32c9e 100644
--- a/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
+++ b/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
@@ -17,16 +17,13 @@
 #include "MantidGeometry/Instrument/DetectorInfo.h"
 #include "MantidKernel/NexusDescriptor.h"
 #include "MantidKernel/StringTokenizer.h"
+#include "MantidNexusCpp/NeXusException.hpp"
+#include "MantidNexusCpp/NeXusFile.hpp"
 
+#include <algorithm>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/scoped_ptr.hpp>
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
-#include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
-
-#include <algorithm>
 #include <fstream>
 
 namespace Mantid::DataHandling {
diff --git a/Framework/Kernel/inc/MantidKernel/PrecompiledHeader.h b/Framework/Kernel/inc/MantidKernel/PrecompiledHeader.h
index abeb33911ddd..e8daf72558ad 100644
--- a/Framework/Kernel/inc/MantidKernel/PrecompiledHeader.h
+++ b/Framework/Kernel/inc/MantidKernel/PrecompiledHeader.h
@@ -34,7 +34,5 @@
 #include <Poco/Path.h>
 
 // NeXus
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
+#include "MantidNexusCpp/NeXusFile.hpp"
diff --git a/Framework/Kernel/src/NexusDescriptor.cpp b/Framework/Kernel/src/NexusDescriptor.cpp
index 48aee91cc5eb..2d22e39b147d 100644
--- a/Framework/Kernel/src/NexusDescriptor.cpp
+++ b/Framework/Kernel/src/NexusDescriptor.cpp
@@ -5,11 +5,8 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidKernel/NexusDescriptor.h"
-
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <algorithm>
 #include <cstring>
diff --git a/Framework/Kernel/src/PropertyNexus.cpp b/Framework/Kernel/src/PropertyNexus.cpp
index 328356808154..8db2fb798251 100644
--- a/Framework/Kernel/src/PropertyNexus.cpp
+++ b/Framework/Kernel/src/PropertyNexus.cpp
@@ -5,17 +5,13 @@
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
 #include "MantidKernel/PropertyNexus.h"
-
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
-#include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
-
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/DateAndTime.h"
 #include "MantidKernel/Property.h"
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidNexusCpp/NeXusException.hpp"
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 // PropertyWithValue implementation
 #include "MantidKernel/PropertyWithValue.tcc"
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadMD.h
index 686caadd0d31..6015bcd476b8 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadMD.h
@@ -86,9 +86,7 @@ class MANTID_MDALGORITHMS_DLL LoadMD : public API::NexusFileLoader {
   std::vector<double> qDimensions(const API::IMDWorkspace_sptr &ws);
 
   /// Open file handle
-  // clang-format off
-  boost::scoped_ptr< ::NeXus::File> m_file;
-  // clang-format on
+  boost::scoped_ptr<::NeXus::File> m_file;
 
   /// Name of that file
   std::string m_filename;
diff --git a/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp b/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
index f721e5bf3dfd..8298afea1bda 100644
--- a/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
+++ b/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
@@ -98,9 +98,7 @@ void CalculateCoverageDGS::init() {
                                                         std::make_shared<InstrumentValidator>()),
                   "An input workspace.");
 
-  // clang-format off
-  auto mustBe3D = std::make_shared<ArrayLengthValidator<double> >(3);
-  // clang-format on
+  auto mustBe3D = std::make_shared<ArrayLengthValidator<double>>(3);
   auto mustBePositive = std::make_shared<BoundedValidator<double>>();
   mustBePositive->setLower(0.0);
 
@@ -159,7 +157,9 @@ void CalculateCoverageDGS::exec() {
   }
 
   double ttmax = *(std::max_element(tt.begin(), tt.end()));
+
   m_Ei = getProperty("IncidentEnergy");
+
   if (m_Ei == EMPTY_DBL()) {
     if (inputWS->run().hasProperty("Ei")) {
       Kernel::Property *eiprop = inputWS->run().getProperty("Ei");
diff --git a/Framework/MDAlgorithms/src/LoadDNSSCD.cpp b/Framework/MDAlgorithms/src/LoadDNSSCD.cpp
index 51d27be4aaf4..297066282067 100644
--- a/Framework/MDAlgorithms/src/LoadDNSSCD.cpp
+++ b/Framework/MDAlgorithms/src/LoadDNSSCD.cpp
@@ -149,10 +149,8 @@ void LoadDNSSCD::init() {
   auto reasonableAngle = std::make_shared<BoundedValidator<double>>();
   reasonableAngle->setLower(5.0);
   reasonableAngle->setUpper(175.0);
-  // clang-format off
-  auto mustBe3D = std::make_shared<ArrayLengthValidator<double> >(3);
-  auto mustBe2D = std::make_shared<ArrayLengthValidator<double> >(2);
-  // clang-format on
+  auto mustBe3D = std::make_shared<ArrayLengthValidator<double>>(3);
+  auto mustBe2D = std::make_shared<ArrayLengthValidator<double>>(2);
   std::vector<double> u0(3, 0), v0(3, 0);
   u0[0] = 1.;
   u0[1] = 1.;
diff --git a/Framework/MDAlgorithms/src/MergeMDFiles.cpp b/Framework/MDAlgorithms/src/MergeMDFiles.cpp
index d5ed4a9e8f8a..3b69f4237480 100644
--- a/Framework/MDAlgorithms/src/MergeMDFiles.cpp
+++ b/Framework/MDAlgorithms/src/MergeMDFiles.cpp
@@ -306,10 +306,8 @@ void MergeMDFiles::finalizeOutput(const std::string &outputFile) {
     // create or open WS group and put there additional information about WS and
     // its dimensions
     bool old_data_there;
-    // clang-format off
-    boost::scoped_ptr< ::NeXus::File> file(MDBoxFlatTree::createOrOpenMDWSgroup(
-        outputFile, m_nDims, m_MDEventType, false, old_data_there));
-    // clang-format on
+    boost::scoped_ptr<::NeXus::File> file(
+        MDBoxFlatTree::createOrOpenMDWSgroup(outputFile, m_nDims, m_MDEventType, false, old_data_there));
     this->progress(0.94, "Saving ws history and dimensions");
     MDBoxFlatTree::saveWSGenericInfo(file.get(), m_OutIWS);
     // Save each ExperimentInfo to a spot in the file
diff --git a/Framework/MDAlgorithms/test/ConvertMDHistoToMatrixWorkspaceTest.h b/Framework/MDAlgorithms/test/ConvertMDHistoToMatrixWorkspaceTest.h
index 867b8e5b7b40..d99f2bd5b7cf 100644
--- a/Framework/MDAlgorithms/test/ConvertMDHistoToMatrixWorkspaceTest.h
+++ b/Framework/MDAlgorithms/test/ConvertMDHistoToMatrixWorkspaceTest.h
@@ -463,17 +463,14 @@ lines.
 formatting
 can be enabled */
 
-// clang-format off
-class ConvertMDHistoToMatrixWorkspaceTestPerformance:public CxxTest::TestSuite {
+class ConvertMDHistoToMatrixWorkspaceTestPerformance : public CxxTest::TestSuite {
 public:
   static ConvertMDHistoToMatrixWorkspaceTestPerformance *createSuite() {
     return new ConvertMDHistoToMatrixWorkspaceTestPerformance;
   }
-  static void destroySuite(ConvertMDHistoToMatrixWorkspaceTestPerformance *suite) {
-    delete suite;
-  }
-//clang-format on
-  void setUp() override{
+  static void destroySuite(ConvertMDHistoToMatrixWorkspaceTestPerformance *suite) { delete suite; }
+
+  void setUp() override {
     std::vector<size_t> nonInteger(2);
     nonInteger[0] = 0;
     nonInteger[1] = 1;
@@ -498,28 +495,24 @@ class ConvertMDHistoToMatrixWorkspaceTestPerformance:public CxxTest::TestSuite {
     }
     signal_t signal(0.f), error(0.f);
     // IMDHistoWorkspace_sptr slice =
-    auto slice = MDEventsTestHelper::makeFakeMDHistoWorkspaceGeneral(
-        ndims, signal, error, &numberOfBins.front(), &start.front(),
-        &end.front(), names);
-    alg =
-        AlgorithmManager::Instance().create("ConvertMDHistoToMatrixWorkspace");
+    auto slice = MDEventsTestHelper::makeFakeMDHistoWorkspaceGeneral(ndims, signal, error, &numberOfBins.front(),
+                                                                     &start.front(), &end.front(), names);
+    alg = AlgorithmManager::Instance().create("ConvertMDHistoToMatrixWorkspace");
     alg->initialize();
     alg->setRethrows(true);
     alg->setChild(true);
     alg->setProperty("InputWorkspace", slice);
     alg->setPropertyValue("OutputWorkspace",
                           "_2"); // Not really required for child algorithm
-
-
   }
 
   void test_ConvertMDhistoToMatrixWorkspace() {
 
-      try {
-        alg->execute();
-      } catch (std::exception &e) {
-        TS_FAIL(e.what());
-      }
+    try {
+      alg->execute();
+    } catch (std::exception &e) {
+      TS_FAIL(e.what());
+    }
   }
 
 private:
diff --git a/Framework/MDAlgorithms/test/IntegrateEllipsoidsWithSatellitesTest.h b/Framework/MDAlgorithms/test/IntegrateEllipsoidsWithSatellitesTest.h
index 0a81982df2a7..194bdcf7ede0 100644
--- a/Framework/MDAlgorithms/test/IntegrateEllipsoidsWithSatellitesTest.h
+++ b/Framework/MDAlgorithms/test/IntegrateEllipsoidsWithSatellitesTest.h
@@ -430,9 +430,7 @@ class IntegrateEllipsoidsWithSatellitesTest : public CxxTest::TestSuite {
   }
 };
 
-// clang-format off
 class IntegrateEllipsoidsWithSatellitesTestPerformance : public CxxTest::TestSuite {
-  // clang-format on
 
 private:
   Mantid::API::MatrixWorkspace_sptr m_eventWS;
@@ -440,11 +438,7 @@ class IntegrateEllipsoidsWithSatellitesTestPerformance : public CxxTest::TestSui
   Mantid::API::MatrixWorkspace_sptr m_histoWS;
 
 public:
-  // clang-format off
-  static void destroySuite(IntegrateEllipsoidsWithSatellitesTestPerformance *suite) {
-    // clang-format on
-    delete suite;
-  }
+  static void destroySuite(IntegrateEllipsoidsWithSatellitesTestPerformance *suite) { delete suite; }
 
   // This pair of boilerplate methods prevent the suite being created statically
   // This means the constructor isn't called when running other tests
diff --git a/Framework/Muon/src/LoadMuonNexus.cpp b/Framework/Muon/src/LoadMuonNexus.cpp
index 95283db53517..8a0c118ded76 100644
--- a/Framework/Muon/src/LoadMuonNexus.cpp
+++ b/Framework/Muon/src/LoadMuonNexus.cpp
@@ -21,17 +21,15 @@
 #include "MantidKernel/OptionalBool.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/UnitFactory.h"
-
 #include "MantidNexus/MuonNexusReader.h"
 #include "MantidNexus/NexusClasses.h"
+#include "MantidNexusCpp/NeXusException.hpp"
+#include "MantidNexusCpp/NeXusFile.hpp"
+
 #include <Poco/Path.h>
 #include <cmath>
 #include <limits>
 #include <memory>
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
-#include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
 
 namespace Mantid::Algorithms {
 
diff --git a/Framework/Muon/src/LoadMuonNexus1.cpp b/Framework/Muon/src/LoadMuonNexus1.cpp
index 4b86b32e861f..db158a2cb3f6 100644
--- a/Framework/Muon/src/LoadMuonNexus1.cpp
+++ b/Framework/Muon/src/LoadMuonNexus1.cpp
@@ -30,10 +30,8 @@
 #include "MantidKernel/UnitLabelTypes.h"
 #include "MantidNexus/MuonNexusReader.h"
 #include "MantidNexus/NexusClasses.h"
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <boost/iterator/counting_iterator.hpp>
 #include <boost/scoped_array.hpp>
diff --git a/Framework/Muon/src/LoadMuonNexus2.cpp b/Framework/Muon/src/LoadMuonNexus2.cpp
index c24d0f7ef547..7acf586bc19b 100644
--- a/Framework/Muon/src/LoadMuonNexus2.cpp
+++ b/Framework/Muon/src/LoadMuonNexus2.cpp
@@ -24,15 +24,12 @@
 #include "MantidKernel/UnitFactory.h"
 #include "MantidKernel/UnitLabelTypes.h"
 #include "MantidNexus/NexusClasses.h"
-
-#include <Poco/Path.h>
-#include <memory>
-// clang-format off
-#include "MantidNexusCpp/NeXusFile.hpp"
 #include "MantidNexusCpp/NeXusException.hpp"
-// clang-format on
+#include "MantidNexusCpp/NeXusFile.hpp"
 
+#include <Poco/Path.h>
 #include <cmath>
+#include <memory>
 #include <numeric>
 
 using Mantid::Types::Core::DateAndTime;
diff --git a/Framework/Muon/test/EstimateMuonAsymmetryFromCountsTest.h b/Framework/Muon/test/EstimateMuonAsymmetryFromCountsTest.h
index aba852f3d572..6873a4e9ecc1 100644
--- a/Framework/Muon/test/EstimateMuonAsymmetryFromCountsTest.h
+++ b/Framework/Muon/test/EstimateMuonAsymmetryFromCountsTest.h
@@ -295,19 +295,15 @@ class EstimateMuonAsymmetryFromCountsTest : public CxxTest::TestSuite {
     TS_ASSERT_DELTA(outWS->y(0)[49], 2.1769, Delta);
   }
 };
-// turn clang off, otherwise this does not compile
-// clang-format off
+
 class EstimateMuonAsymmetryFromCountsTestPerformance : public CxxTest::TestSuite {
-  // clang-format on
 public:
   // This pair of boilerplate methods prevent the suite being created statically
   // This means the constructor isn't called when running other tests
   static EstimateMuonAsymmetryFromCountsTestPerformance *createSuite() {
     return new EstimateMuonAsymmetryFromCountsTestPerformance();
   }
-  // clang-format off
-  static void  destroySuite(EstimateMuonAsymmetryFromCountsTestPerformance *suite) {
-    // clang-format on
+  static void destroySuite(EstimateMuonAsymmetryFromCountsTestPerformance *suite) {
     AnalysisDataService::Instance().clear();
     delete suite;
   }
diff --git a/Framework/Nexus/inc/MantidNexus/NexusFileIO.h b/Framework/Nexus/inc/MantidNexus/NexusFileIO.h
index b095ca2f3999..cc874dde0a7c 100644
--- a/Framework/Nexus/inc/MantidNexus/NexusFileIO.h
+++ b/Framework/Nexus/inc/MantidNexus/NexusFileIO.h
@@ -105,9 +105,7 @@ class MANTID_NEXUS_DLL NexusFileIO {
 
 private:
   /// C++ API file handle
-  // clang-format off
-  std::shared_ptr< ::NeXus::File> m_filehandle;
-  // clang-format on
+  std::shared_ptr<::NeXus::File> m_filehandle;
   /// Nexus compression method
   int m_nexuscompression;
   /// Allow an externally supplied progress object to be used
diff --git a/Framework/Nexus/src/NexusFileIO.cpp b/Framework/Nexus/src/NexusFileIO.cpp
index c873e3404a24..8615c8717f43 100644
--- a/Framework/Nexus/src/NexusFileIO.cpp
+++ b/Framework/Nexus/src/NexusFileIO.cpp
@@ -119,10 +119,10 @@ void NexusFileIO::openNexusWrite(const std::string &fileName, NexusFileIO::optio
       g_log.error("Unable to open file " + fileName);
       throw Exception::FileError("Unable to open File:", fileName);
     }
+
     auto file = new ::NeXus::File(fileID, true);
-    // clang-format off
-    m_filehandle = std::shared_ptr< ::NeXus::File>(file);
-    // clang-format on
+
+    m_filehandle = std::shared_ptr<::NeXus::File>(file);
   }
 
   //
@@ -993,9 +993,7 @@ int NexusFileIO::getWorkspaceSize(int &numberOfSpectra, int &numberOfChannels, i
 bool NexusFileIO::checkAttributeName(const std::string &target) const {
   // see if the given attribute name is in the current level
   // return true if it is.
-  // clang-format off
-  const std::vector< ::NeXus::AttrInfo> infos = m_filehandle->getAttrInfos();
-  // clang-format on
+  const std::vector<::NeXus::AttrInfo> infos = m_filehandle->getAttrInfos();
   return std::any_of(infos.cbegin(), infos.cend(), [&target](const auto &info) { return info.name == target; });
 }
 
diff --git a/Framework/Reflectometry/test/SpecularReflectionCalculateTheta2Test.h b/Framework/Reflectometry/test/SpecularReflectionCalculateTheta2Test.h
index 5625cf34ffcf..5b628a553a80 100644
--- a/Framework/Reflectometry/test/SpecularReflectionCalculateTheta2Test.h
+++ b/Framework/Reflectometry/test/SpecularReflectionCalculateTheta2Test.h
@@ -16,11 +16,7 @@
 using namespace Mantid::Reflectometry;
 using namespace Mantid::API;
 
-// clang-format off
-class SpecularReflectionCalculateTheta2Test: public CxxTest::TestSuite,
-    public SpecularReflectionAlgorithmTest
-// clang-format on
-{
+class SpecularReflectionCalculateTheta2Test : public CxxTest::TestSuite, public SpecularReflectionAlgorithmTest {
 
 private:
   Mantid::API::IAlgorithm_sptr makeAlgorithm() const {
diff --git a/Framework/Reflectometry/test/SpecularReflectionCalculateThetaTest.h b/Framework/Reflectometry/test/SpecularReflectionCalculateThetaTest.h
index c0e0c9eec89f..dd3e1720aac1 100644
--- a/Framework/Reflectometry/test/SpecularReflectionCalculateThetaTest.h
+++ b/Framework/Reflectometry/test/SpecularReflectionCalculateThetaTest.h
@@ -16,11 +16,7 @@
 using namespace Mantid::Reflectometry;
 using namespace Mantid::API;
 
-// clang-format off
-class SpecularReflectionCalculateThetaTest: public CxxTest::TestSuite,
-    public SpecularReflectionAlgorithmTest
-// clang-format on
-{
+class SpecularReflectionCalculateThetaTest : public CxxTest::TestSuite, public SpecularReflectionAlgorithmTest {
 
 private:
   Mantid::API::IAlgorithm_sptr makeAlgorithm() const {
diff --git a/Framework/Reflectometry/test/SpecularReflectionPositionCorrectTest.h b/Framework/Reflectometry/test/SpecularReflectionPositionCorrectTest.h
index cdf4fdc740ef..191b8518122c 100644
--- a/Framework/Reflectometry/test/SpecularReflectionPositionCorrectTest.h
+++ b/Framework/Reflectometry/test/SpecularReflectionPositionCorrectTest.h
@@ -22,11 +22,7 @@ using namespace Mantid::API;
 using namespace Mantid::Kernel;
 using namespace Mantid::Geometry;
 
-// clang-format off
-class SpecularReflectionPositionCorrectTest: public CxxTest::TestSuite,
-    public SpecularReflectionAlgorithmTest
-// clang-format on
-{
+class SpecularReflectionPositionCorrectTest : public CxxTest::TestSuite, public SpecularReflectionAlgorithmTest {
 
 public:
   // This pair of boilerplate methods prevent the suite being created statically
diff --git a/buildconfig/CMake/CppCheck_Suppressions.txt.in b/buildconfig/CMake/CppCheck_Suppressions.txt.in
index 0a35af10dc5e..0ad2f1f7bee9 100644
--- a/buildconfig/CMake/CppCheck_Suppressions.txt.in
+++ b/buildconfig/CMake/CppCheck_Suppressions.txt.in
@@ -563,8 +563,6 @@ uselessCallsSubstr:${CMAKE_SOURCE_DIR}/Framework/DataHandling/src/CreateChunking
 constVariableReference:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/src/IFittingAlgorithm.cpp:230
 missingOverride:${CMAKE_SOURCE_DIR}/Framework/DataHandling/inc/MantidDataHandling/LoadStl.h:55
 virtualCallInConstructor:${CMAKE_SOURCE_DIR}/Framework/Kernel/inc/MantidKernel/ThreadSchedulerMutexes.h:150
-variableScope:${CMAKE_SOURCE_DIR}/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h:392
-useStlAlgorithm:${CMAKE_SOURCE_DIR}/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h:711
 constVariableReference:${CMAKE_SOURCE_DIR}/Framework/DataHandling/src/EventWorkspaceCollection.cpp:118
 missingOverride:${CMAKE_SOURCE_DIR}/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsPar.h:124
 duplicateConditionalAssign:${CMAKE_SOURCE_DIR}/Framework/DataHandling/src/FindDetectorsPar.cpp:484
@@ -623,7 +621,6 @@ variableScope:${CMAKE_SOURCE_DIR}/Framework/DataHandling/src/LoadRaw/isisraw.cpp
 constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/DataHandling/src/LoadRaw/isisraw.cpp:906
 uninitdata:${CMAKE_SOURCE_DIR}/Framework/DataHandling/src/LoadRaw/isisraw.cpp:518
 constVariableReference:${CMAKE_SOURCE_DIR}/Framework/DataHandling/src/LoadMuonStrategy.cpp:119
-stlIfStrFind:${CMAKE_SOURCE_DIR}/Framework/DataHandling/src/LoadRKH.cpp:521
 knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/DataHandling/src/LoadNexusMonitors2.cpp:452
 uselessOverride:${CMAKE_SOURCE_DIR}/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed2.h:38
 constParameterReference:${CMAKE_SOURCE_DIR}/Framework/DataHandling/src/LoadTBL.cpp:133
diff --git a/qt/applications/workbench/mantidworkbench.cpp b/qt/applications/workbench/mantidworkbench.cpp
index 75a9f199f797..4589700a45fd 100644
--- a/qt/applications/workbench/mantidworkbench.cpp
+++ b/qt/applications/workbench/mantidworkbench.cpp
@@ -4,21 +4,14 @@
 //   NScD Oak Ridge National Laboratory, European Spallation Source,
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
-#include <filesystem>
-
-// clang-format off
-// boost 1.77 has a missing header on Windows. Include algorithm manually
-// https://github.com/boostorg/process/issues/213
 #include <algorithm>
 #include <boost/process/detail/traits/wchar_t.hpp>
-// clang-format on
-
 #include <boost/process/env.hpp>
 #include <boost/process/search_path.hpp>
 #include <boost/process/system.hpp>
-
 #include <cassert>
 #include <cstdlib>
+#include <filesystem>
 #include <iostream>
 #include <string>
 #include <vector>