diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiPeakSearch.h b/Framework/SINQ/inc/MantidSINQ/PoldiPeakSearch.h
index d2a4650c9acf..89bfdf0571b3 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiPeakSearch.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiPeakSearch.h
@@ -55,7 +55,7 @@ class MANTID_SINQ_DLL PoldiPeakSearch : public API::Algorithm {
                                                           MantidVec::const_iterator end) const;
 
   std::list<MantidVec::const_iterator>
-  mapPeakPositionsToCorrelationData(std::list<MantidVec::const_iterator> peakPositions,
+  mapPeakPositionsToCorrelationData(const std::list<MantidVec::const_iterator> &peakPositions,
                                     MantidVec::const_iterator baseDataStart,
                                     MantidVec::const_iterator originalDataStart) const;
 
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/MillerIndices.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/MillerIndices.h
index f29d4f4b30b4..27efb12c5ff0 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/MillerIndices.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/MillerIndices.h
@@ -25,7 +25,7 @@ namespace Poldi {
 class MANTID_SINQ_DLL MillerIndices {
 public:
   MillerIndices(int h = 0, int k = 0, int l = 0);
-  MillerIndices(std::vector<int> hkl);
+  MillerIndices(const std::vector<int> &hkl);
   MillerIndices(const Kernel::V3D &hkl);
 
   int h() const;
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiAutoCorrelationCore.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiAutoCorrelationCore.h
index 03a082ce8d52..d60b3fb76f6c 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiAutoCorrelationCore.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiAutoCorrelationCore.h
@@ -50,7 +50,7 @@ class MANTID_SINQ_DLL PoldiAutoCorrelationCore {
   void setWavelengthRange(double lambdaMin, double lambdaMax);
 
   DataObjects::Workspace2D_sptr
-  calculate(DataObjects::Workspace2D_sptr &countData,
+  calculate(const DataObjects::Workspace2D_sptr &countData,
             const DataObjects::Workspace2D_sptr &normCountData = DataObjects::Workspace2D_sptr());
 
 protected:
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h
index 4465e063dd4c..ae648f7ce8d9 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h
@@ -102,7 +102,7 @@ class MANTID_SINQ_DLL PoldiInstrumentAdapter {
   bool chopperSpeedMatchesTarget(const API::Run &runInformation, double chopperSpeed) const;
 
   double extractPropertyFromRun(const API::Run &runInformation, const std::string &propertyName) const;
-  AbstractDoubleValueExtractor_sptr getExtractorForProperty(Kernel::Property *chopperSpeedProperty) const;
+  AbstractDoubleValueExtractor_sptr getExtractorForProperty(const Kernel::Property *const chopperSpeedProperty) const;
 
   void setSpectrum(const Geometry::Instrument_const_sptr &mantidInstrument);
 
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeak.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeak.h
index 6eab51105cfc..ccdc9b0b8d1d 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeak.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeak.h
@@ -30,7 +30,7 @@ class MANTID_SINQ_DLL PoldiPeak {
 public:
   enum FwhmRelation { AbsoluteQ, AbsoluteD, Relative };
 
-  PoldiPeak_sptr clone() const;
+  PoldiPeak_sptr clonePeak() const;
 
   const MillerIndices &hkl() const;
   void setHKL(MillerIndices hkl);
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h
index 96a6c75db666..e45bb127fc8b 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h
@@ -39,7 +39,7 @@ class MANTID_SINQ_DLL PoldiPeakCollection {
 
   virtual ~PoldiPeakCollection() = default;
 
-  PoldiPeakCollection_sptr clone();
+  PoldiPeakCollection_sptr clonePeakCollection();
 
   size_t peakCount() const;
 
@@ -50,7 +50,7 @@ class MANTID_SINQ_DLL PoldiPeakCollection {
   IntensityType intensityType() const;
 
   void setProfileFunctionName(std::string newProfileFunction);
-  std::string getProfileFunctionName() const;
+  const std::string &getProfileFunctionName() const;
   bool hasProfileFunctionName() const;
 
   void setPointGroup(const Geometry::PointGroup_sptr &pointGroup);
diff --git a/Framework/SINQ/inc/MantidSINQ/SliceMDHisto.h b/Framework/SINQ/inc/MantidSINQ/SliceMDHisto.h
index a57e1b39ae08..1d10c518054c 100644
--- a/Framework/SINQ/inc/MantidSINQ/SliceMDHisto.h
+++ b/Framework/SINQ/inc/MantidSINQ/SliceMDHisto.h
@@ -43,8 +43,8 @@ class MANTID_SINQ_DLL SliceMDHisto : public Mantid::API::Algorithm {
   unsigned int m_rank;
   std::vector<int> m_dim;
   void cutData(const Mantid::API::IMDHistoWorkspace_sptr &inWS, const Mantid::API::IMDHistoWorkspace_sptr &outWS,
-               Mantid::coord_t *sourceDim, Mantid::coord_t *targetDim, std::vector<int> start, std::vector<int> end,
-               unsigned int dim);
+               Mantid::coord_t *sourceDim, Mantid::coord_t *targetDim, const std::vector<int> &start,
+               const std::vector<int> &end, unsigned int dim);
 
   void copyMetaData(const Mantid::API::IMDHistoWorkspace_sptr &inws, const Mantid::API::IMDHistoWorkspace_sptr &outws);
 };
diff --git a/Framework/SINQ/src/PoldiCreatePeaksFromCell.cpp b/Framework/SINQ/src/PoldiCreatePeaksFromCell.cpp
index ad057079066a..49d0fd52ddff 100644
--- a/Framework/SINQ/src/PoldiCreatePeaksFromCell.cpp
+++ b/Framework/SINQ/src/PoldiCreatePeaksFromCell.cpp
@@ -46,7 +46,7 @@ std::map<std::string, std::string> PoldiCreatePeaksFromCell::validateInputs() {
   std::map<std::string, std::string> errorMap;
 
   double dMin = getProperty("LatticeSpacingMin");
-  Property *dMaxProperty = getProperty("LatticeSpacingMax");
+  const Property *dMaxProperty = getProperty("LatticeSpacingMax");
 
   auto dMax = boost::lexical_cast<double>(dMaxProperty->value());
   if (!dMaxProperty->isDefault() && (dMax < dMin)) {
@@ -80,7 +80,7 @@ SpaceGroup_const_sptr PoldiCreatePeaksFromCell::getSpaceGroup(const std::string
  *  @return Largest considered lattice spacing
  */
 double PoldiCreatePeaksFromCell::getDMaxValue(const UnitCell &unitCell) const {
-  Property *dMaxProperty = getProperty("LatticeSpacingMax");
+  const Property *dMaxProperty = getProperty("LatticeSpacingMax");
 
   if (dMaxProperty->isDefault()) {
     // Instead of returning just the value, 1.0 is added to avoid running into
diff --git a/Framework/SINQ/src/PoldiFitPeaks1D2.cpp b/Framework/SINQ/src/PoldiFitPeaks1D2.cpp
index d34bc4d5daed..c843b3403b3d 100644
--- a/Framework/SINQ/src/PoldiFitPeaks1D2.cpp
+++ b/Framework/SINQ/src/PoldiFitPeaks1D2.cpp
@@ -202,7 +202,7 @@ API::IFunction_sptr PoldiFitPeaks1D2::getRangeProfile(const RefinedRange_sptr &r
   totalProfile->initialize();
 
   std::vector<PoldiPeak_sptr> peaks = range->getPeaks();
-  for (auto &peak : peaks) {
+  for (const auto &peak : peaks) {
     totalProfile->addFunction(getPeakProfile(peak));
   }
 
diff --git a/Framework/SINQ/src/PoldiFitPeaks2D.cpp b/Framework/SINQ/src/PoldiFitPeaks2D.cpp
index ca5d6affb5d6..3315d0e6242a 100644
--- a/Framework/SINQ/src/PoldiFitPeaks2D.cpp
+++ b/Framework/SINQ/src/PoldiFitPeaks2D.cpp
@@ -194,7 +194,7 @@ PoldiFitPeaks2D::getIntegratedPeakCollection(const PoldiPeakCollection_sptr &raw
      * except cloning the collection, to make behavior consistent, since
      * integrating also results in a new peak collection.
      */
-    return rawPeakCollection->clone();
+    return rawPeakCollection->clonePeakCollection();
   }
 
   /* If no profile function is specified, it's not possible to get integrated
@@ -229,7 +229,7 @@ PoldiFitPeaks2D::getIntegratedPeakCollection(const PoldiPeakCollection_sptr &raw
     profileFunction->setHeight(peak->intensity());
     profileFunction->setFwhm(peak->fwhm(PoldiPeak::AbsoluteD));
 
-    PoldiPeak_sptr integratedPeak = peak->clone();
+    PoldiPeak_sptr integratedPeak = peak->clonePeak();
     integratedPeak->setIntensity(UncertainValue(profileFunction->intensity()));
     integratedPeakCollection->addPeak(integratedPeak);
   }
@@ -267,7 +267,7 @@ PoldiFitPeaks2D::getNormalizedPeakCollection(const PoldiPeakCollection_sptr &pea
     PoldiPeak_sptr peak = peakCollection->peak(i);
     double calculatedIntensity = m_timeTransformer->calculatedTotalIntensity(peak->d());
 
-    PoldiPeak_sptr normalizedPeak = peak->clone();
+    PoldiPeak_sptr normalizedPeak = peak->clonePeak();
     normalizedPeak->setIntensity(peak->intensity() / calculatedIntensity);
     normalizedPeakCollection->addPeak(normalizedPeak);
   }
@@ -340,7 +340,7 @@ PoldiPeakCollection_sptr PoldiFitPeaks2D::getCountPeakCollection(const PoldiPeak
     PoldiPeak_sptr peak = peakCollection->peak(i);
     double calculatedIntensity = m_timeTransformer->calculatedTotalIntensity(peak->d());
 
-    PoldiPeak_sptr countPeak = peak->clone();
+    PoldiPeak_sptr countPeak = peak->clonePeak();
     countPeak->setIntensity(peak->intensity() * calculatedIntensity);
 
     countPeakCollection->addPeak(countPeak);
@@ -574,7 +574,7 @@ std::string PoldiFitPeaks2D::getRefinedStartingCell(const std::string &initialCe
   latticeFunction->setUnitCell(cell);
 
   // Remove errors from d-values
-  PoldiPeakCollection_sptr clone = peakCollection->clone();
+  PoldiPeakCollection_sptr clone = peakCollection->clonePeakCollection();
   for (size_t i = 0; i < clone->peakCount(); ++i) {
     PoldiPeak_sptr peak = clone->peak(i);
 
diff --git a/Framework/SINQ/src/PoldiIndexKnownCompounds.cpp b/Framework/SINQ/src/PoldiIndexKnownCompounds.cpp
index 05c2bcb74ef8..2e56f5b2d6b2 100644
--- a/Framework/SINQ/src/PoldiIndexKnownCompounds.cpp
+++ b/Framework/SINQ/src/PoldiIndexKnownCompounds.cpp
@@ -656,8 +656,8 @@ PoldiIndexKnownCompounds::getIntensitySortedPeakCollection(const PoldiPeakCollec
   std::sort(peakVector.begin(), peakVector.end(), std::bind(&PoldiPeak::greaterThan, _1, _2, &PoldiPeak::intensity));
 
   PoldiPeakCollection_sptr sortedPeaks = std::make_shared<PoldiPeakCollection>(peaks->intensityType());
-  for (auto &peak : peakVector) {
-    sortedPeaks->addPeak(peak->clone());
+  for (const auto &peak : peakVector) {
+    sortedPeaks->addPeak(peak->clonePeak());
   }
 
   return sortedPeaks;
diff --git a/Framework/SINQ/src/PoldiPeakSearch.cpp b/Framework/SINQ/src/PoldiPeakSearch.cpp
index 4c39716db71f..23ac04438434 100644
--- a/Framework/SINQ/src/PoldiPeakSearch.cpp
+++ b/Framework/SINQ/src/PoldiPeakSearch.cpp
@@ -114,15 +114,9 @@ std::list<MantidVec::const_iterator> PoldiPeakSearch::findPeaks(MantidVec::const
   rawPeaks.sort(&PoldiPeakSearch::vectorElementGreaterThan);
 
   size_t usedPeakCount = std::min(m_maximumPeakNumber, static_cast<int>(rawPeaks.size()));
-  std::list<MantidVec::const_iterator> truncatedPeaks;
+  auto lastPeakIter = std::next(rawPeaks.begin(), usedPeakCount);
 
-  std::list<MantidVec::const_iterator>::const_iterator iter = rawPeaks.begin();
-  for (size_t i = 0; i < usedPeakCount; ++i) {
-    truncatedPeaks.insert(truncatedPeaks.end(), *iter);
-    ++iter;
-  }
-
-  return truncatedPeaks;
+  return std::list<MantidVec::const_iterator>(rawPeaks.begin(), lastPeakIter);
 }
 
 /** Actual recursive peak search method
@@ -180,7 +174,7 @@ std::list<MantidVec::const_iterator> PoldiPeakSearch::findPeaksRecursive(MantidV
  *data.
  */
 std::list<MantidVec::const_iterator>
-PoldiPeakSearch::mapPeakPositionsToCorrelationData(std::list<MantidVec::const_iterator> peakPositions,
+PoldiPeakSearch::mapPeakPositionsToCorrelationData(const std::list<MantidVec::const_iterator> &peakPositions,
                                                    MantidVec::const_iterator baseDataStart,
                                                    MantidVec::const_iterator originalDataStart) const {
   std::list<MantidVec::const_iterator> transformedIndices;
diff --git a/Framework/SINQ/src/PoldiUtilities/MillerIndices.cpp b/Framework/SINQ/src/PoldiUtilities/MillerIndices.cpp
index 15248e28f3fb..6ee09d329af6 100644
--- a/Framework/SINQ/src/PoldiUtilities/MillerIndices.cpp
+++ b/Framework/SINQ/src/PoldiUtilities/MillerIndices.cpp
@@ -17,7 +17,7 @@ MillerIndices::MillerIndices(int h, int k, int l)
   populateVector();
 }
 
-MillerIndices::MillerIndices(std::vector<int> hkl) {
+MillerIndices::MillerIndices(const std::vector<int> &hkl) {
   if (hkl.size() != 3) {
     throw std::runtime_error("MillerIndices object can only be created with 3 indices");
   }
diff --git a/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp b/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp
index 09ff87129ad6..8bcb2121b45b 100644
--- a/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp
+++ b/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp
@@ -97,7 +97,7 @@ PoldiAutoCorrelationCore::finalizeCalculation(const std::vector<double> &correct
  * @param countData :: Instance of Workspace2D with POLDI data.
  * @return A workspace containing the correlation spectrum.
  */
-DataObjects::Workspace2D_sptr PoldiAutoCorrelationCore::calculate(DataObjects::Workspace2D_sptr &countData,
+DataObjects::Workspace2D_sptr PoldiAutoCorrelationCore::calculate(const DataObjects::Workspace2D_sptr &countData,
                                                                   const DataObjects::Workspace2D_sptr &normCountData) {
   m_logger.information() << "Starting Autocorrelation method...\n";
 
diff --git a/Framework/SINQ/src/PoldiUtilities/PoldiInstrumentAdapter.cpp b/Framework/SINQ/src/PoldiUtilities/PoldiInstrumentAdapter.cpp
index 4718f3031db7..787e2803cce9 100644
--- a/Framework/SINQ/src/PoldiUtilities/PoldiInstrumentAdapter.cpp
+++ b/Framework/SINQ/src/PoldiUtilities/PoldiInstrumentAdapter.cpp
@@ -232,7 +232,7 @@ double PoldiInstrumentAdapter::extractPropertyFromRun(const Run &runInformation,
     throw std::runtime_error("Cannot construct instrument without " + propertyName + "-property in log. Aborting.");
   }
 
-  Kernel::Property *property = runInformation.getProperty(propertyName);
+  const Kernel::Property *property = runInformation.getProperty(propertyName);
 
   AbstractDoubleValueExtractor_sptr extractor = getExtractorForProperty(property);
 
@@ -255,7 +255,7 @@ double PoldiInstrumentAdapter::extractPropertyFromRun(const Run &runInformation,
  * @return Functor of type AbstractDoubleValueExtractor
  */
 AbstractDoubleValueExtractor_sptr
-PoldiInstrumentAdapter::getExtractorForProperty(Kernel::Property *chopperSpeedProperty) const {
+PoldiInstrumentAdapter::getExtractorForProperty(const Kernel::Property *const chopperSpeedProperty) const {
   if (!chopperSpeedProperty) {
     throw std::invalid_argument("Cannot process null-Property.");
   }
diff --git a/Framework/SINQ/src/PoldiUtilities/PoldiPeak.cpp b/Framework/SINQ/src/PoldiUtilities/PoldiPeak.cpp
index 7f59210e50ca..b00d57cdf7fa 100644
--- a/Framework/SINQ/src/PoldiUtilities/PoldiPeak.cpp
+++ b/Framework/SINQ/src/PoldiUtilities/PoldiPeak.cpp
@@ -12,7 +12,7 @@
 
 namespace Mantid::Poldi {
 
-PoldiPeak_sptr PoldiPeak::clone() const { return PoldiPeak_sptr(new PoldiPeak(*this)); }
+PoldiPeak_sptr PoldiPeak::clonePeak() const { return PoldiPeak_sptr(new PoldiPeak(*this)); }
 
 const MillerIndices &PoldiPeak::hkl() const { return m_hkl; }
 
diff --git a/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp b/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp
index a5dd0fa32314..4ab37a7f1063 100644
--- a/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp
+++ b/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp
@@ -53,14 +53,14 @@ PoldiPeakCollection::PoldiPeakCollection(const CrystalStructure &crystalStructur
   setPeaks(hkls, dValues, structureFactors);
 }
 
-PoldiPeakCollection_sptr PoldiPeakCollection::clone() {
+PoldiPeakCollection_sptr PoldiPeakCollection::clonePeakCollection() {
   PoldiPeakCollection_sptr clone = std::make_shared<PoldiPeakCollection>(m_intensityType);
   clone->setProfileFunctionName(m_profileFunctionName);
   clone->setPointGroup(m_pointGroup);
   clone->setUnitCell(m_unitCell);
 
-  for (auto &peak : m_peaks) {
-    clone->addPeak(peak->clone());
+  for (const auto &item : m_peaks) {
+    clone->addPeak(item->clonePeak());
   }
 
   return clone;
@@ -86,7 +86,7 @@ void PoldiPeakCollection::setProfileFunctionName(std::string newProfileFunction)
   m_profileFunctionName = std::move(newProfileFunction);
 }
 
-std::string PoldiPeakCollection::getProfileFunctionName() const { return m_profileFunctionName; }
+const std::string &PoldiPeakCollection::getProfileFunctionName() const { return m_profileFunctionName; }
 
 bool PoldiPeakCollection::hasProfileFunctionName() const { return !m_profileFunctionName.empty(); }
 
diff --git a/Framework/SINQ/src/SliceMDHisto.cpp b/Framework/SINQ/src/SliceMDHisto.cpp
index 1a0426f6c95e..05d3da15382d 100644
--- a/Framework/SINQ/src/SliceMDHisto.cpp
+++ b/Framework/SINQ/src/SliceMDHisto.cpp
@@ -92,7 +92,8 @@ void SliceMDHisto::exec() {
 
 void SliceMDHisto::cutData(const Mantid::API::IMDHistoWorkspace_sptr &inWS,
                            const Mantid::API::IMDHistoWorkspace_sptr &outWS, Mantid::coord_t *sourceDim,
-                           Mantid::coord_t *targetDim, std::vector<int> start, std::vector<int> end, unsigned int dim) {
+                           Mantid::coord_t *targetDim, const std::vector<int> &start, const std::vector<int> &end,
+                           unsigned int dim) {
   int length;
 
   std::shared_ptr<const IMDDimension> inDim = inWS->getDimension(dim);
diff --git a/Framework/SINQ/test/PoldiFitPeaks1D2Test.h b/Framework/SINQ/test/PoldiFitPeaks1D2Test.h
index 335ec64cf277..9dfb74a25cf6 100644
--- a/Framework/SINQ/test/PoldiFitPeaks1D2Test.h
+++ b/Framework/SINQ/test/PoldiFitPeaks1D2Test.h
@@ -240,12 +240,12 @@ class PoldiFitPeaks1D2Test : public CxxTest::TestSuite {
 
     // Peaks with certain properties are rejected
     // 1. negative intensity
-    PoldiPeak_sptr negativeIntensity = m_testPeak->clone();
+    PoldiPeak_sptr negativeIntensity = m_testPeak->clonePeak();
     negativeIntensity->setIntensity(UncertainValue(-190.0));
     TS_ASSERT(!poldiPeakFit.peakIsAcceptable(negativeIntensity));
 
     // 2a. FWHM too large (rel. > 0.02)
-    PoldiPeak_sptr tooBroad = m_testPeak->clone();
+    PoldiPeak_sptr tooBroad = m_testPeak->clonePeak();
     tooBroad->setFwhm(UncertainValue(0.021), PoldiPeak::Relative);
     TS_ASSERT(!poldiPeakFit.peakIsAcceptable(tooBroad));
 
@@ -254,7 +254,7 @@ class PoldiFitPeaks1D2Test : public CxxTest::TestSuite {
     TS_ASSERT(poldiPeakFit.peakIsAcceptable(tooBroad));
 
     // 3. FWHM too small (rel. < 0.001)
-    PoldiPeak_sptr tooNarrow = m_testPeak->clone();
+    PoldiPeak_sptr tooNarrow = m_testPeak->clonePeak();
     tooNarrow->setFwhm(UncertainValue(0.0009), PoldiPeak::Relative);
     TS_ASSERT(!poldiPeakFit.peakIsAcceptable(tooNarrow));
   }
diff --git a/Framework/SINQ/test/PoldiFitPeaks2DTest.h b/Framework/SINQ/test/PoldiFitPeaks2DTest.h
index f0db7472f671..a8fcfff6a474 100644
--- a/Framework/SINQ/test/PoldiFitPeaks2DTest.h
+++ b/Framework/SINQ/test/PoldiFitPeaks2DTest.h
@@ -116,7 +116,7 @@ class PoldiFitPeaks2DTest : public CxxTest::TestSuite {
     // checking the actual integration result agains reference.
     PoldiPeakCollection_sptr integratedReference(new PoldiPeakCollection(PoldiPeakCollection::Integral));
     for (size_t i = 0; i < testPeaks->peakCount(); ++i) {
-      PoldiPeak_sptr peak = testPeaks->peak(i)->clone();
+      PoldiPeak_sptr peak = testPeaks->peak(i)->clonePeak();
 
       double oldIntensity = peak->intensity();
       double fwhm = peak->fwhm(PoldiPeak::AbsoluteD);
diff --git a/Framework/SINQ/test/PoldiPeakCollectionTest.h b/Framework/SINQ/test/PoldiPeakCollectionTest.h
index 9e8a50ea9485..113efe7cf8ca 100644
--- a/Framework/SINQ/test/PoldiPeakCollectionTest.h
+++ b/Framework/SINQ/test/PoldiPeakCollectionTest.h
@@ -274,7 +274,7 @@ class PoldiPeakCollectionTest : public CxxTest::TestSuite {
     peaks->addPeak(PoldiPeak::create(2.0));
     peaks->addPeak(PoldiPeak::create(3.0));
 
-    PoldiPeakCollection_sptr clone = peaks->clone();
+    PoldiPeakCollection_sptr clone = peaks->clonePeakCollection();
 
     // make sure those are different instances
     TS_ASSERT(clone != peaks);
diff --git a/Framework/SINQ/test/PoldiPeakTest.h b/Framework/SINQ/test/PoldiPeakTest.h
index bd06aac51c38..f5b6597acbdc 100644
--- a/Framework/SINQ/test/PoldiPeakTest.h
+++ b/Framework/SINQ/test/PoldiPeakTest.h
@@ -172,7 +172,7 @@ class PoldiPeakTest : public CxxTest::TestSuite {
 
   void testClone() {
     PoldiPeak_sptr peak = PoldiPeak::create(1.0, 200.00);
-    PoldiPeak_sptr clone = peak->clone();
+    PoldiPeak_sptr clone = peak->clonePeak();
 
     TS_ASSERT_EQUALS(peak->d(), clone->d());
     TS_ASSERT_EQUALS(peak->fwhm(), clone->fwhm());
diff --git a/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h b/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
index 088220aa078d..93305a091c66 100644
--- a/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
+++ b/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
@@ -106,7 +106,7 @@ class SCRIPT_DLL_EXPORT ScriptRepositoryImpl : public ScriptRepository {
 
   void setIgnorePatterns(const std::string &patterns) override;
 
-  std::string ignorePatterns() override;
+  std::string ignorePatterns() final;
 
   int setAutoUpdate(const std::string &input_path, bool option = true) override;
 
diff --git a/Framework/TestHelpers/inc/MantidFrameworkTestHelpers/FakeObjects.h b/Framework/TestHelpers/inc/MantidFrameworkTestHelpers/FakeObjects.h
index be1a6fc5a47d..a623ebba65e1 100644
--- a/Framework/TestHelpers/inc/MantidFrameworkTestHelpers/FakeObjects.h
+++ b/Framework/TestHelpers/inc/MantidFrameworkTestHelpers/FakeObjects.h
@@ -142,14 +142,12 @@ class AxeslessWorkspaceTester : public MatrixWorkspace {
   size_t blocksize() const override {
     if (m_vec.empty()) {
       return 0;
-    } else {
-      size_t numY = m_vec[0].dataY().size();
-      if (std::any_of(m_vec.cbegin(), m_vec.cend(), [numY](auto it) { return it.dataY().size() != numY; })) {
-        throw std::logic_error("non-constant number of bins");
-      }
-      return numY;
     }
-    return m_vec.empty() ? 0 : m_vec[0].dataY().size();
+    size_t numY = m_vec[0].dataY().size();
+    if (std::any_of(m_vec.cbegin(), m_vec.cend(), [numY](auto it) { return it.dataY().size() != numY; })) {
+      throw std::logic_error("non-constant number of bins");
+    }
+    return numY;
   }
 
   std::size_t getNumberBins(const std::size_t &index) const override {
diff --git a/buildconfig/CMake/CppCheck_Suppressions.txt.in b/buildconfig/CMake/CppCheck_Suppressions.txt.in
index 82adf19757a8..1543c531e33f 100644
--- a/buildconfig/CMake/CppCheck_Suppressions.txt.in
+++ b/buildconfig/CMake/CppCheck_Suppressions.txt.in
@@ -743,21 +743,6 @@ missingOverride:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiTruncateD
 returnByReference:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDeadWireDecorator.h:38
 virtualCallInConstructor:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDeadWireDecorator.h:44
 virtualCallInConstructor:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDetectorDecorator.h:48
-returnByReference:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h:53
-constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiCreatePeaksFromCell.cpp:49
-constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiCreatePeaksFromCell.cpp:83
-constVariableReference:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiFitPeaks1D2.cpp:205
-constVariableReference:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiIndexKnownCompounds.cpp:659
-returnDanglingLifetime:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiPeakSearch.cpp:125
-passedByValue:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiPeakSearch.cpp:183
-passedByValue:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiUtilities/MillerIndices.cpp:20
-constParameterReference:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp:100
-constParameterPointer:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiUtilities/PoldiInstrumentAdapter.cpp:258
-shadowFunction:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp:62
-constVariableReference:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp:62
-passedByValue:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/SliceMDHisto.cpp:95
-virtualCallInConstructor:${CMAKE_SOURCE_DIR}/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h:109
-knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/TestHelpers/inc/MantidFrameworkTestHelpers/FakeObjects.h:152
 constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/WorkflowAlgorithms/src/HFIRLoad.cpp:223
 unreadVariable:${CMAKE_SOURCE_DIR}/Framework/WorkflowAlgorithms/src/SofTwoThetaTOF.cpp:196
 missingOverride:${CMAKE_SOURCE_DIR}/Testing/Tools/cxxtest/cxxtest/GlobalFixture.h:22