diff --git a/Control/Navigation/Navigation/AthenaBarCodeImpl.h b/Control/Navigation/Navigation/AthenaBarCodeImpl.h
index 4f7919f88feafb2a5fb2481cefba163c28dd5094..8add2c0910e63376926d64350ecd3dee7c3b0603 100644
--- a/Control/Navigation/Navigation/AthenaBarCodeImpl.h
+++ b/Control/Navigation/Navigation/AthenaBarCodeImpl.h
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ATHENABARCODEIMPL_H
@@ -53,8 +53,7 @@ public:
 public:
   //Constructors
   
-  virtual ~AthenaBarCodeImpl() {
-  }
+  virtual ~AthenaBarCodeImpl() = default;
   
   AthenaBarCodeImpl();
   
diff --git a/Control/Navigation/Navigation/INavigable.h b/Control/Navigation/Navigation/INavigable.h
index 20d3580e46ff0849e1bc107faea01ed23aab7b58..20291b5bcfd5308451046a31601c65575dbc5fb1 100644
--- a/Control/Navigation/Navigation/INavigable.h
+++ b/Control/Navigation/Navigation/INavigable.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef INAVIGABLE_H
@@ -19,8 +19,8 @@ class INavigationToken;
 class INavigable
 {
  public:
-  
-  virtual ~INavigable();
+
+  virtual ~INavigable() = default;
 
   // enforce fillToken(,) method in derived classes!
   virtual void fillToken( INavigationToken & thisToken ) const = 0;
diff --git a/Control/Navigation/Navigation/Navigable.h b/Control/Navigation/Navigation/Navigable.h
index 9c5152f5285df4a0f45df8a3401532db7808a152..20ccf36b70e62a4d77e66c8b934ce500caa4d949 100644
--- a/Control/Navigation/Navigation/Navigable.h
+++ b/Control/Navigation/Navigation/Navigable.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef NAVIGATION_NAVIGABLE_H
@@ -165,7 +165,7 @@ class Navigable : virtual public INavigable
 
   Navigable();
 
-  virtual ~Navigable();
+  virtual ~Navigable() = default;
 
   ////////////////////////////////////////////////////////////////////
   // NavigationToken handling (INavigable interface implementation) //
diff --git a/Control/Navigation/Navigation/Navigable.icc b/Control/Navigation/Navigation/Navigable.icc
index 1eae2fd963beaeabc9a46440da3bf3e09681d6e6..2ebbdda8120c3b03821ea3d255b2207555c2cf38 100644
--- a/Control/Navigation/Navigation/Navigable.icc
+++ b/Control/Navigation/Navigation/Navigable.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //////////////////////////////////////////////////////////////////////////////
@@ -14,13 +14,6 @@
 template <typename CONT, typename RPAR, typename COLL>
 Navigable<CONT,RPAR,COLL>::Navigable() { }
 
-// destructor
-template <typename CONT, typename RPAR, typename COLL>
-Navigable<CONT,RPAR,COLL>::~Navigable() 
-{
-  m_constituents.clear();
-}
-
 	    //////////////////////////////////////////////
 	    // Navigation query handling w/o parameters //
             //////////////////////////////////////////////
diff --git a/Control/Navigation/Navigation/NavigableTerminalNode.h b/Control/Navigation/Navigation/NavigableTerminalNode.h
index 18fcbf02421ac761f66d2202a23755d36c9908a2..8609fc4f676007a2e81232340f213d74f441f75c 100644
--- a/Control/Navigation/Navigation/NavigableTerminalNode.h
+++ b/Control/Navigation/Navigation/NavigableTerminalNode.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef NAVIGATION_NAVIGABLETERMINALNODE_H
@@ -25,7 +25,7 @@ class NavigableTerminalNode : virtual public INavigable
   // typedef NavigationDefaults::DefaultType constituent_const_iter;
 
   NavigableTerminalNode() { };
-  virtual ~NavigableTerminalNode() { };
+  virtual ~NavigableTerminalNode() = default;
 
   // implement INavigable::fillToken(...) as "do-nothing"
   virtual void fillToken( INavigationToken & ) const { };
diff --git a/Control/Navigation/Navigation/NavigableVector.h b/Control/Navigation/Navigation/NavigableVector.h
index 094c8d71231b663451e1edbea32ced5a49bbc95c..df8afe55fb6405a3a48b613c5ab09899056b50a6 100644
--- a/Control/Navigation/Navigation/NavigableVector.h
+++ b/Control/Navigation/Navigation/NavigableVector.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef NAVIGATION_NAVIGABLEVECTOR_H
@@ -36,10 +36,7 @@ public:
   NavigableVector() 
   { }
 
-  virtual ~NavigableVector() 
-  { 
-    m_store.clear();
-  };
+  virtual ~NavigableVector() = default;
 
   // add elements
   void addElement(const CONT* aContainer, const OBJCT* anObject)
diff --git a/Control/Navigation/Navigation/NavigableVectorIterator.h b/Control/Navigation/Navigation/NavigableVectorIterator.h
index 01fdb10a264d0dc6646d1eaf76457ed9d57cac3f..0047035e1509b78361f49a60529590a56d583a70 100644
--- a/Control/Navigation/Navigation/NavigableVectorIterator.h
+++ b/Control/Navigation/Navigation/NavigableVectorIterator.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef NAVIGATION_NAVIGABLEVECTORITERATOR_H
@@ -43,7 +43,7 @@ class NavigableVectorIterator
     { }
 
   // destructor
-  virtual ~NavigableVectorIterator(){};
+  virtual ~NavigableVectorIterator() = default;
 
   /////////////////////////
   // Iterator Operations //
diff --git a/Control/Navigation/Navigation/NavigationDefaults.h b/Control/Navigation/Navigation/NavigationDefaults.h
index 9bbf5280d7c8052a9b8c2c1c8d9855cf4ba7e856..227df7db8c771a4a689933dda38fcaf18e2c3831 100644
--- a/Control/Navigation/Navigation/NavigationDefaults.h
+++ b/Control/Navigation/Navigation/NavigationDefaults.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef NAVIGATION_NAVIGATIONDEFAULTS_H
@@ -52,7 +52,6 @@ namespace NavigationDefaults
   struct DefaultWeight {
     public:
     DefaultWeight() {}
-    DefaultWeight& operator=(const DefaultWeight&) {return *this;}
     const DefaultWeight& operator+(const DefaultWeight&) const {return *this;}
     const DefaultWeight& operator*(const DefaultWeight&) const {return *this;}
     bool operator==(DefaultWeight&) const {return true;}
diff --git a/Control/Navigation/Navigation/NavigationToken.h b/Control/Navigation/Navigation/NavigationToken.h
index 4891c1e6947b2be5cda217ebf6177e2c14d0cbb0..74c2f6c64f7a730b1ae88f4cebfd952162235f03 100644
--- a/Control/Navigation/Navigation/NavigationToken.h
+++ b/Control/Navigation/Navigation/NavigationToken.h
@@ -1,7 +1,7 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef NAVIGATIONTOKEN_H
@@ -78,7 +78,6 @@ class NavigationToken : public INavigationToken
    NavigationTokenIterator(const tokenStore& aStore) 
    : m_store(&aStore)
    , m_actual(aStore.begin()) { };
-   virtual ~NavigationTokenIterator() { };
 
    NavigationTokenIterator begin()
    {
diff --git a/Control/Navigation/src/INavigable.cxx b/Control/Navigation/src/INavigable.cxx
index 7885747c005685ed6348b910e3b22bb7ef55a82d..4a6294fb3ae06c8adb2e0257d0a28254e21820db 100644
--- a/Control/Navigation/src/INavigable.cxx
+++ b/Control/Navigation/src/INavigable.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // INavigable.cxx 
@@ -19,9 +19,3 @@
 // Constructors
 ////////////////
 
-// Destructor
-///////////////
-
-INavigable::~INavigable()
-{}
-