diff --git a/OndselSolver/ASMTAssembly.cpp b/OndselSolver/ASMTAssembly.cpp
index 0897438..830ed42 100644
--- a/OndselSolver/ASMTAssembly.cpp
+++ b/OndselSolver/ASMTAssembly.cpp
@@ -11,6 +11,7 @@
 #include <fstream>	
 #include <algorithm>
 #include <numeric>
+#include <iomanip>
 
 #include "ASMTAssembly.h"
 #include "CREATE.h"
@@ -40,7 +41,6 @@
 #include "SystemSolver.h"
 #include "ASMTItemIJ.h"
 #include "ASMTKinematicIJ.h"
-#include <iomanip>
 #include "ASMTAngleJoint.h"
 #include "ASMTConstantVelocityJoint.h"
 #include "ASMTCylSphJoint.h"
diff --git a/OndselSolver/ASMTAssembly.h b/OndselSolver/ASMTAssembly.h
index 28fff85..ed10d22 100644
--- a/OndselSolver/ASMTAssembly.h
+++ b/OndselSolver/ASMTAssembly.h
@@ -10,31 +10,22 @@
 #include <fstream>	
 
 #include "ASMTSpatialContainer.h"
-#include "FullColumn.h"
-#include "FullMatrix.h"
-#include "MBDynSystem.h"
-#include "ASMTTime.h"
-#include "ASMTConstantGravity.h"
-#include "ASMTSimulationParameters.h"
-#include "ASMTAnimationParameters.h"
 
 namespace MbD {
-	class ASMTRefPoint;
-	class ASMTRefCurve;
-	class ASMTRefSurface;
 	class ASMTPart;
 	class ASMTKinematicIJ;
 	class ASMTConstraintSet;
 	class ASMTForceTorque;
 	class ASMTConstantGravity;
-	// class ASMTSimulationParameters;
-	// class ASMTAnimationParameters;
+	class ASMTSimulationParameters;
+	class ASMTAnimationParameters;
 	class ASMTJoint;
 	class ASMTMotion;
 	class Units;
 	class ASMTTime;
 	class SystemSolver;
 	class ASMTItemIJ;
+	class MBDynSystem;
 
 	class ASMTAssembly : public ASMTSpatialContainer
 	{
diff --git a/OndselSolver/ASMTItem.cpp b/OndselSolver/ASMTItem.cpp
index d41d546..9e40991 100644
--- a/OndselSolver/ASMTItem.cpp
+++ b/OndselSolver/ASMTItem.cpp
@@ -184,6 +184,7 @@ std::shared_ptr<Constant> MbD::ASMTItem::sptrConstant(double value)
 
 void MbD::ASMTItem::storeOnLevel(std::ofstream& os, int level)
 {
+	noop();
 	assert(false);
 }
 
diff --git a/OndselSolver/EulerParameters.ref.h b/OndselSolver/EulerParameters.ref.h
deleted file mode 100644
index ca14f54..0000000
--- a/OndselSolver/EulerParameters.ref.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-namespace MbD {
-    template<typename T>
-    class EulerParameters;
-}
diff --git a/OndselSolver/OndselSolver.vcxproj b/OndselSolver/OndselSolver.vcxproj
index 89ac539..24cfefc 100644
--- a/OndselSolver/OndselSolver.vcxproj
+++ b/OndselSolver/OndselSolver.vcxproj
@@ -539,7 +539,6 @@
     <ClInclude Include="EulerAngles.h" />
     <ClInclude Include="EulerAnglesDDot.h" />
     <ClInclude Include="EulerAnglesDot.h" />
-    <ClInclude Include="EulerParameters.ref.h" />
     <ClInclude Include="Exponential.h" />
     <ClInclude Include="ExternalSystem.h" />
     <ClInclude Include="FunctionFromData.h" />
diff --git a/OndselSolver/OndselSolver.vcxproj.filters b/OndselSolver/OndselSolver.vcxproj.filters
index 271f825..014e704 100644
--- a/OndselSolver/OndselSolver.vcxproj.filters
+++ b/OndselSolver/OndselSolver.vcxproj.filters
@@ -1814,9 +1814,6 @@
     <ClInclude Include="..\testapp\OndselSolver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="EulerParameters.ref.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="MBDynGravity.h">
       <Filter>Header Files</Filter>
     </ClInclude>