diff --git a/Apps/Common/SIMOverride.h b/Apps/Common/SIMOverride.h
deleted file mode 100644
index c445b62e..00000000
--- a/Apps/Common/SIMOverride.h
+++ /dev/null
@@ -1,147 +0,0 @@
-// $Id$
-//==============================================================================
-//!
-//! \file SIMOverride.h
-//!
-//! \date Oct 25 2013
-//!
-//! \author Arne Morten Kvarving / SINTEF
-//!
-//! \brief Template overriding methods for wrapping template purposes.
-//!
-//==============================================================================
-
-#ifndef SIM_OVERRIDE_H_
-#define SIM_OVERRIDE_H_
-
-#include "SIMdependency.h"
-#include "Property.h"
-#include "Function.h"
-
-class ProcessAdm;
-class VTF;
-
-
-/*!
-  \brief Overrides methods commonly used in applications.
-
-  \details This template overrides a subset of SIMbase and SIMdependency,
-  and parts of the SIMSolver concept.
-  Used when augmenting classes through a wrapping template.
-*/
-
-template<class T> class SIMOverride : public SIMdependency
-{
-  T& base; //!< Reference to wrapped simulator
-
-public:
-  //! \brief The constructor initializes the reference to the wrapped simulator.
-  SIMOverride(T& t) : base(t) {}
-  //! \brief Empty destructor.
-  virtual ~SIMOverride() {}
-
-  //! \copydoc SIMadmin::read(const char*)
-  bool read(const char* fileName) { return base.read(fileName); }
-
-  //! \copydoc SIMinput::setInitialConditions()
-  bool setInitialConditions() { return base.setInitialConditions(); }
-  //! \copydoc SIMinput::hasIC(const std::string&) const
-  bool hasIC(const std::string& name) const { return base.hasIC(name); }
-
-  //! \copydoc SIMdependency::getNoSpaceDim() const
-  virtual size_t getNoSpaceDim() const { return base.getNoSpaceDim(); }
-  //! \copydoc SIMdependency::getName() const
-  virtual std::string getName() const { return base.getName(); }
-
-  //! \copydoc SIMbase::getFEModel() const
-  const PatchVec& getFEModel() const { return base.getFEModel(); }
-
-  //! \copydoc ISolver::saveModel(char*,int&,int&)
-  bool saveModel(char* fileName, int& geoBlk, int& nBlock)
-  {
-    return base.saveModel(fileName, geoBlk, nBlock);
-  }
-
-  //! \copydoc SIMoutput::getVTF() const
-  VTF* getVTF() const { return base.getVTF(); }
-
-  //! \copydoc SIMbase::getProcessAdm() const
-  const ProcessAdm& getProcessAdm() const { return base.getProcessAdm(); }
-
-  //! \copydoc SIMdependency::registerDependency(SIMdependency*,const std::string&,short int,const PatchVec&,char)
-  void registerDependency(SIMdependency* sim, const std::string& name,
-                          short int nvc, const PatchVec& patches,
-                          char diffBasis = 0, int component = 1) override
-  {
-    base.registerDependency(sim, name, nvc, patches, diffBasis, component);
-  }
-
-  //! \copydoc SIMdependency::registerDependency(SIMdependency*,const std::string&,short int)
-  virtual void registerDependency(SIMdependency* sim, const std::string& name,
-                                  short int nvc = 1)
-  {
-    base.registerDependency(sim, name, nvc);
-  }
-
-  //! \copydoc SIMdependency::fillField(const std::string&,const std::vector<double>&)
-  bool fillField(const std::string& name, const std::vector<double>& values)
-  {
-    return base.fillField(name, values);
-  }
-
-  //! \copydoc SIMdependency::getField(const std::string&)
-  virtual utl::vector<double>* getField(const std::string& name)
-  {
-    return base.getField(name);
-  }
-
-  //! \copydoc SIMdependency::getField(const std::string&) const
-  virtual const utl::vector<double>* getField(const std::string& name) const
-  {
-    return const_cast<const T&>(base).getField(name);
-  }
-
-  //! \copydoc SIMdependency::getDependentField(const std::string&) const
-  const utl::vector<double>* getDependentField(const std::string& name) const
-  {
-    return base.getDependentField(name);
-  }
-
-  //! \copydoc ISolver::setupDependencies()
-  void setupDependencies()
-  {
-    base.setupDependencies();
-  }
-
-  //! \copydoc ISolver::init(const TimeStep&)
-  bool init(const TimeStep& tp)
-  {
-    return base.init(tp);
-  }
-
-  //! \copydoc ISolver::registerFields(DataExporter&)
-  void registerFields(DataExporter& exporter)
-  {
-    base.registerFields(exporter);
-  }
-
-  //! \copydoc ISolver::saveStep(const TimeStep&,int&)
-  bool saveStep(const TimeStep& tp, int& nBlock)
-  {
-    return base.saveStep(tp, nBlock);
-  }
-
-  //! \copydoc ISolver::advanceStep(TimeStep&)
-  bool advanceStep(TimeStep& tp)
-  {
-    return base.advanceStep(tp);
-  }
-
-  T& get() { return base; }
-  const T& get() const { return base; }
-
-  int getGlobalNode(int node) const { return base.getGlobalNode(node); }
-  int getLocalNode(int node) const { return base.getLocalNode(node); }
-};
-
-#endif
diff --git a/Apps/Common/Test/TestSIMOverride.C b/Apps/Common/Test/TestSIMOverride.C
deleted file mode 100644
index ba90a38d..00000000
--- a/Apps/Common/Test/TestSIMOverride.C
+++ /dev/null
@@ -1,178 +0,0 @@
-//==============================================================================
-//!
-//! \file TestSIMOverride.C
-//!
-//! \date Oct 13 2014
-//!
-//! \author Arne Morten Kvarving / SINTEF
-//!
-//! \brief Tests for template overriding methods for wrapping template purposes.
-//!
-//==============================================================================
-
-#include "DataExporter.h"
-#include "ProcessAdm.h"
-#include "TimeStep.h"
-#include "SIMOverride.h"
-
-#include "gtest/gtest.h"
-
-class SIMMockOverride {
-public:
-  SIMMockOverride() :
-    read_called(false),
-    setinitialconditions_called(false),
-    hasic_called(false),
-    getnospacedim_called(false),
-    getname_called(false),
-    getfemodel_called(false),
-    savemodel_called(false),
-    getvtf_called(false),
-    getprocessadm_called(false),
-    registerdependency_called(false),
-    registerdependency2_called(false),
-    fillfield_called(false),
-    getfield_called(false),
-    getfield2_called(false),
-    getdependentfield_called(false),
-    setupdependencies_called(false),
-    init_called(false),
-    registerfields_called(false),
-    savestep_called(false),
-    advancestep_called(false),
-    getglobalnode_called(false),
-    getlocalnode_called(false)
-  {}
-
-  bool read(const char*) { return read_called = true; }
-  bool setInitialConditions() { return setinitialconditions_called = true; }
-  bool hasIC(const std::string&) const { return hasic_called = true; }
-  size_t getNoSpaceDim() const { getnospacedim_called = true; return 2; }
-  std::string getName() const { getname_called = true; return "SIMMock"; }
-  const std::vector<ASMbase*>& getFEModel() const
-  {
-    static std::vector<ASMbase*> result;
-    getfemodel_called = true;
-    return result;
-  }
-  bool saveModel(char*, int&, int&) { return savemodel_called = true; }
-  VTF* getVTF() const { getvtf_called = true; return NULL; }
-  const ProcessAdm& getProcessAdm() const
-  {
-    static ProcessAdm result;
-    getprocessadm_called = true;
-    return result;
-  }
-  void registerDependency(SIMdependency*, const std::string&, short int,
-                          const std::vector<ASMbase*>&, char, int)
-  {
-    registerdependency_called = true;
-  }
-  void registerDependency(SIMdependency*, const std::string&, short int)
-  {
-    registerdependency2_called = true;
-  }
-  bool fillField(const std::string&, const std::vector<double>&)
-  {
-    return fillfield_called = true;
-  }
-  utl::vector<double>* getField(const std::string&)
-  {
-    getfield_called = true;
-    return NULL;
-  }
-  const utl::vector<double>* getField(const std::string&) const
-  {
-    getfield2_called = true;
-    return NULL;
-  }
-  const utl::vector<double>* getDependentField(const std::string&) const
-  {
-    getdependentfield_called = true;
-    return NULL;
-  }
-  void setupDependencies() { setupdependencies_called = true; }
-  bool init(const TimeStep&) { return init_called = true; }
-  void registerFields(DataExporter&) { registerfields_called = true; }
-  bool saveStep(const TimeStep&, int&) { return savestep_called = true; }
-  bool advanceStep(TimeStep&) { return advancestep_called = true; }
-  int getGlobalNode(int) const { getglobalnode_called = true; return 0; }
-  int getLocalNode(int) const { getlocalnode_called = true; return 0; }
-
-  bool read_called;
-  bool setinitialconditions_called;
-  mutable bool hasic_called;
-  mutable bool getnospacedim_called;
-  mutable bool getname_called;
-  mutable bool getfemodel_called;
-  bool savemodel_called;
-  mutable bool getvtf_called;
-  mutable bool getprocessadm_called;
-  bool registerdependency_called;
-  bool registerdependency2_called;
-  bool fillfield_called;
-  bool getfield_called;
-  mutable bool getfield2_called;
-  mutable bool getdependentfield_called;
-  bool setupdependencies_called;
-  bool init_called;
-  bool registerfields_called;
-  bool savestep_called;
-  bool advancestep_called;
-  mutable bool getglobalnode_called;
-  mutable bool getlocalnode_called;
-};
-
-TEST(TestSIMOverride, Override)
-{
-  SIMMockOverride ovr;
-  SIMOverride<SIMMockOverride> sim(ovr);
-  sim.read("");
-  sim.setInitialConditions();
-  sim.hasIC("");
-  sim.getNoSpaceDim();
-  sim.getName();
-  sim.getFEModel();
-  int geoBlk, nBlock;
-  sim.saveModel((char*)"", geoBlk, nBlock);
-  sim.getVTF();
-  sim.getProcessAdm();
-  sim.registerDependency(NULL, "", 1, std::vector<ASMbase*>());
-  sim.registerDependency(NULL, "", 1);
-  sim.fillField("", std::vector<double>());
-  sim.getField("");
-  const_cast<const SIMOverride<SIMMockOverride>&>(sim).getField("");
-  sim.getDependentField("");
-  sim.setupDependencies();
-  TimeStep tp;
-  sim.init(tp);
-  DataExporter exp;
-  sim.registerFields(exp);
-  sim.saveStep(tp, nBlock);
-  sim.advanceStep(tp);
-  sim.getGlobalNode(1);
-  sim.getLocalNode(1);
-
-  ASSERT_TRUE(ovr.read_called);
-  ASSERT_TRUE(ovr.setinitialconditions_called);
-  ASSERT_TRUE(ovr.hasic_called);
-  ASSERT_TRUE(ovr.getnospacedim_called);
-  ASSERT_TRUE(ovr.getname_called);
-  ASSERT_TRUE(ovr.getfemodel_called);
-  ASSERT_TRUE(ovr.savemodel_called);
-  ASSERT_TRUE(ovr.getvtf_called);
-  ASSERT_TRUE(ovr.getprocessadm_called);
-  ASSERT_TRUE(ovr.registerdependency_called);
-  ASSERT_TRUE(ovr.registerdependency2_called);
-  ASSERT_TRUE(ovr.fillfield_called);
-  ASSERT_TRUE(ovr.getfield_called);
-  ASSERT_TRUE(ovr.getfield2_called);
-  ASSERT_TRUE(ovr.getdependentfield_called);
-  ASSERT_TRUE(ovr.setupdependencies_called);
-  ASSERT_TRUE(ovr.init_called);
-  ASSERT_TRUE(ovr.registerfields_called);
-  ASSERT_TRUE(ovr.savestep_called);
-  ASSERT_TRUE(ovr.advancestep_called);
-  ASSERT_TRUE(ovr.getglobalnode_called);
-  ASSERT_TRUE(ovr.getlocalnode_called);
-}