diff --git a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingPixelClustersOnTrack.h b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingPixelClustersOnTrack.h
index b4051ac6e2f0a175e3a308ff9799e5e34de21e18..1b416c9401328b9b1bd503ad830d84b291213a28 100755
--- a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingPixelClustersOnTrack.h
+++ b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingPixelClustersOnTrack.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -54,7 +54,7 @@ public:
     CompetingPixelClustersOnTrack(const CompetingPixelClustersOnTrack& compROT);
     /** Assignment operator */
     CompetingPixelClustersOnTrack& operator=(const CompetingPixelClustersOnTrack& compROT);
-    CompetingPixelClustersOnTrack& operator=(CompetingPixelClustersOnTrack&& compROT);
+    CompetingPixelClustersOnTrack& operator=(CompetingPixelClustersOnTrack&& compROT) noexcept;
 
     /** Constructor with all parameters: PLEASE do not use directly,
     but call InDet::CompetingPixelClustersOnTrackTool, otherwise inconsistency of
diff --git a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingTRT_DriftCirclesOnTrack.h b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingTRT_DriftCirclesOnTrack.h
index 3dc824519e7d4636d74eb45d7af4e31f6ebe7fb9..4d67b2a4785da77362dc4220ba35757b797346e6 100755
--- a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingTRT_DriftCirclesOnTrack.h
+++ b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/InDetCompetingRIOsOnTrack/CompetingTRT_DriftCirclesOnTrack.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -55,7 +55,7 @@ namespace InDet {
     //! Assignment operator
     CompetingTRT_DriftCirclesOnTrack& operator=(const CompetingTRT_DriftCirclesOnTrack& compROT);
     /** Move assignment operator */
-    CompetingTRT_DriftCirclesOnTrack& operator=(CompetingTRT_DriftCirclesOnTrack&& compROT);
+    CompetingTRT_DriftCirclesOnTrack& operator=(CompetingTRT_DriftCirclesOnTrack&& compROT) noexcept;
     
 
     /** @brief Constructor with all parameters: PLEASE do not use directly,
diff --git a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingPixelClustersOnTrack.cxx b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingPixelClustersOnTrack.cxx
index 077f53db8e568c630ac18790555a20c5da6fd450..ef59abb4855ea4d909cdb5f61762ae4ad84b7627 100755
--- a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingPixelClustersOnTrack.cxx
+++ b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingPixelClustersOnTrack.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -16,14 +16,14 @@
 InDet::CompetingPixelClustersOnTrack::CompetingPixelClustersOnTrack():
         Trk::CompetingRIOsOnTrack(),
         m_globalPosition{},
-        m_containedChildRots(0)
+        m_containedChildRots(nullptr)
         {}
 
 // copy constructor
 InDet::CompetingPixelClustersOnTrack::CompetingPixelClustersOnTrack(const InDet::CompetingPixelClustersOnTrack& compROT) :
         Trk::CompetingRIOsOnTrack(compROT),
         m_globalPosition{},
-        m_containedChildRots(0) {
+        m_containedChildRots(nullptr) {
     m_containedChildRots = new std::vector< const InDet::PixelClusterOnTrack* >;
     std::vector< const InDet::PixelClusterOnTrack* >::const_iterator rotIter = compROT.m_containedChildRots->begin();
     for (; rotIter!=compROT.m_containedChildRots->end(); ++rotIter) {
@@ -68,7 +68,7 @@ InDet::CompetingPixelClustersOnTrack& InDet::CompetingPixelClustersOnTrack::oper
     return (*this);
 }
 
-InDet::CompetingPixelClustersOnTrack& InDet::CompetingPixelClustersOnTrack::operator=(InDet::CompetingPixelClustersOnTrack&& compROT) {
+InDet::CompetingPixelClustersOnTrack& InDet::CompetingPixelClustersOnTrack::operator=(InDet::CompetingPixelClustersOnTrack&& compROT)  noexcept {
     if (this!=&compROT) {
         // move operator of base class
         Trk::CompetingRIOsOnTrack::operator=(std::move(compROT));
diff --git a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingTRT_DriftCirclesOnTrack.cxx b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingTRT_DriftCirclesOnTrack.cxx
index 6040c10354a1e01161e05130fb7bbd40d3574410..8a0e722e6c2d166344bd9e01170b8349a4900313 100755
--- a/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingTRT_DriftCirclesOnTrack.cxx
+++ b/InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack/src/CompetingTRT_DriftCirclesOnTrack.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -19,22 +19,22 @@
 // default constructor
 InDet::CompetingTRT_DriftCirclesOnTrack::CompetingTRT_DriftCirclesOnTrack():
   Trk::CompetingRIOsOnTrack(),
-  m_associatedSurface(0),
+  m_associatedSurface(nullptr),
   m_globalPosition{},
-  m_containedChildRots(0),
+  m_containedChildRots(nullptr),
   m_ROTsHaveCommonSurface(8) {}
 
 // copy constructor
 InDet::CompetingTRT_DriftCirclesOnTrack::CompetingTRT_DriftCirclesOnTrack(const InDet::CompetingTRT_DriftCirclesOnTrack& compROT) :
   Trk::CompetingRIOsOnTrack(compROT),
   m_globalPosition{},
-  m_containedChildRots(0),
+  m_containedChildRots(nullptr),
   m_ROTsHaveCommonSurface(compROT.m_ROTsHaveCommonSurface.load()) {
   if (compROT.m_associatedSurface) {
     // copy only if surface is not one owned by a detector Element
     m_associatedSurface = (!compROT.m_associatedSurface->associatedDetectorElement()) ? compROT.m_associatedSurface->clone() : compROT.m_associatedSurface;
   } else {
-    m_associatedSurface = 0;
+    m_associatedSurface = nullptr;
   }
   m_containedChildRots = new std::vector< const InDet::TRT_DriftCircleOnTrack* >;
   std::vector< const InDet::TRT_DriftCircleOnTrack* >::const_iterator rotIter = compROT.m_containedChildRots->begin();
@@ -86,7 +86,7 @@ InDet::CompetingTRT_DriftCirclesOnTrack& InDet::CompetingTRT_DriftCirclesOnTrack
       // copy only if surface is not one owned by a detector Element
       m_associatedSurface = (!compROT.m_associatedSurface->associatedDetectorElement()) ? compROT.m_associatedSurface->clone() : compROT.m_associatedSurface;
     } else {
-      m_associatedSurface = 0;
+      m_associatedSurface = nullptr;
     }
     if (compROT.m_globalPosition) m_globalPosition.store(std::make_unique<const Amg::Vector3D>(*compROT.m_globalPosition));
     else if (m_globalPosition) m_globalPosition.release().reset();
@@ -98,7 +98,7 @@ InDet::CompetingTRT_DriftCirclesOnTrack& InDet::CompetingTRT_DriftCirclesOnTrack
   return (*this);
 }
 
-InDet::CompetingTRT_DriftCirclesOnTrack& InDet::CompetingTRT_DriftCirclesOnTrack::operator=(InDet::CompetingTRT_DriftCirclesOnTrack&& compROT) {
+InDet::CompetingTRT_DriftCirclesOnTrack& InDet::CompetingTRT_DriftCirclesOnTrack::operator=(InDet::CompetingTRT_DriftCirclesOnTrack&& compROT)  noexcept {
   if (this!=&compROT) {
     // rots
     clearChildRotVector();
diff --git a/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData/SCT_Cluster.h b/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData/SCT_Cluster.h
index fa608ce598b5ae93e197e281f9cf89f7157f3f70..ebcc545731bbf285c245b1335a1b6e5fb7103d11 100755
--- a/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData/SCT_Cluster.h
+++ b/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData/SCT_Cluster.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
  ///////////////////////////////////////////////////////////////////
@@ -41,11 +41,11 @@ class SCT_Cluster final : public SiCluster {
   /// Copy constructor
   SCT_Cluster(const SCT_Cluster &);
   /// Move constructor
-  SCT_Cluster(SCT_Cluster &&);
+  SCT_Cluster(SCT_Cluster &&) noexcept;
   /// Assignment operator
   SCT_Cluster &operator=(const SCT_Cluster &);
   /// Move assignment operator
-  SCT_Cluster &operator=(SCT_Cluster &&);
+  SCT_Cluster &operator=(SCT_Cluster &&) noexcept;
 
   /**
    * Constructor with parameters using pointer of Amg::MatrixX.
diff --git a/InnerDetector/InDetRecEvent/InDetPrepRawData/src/PixelCluster.cxx b/InnerDetector/InDetRecEvent/InDetPrepRawData/src/PixelCluster.cxx
index 6728861e4c04f15251900cd799996e5d436052f5..03396d4edb1e4848cd757836b8397df6e4a88b8c 100755
--- a/InnerDetector/InDetRecEvent/InDetPrepRawData/src/PixelCluster.cxx
+++ b/InnerDetector/InDetRecEvent/InDetPrepRawData/src/PixelCluster.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -143,7 +143,7 @@ namespace InDet{
                 int splitInfoRaw
               ) :
       SiCluster(RDOId, locpos,
-                std::move(rdoList),
+                rdoList,
                 width, detEl, locErrMat.release()), //call base class constructor
       m_omegax (omegax),
       m_omegay (omegay),
diff --git a/InnerDetector/InDetRecEvent/InDetPrepRawData/src/SCT_Cluster.cxx b/InnerDetector/InDetRecEvent/InDetPrepRawData/src/SCT_Cluster.cxx
index 6afd614f6002226ddb773bc651233f1598446b8f..76e6425028c03305c31ebeb290eef8387fe62533 100755
--- a/InnerDetector/InDetRecEvent/InDetPrepRawData/src/SCT_Cluster.cxx
+++ b/InnerDetector/InDetRecEvent/InDetPrepRawData/src/SCT_Cluster.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -60,7 +60,7 @@ SCT_Cluster::SCT_Cluster(
 	}
 
         //move constructor:
-        SCT_Cluster::SCT_Cluster(SCT_Cluster&& RIO):
+        SCT_Cluster::SCT_Cluster(SCT_Cluster&& RIO) noexcept :
           SiCluster(std::move(RIO)),
           m_hitsInThirdTimeBin (RIO.m_hitsInThirdTimeBin)
         {
@@ -76,7 +76,7 @@ SCT_Cluster::SCT_Cluster(
 	}
 
         //move operator
-        SCT_Cluster& SCT_Cluster::operator=(SCT_Cluster&& RIO) {
+        SCT_Cluster& SCT_Cluster::operator=(SCT_Cluster&& RIO)  noexcept {
           if(&RIO != this) {
             SiCluster::operator=(std::move(RIO));
             m_hitsInThirdTimeBin = RIO.m_hitsInThirdTimeBin;
diff --git a/InnerDetector/InDetRecEvent/InDetPrepRawData/src/TRT_DriftCircle.cxx b/InnerDetector/InDetRecEvent/InDetPrepRawData/src/TRT_DriftCircle.cxx
index 1b942f6ddc39135ef8c9de5d412dd16d01cb0397..0223652c312e48a4da8e5458776ef14888ae5e64 100755
--- a/InnerDetector/InDetRecEvent/InDetPrepRawData/src/TRT_DriftCircle.cxx
+++ b/InnerDetector/InDetRecEvent/InDetPrepRawData/src/TRT_DriftCircle.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -75,7 +75,7 @@ TRT_DriftCircle::~TRT_DriftCircle()
 TRT_DriftCircle::TRT_DriftCircle()
 	:
 	PrepRawData(),
-	m_detEl( 0 ),
+	m_detEl( nullptr ),
   m_word( 0)
 
 {