diff --git a/gtsam/inference/FactorGraph-inl.h b/gtsam/inference/FactorGraph-inl.h
index 3d791e9f0..72c07f82a 100644
--- a/gtsam/inference/FactorGraph-inl.h
+++ b/gtsam/inference/FactorGraph-inl.h
@@ -40,10 +40,6 @@
 #include <stdexcept>
 #include <functional>
 
-//#define INSTANTIATE_FACTOR_GRAPH(F) \
-//  template class FactorGraph<F>; \
-//  template FactorGraph<F> combine(const FactorGraph<F>&, const FactorGraph<F>&)
-
 using namespace std;
 
 namespace gtsam {
diff --git a/gtsam/inference/tests/testFactorGraph.cpp b/gtsam/inference/tests/testFactorGraph.cpp
index 75df65265..832d03cea 100644
--- a/gtsam/inference/tests/testFactorGraph.cpp
+++ b/gtsam/inference/tests/testFactorGraph.cpp
@@ -29,7 +29,6 @@ using namespace boost::assign;
 #define GTSAM_MAGIC_KEY
 
 #include <gtsam/inference/SymbolicFactorGraph.h>
-#include <gtsam/inference/FactorGraph-inl.h>
 
 using namespace std;
 using namespace gtsam;
diff --git a/gtsam/inference/tests/testSymbolicFactorGraph.cpp b/gtsam/inference/tests/testSymbolicFactorGraph.cpp
index 09bcd9e82..15538851e 100644
--- a/gtsam/inference/tests/testSymbolicFactorGraph.cpp
+++ b/gtsam/inference/tests/testSymbolicFactorGraph.cpp
@@ -23,7 +23,7 @@ using namespace boost::assign;
 #include <gtsam/inference/SymbolicFactorGraph.h>
 #include <gtsam/inference/BayesNet-inl.h>
 #include <gtsam/inference/IndexFactor.h>
-#include <gtsam/inference/FactorGraph-inl.h>
+#include <gtsam/inference/FactorGraph.h>
 #include <gtsam/inference/SymbolicSequentialSolver.h>
 
 using namespace std;
diff --git a/gtsam/linear/GaussianFactorGraph.cpp b/gtsam/linear/GaussianFactorGraph.cpp
index 98e74abd7..01d997e7c 100644
--- a/gtsam/linear/GaussianFactorGraph.cpp
+++ b/gtsam/linear/GaussianFactorGraph.cpp
@@ -26,7 +26,6 @@
 #include <gtsam/linear/HessianFactor.h>
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/inference/BayesTree-inl.h>
-#include <gtsam/inference/FactorGraph-inl.h>
 #include <gtsam/inference/VariableSlots.h>
 #include <gtsam/base/debug.h>
 #include <gtsam/base/timing.h>
@@ -36,8 +35,6 @@ using namespace std;
 using namespace gtsam;
 
 namespace gtsam {
-	// Explicitly instantiate so we don't have to include everywhere
-	INSTANTIATE_FACTOR_GRAPH(GaussianFactor);
 
 	/* ************************************************************************* */
 	GaussianFactorGraph::GaussianFactorGraph(const GaussianBayesNet& CBN) : Base(CBN) {}
diff --git a/gtsam/linear/JacobianFactor.cpp b/gtsam/linear/JacobianFactor.cpp
index 3347fa4f9..0d9367f49 100644
--- a/gtsam/linear/JacobianFactor.cpp
+++ b/gtsam/linear/JacobianFactor.cpp
@@ -20,7 +20,6 @@
 #include <gtsam/linear/HessianFactor.h>
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/inference/VariableSlots.h>
-#include <gtsam/inference/FactorGraph-inl.h>
 #include <gtsam/base/debug.h>
 #include <gtsam/base/timing.h>
 #include <gtsam/base/Matrix.h>
diff --git a/gtsam/linear/SubgraphPreconditioner.cpp b/gtsam/linear/SubgraphPreconditioner.cpp
index f3ca8445a..b41b0c1d7 100644
--- a/gtsam/linear/SubgraphPreconditioner.cpp
+++ b/gtsam/linear/SubgraphPreconditioner.cpp
@@ -19,7 +19,6 @@
 #include <gtsam/linear/SubgraphPreconditioner.h>
 #include <gtsam/linear/JacobianFactor.h>
 #include <gtsam/linear/GaussianFactorGraph.h>
-#include <gtsam/inference/FactorGraph-inl.h>
 
 using namespace std;
 
diff --git a/tests/testDoglegOptimizer.cpp b/tests/testDoglegOptimizer.cpp
index 85044009f..2792d08b8 100644
--- a/tests/testDoglegOptimizer.cpp
+++ b/tests/testDoglegOptimizer.cpp
@@ -17,7 +17,6 @@
 
 #include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/numericalDerivative.h>
-#include <gtsam/inference/FactorGraph-inl.h>
 #include <gtsam/inference/BayesTree-inl.h>
 #include <gtsam/linear/JacobianFactor.h>
 #include <gtsam/linear/GaussianSequentialSolver.h>
diff --git a/tests/testGraph.cpp b/tests/testGraph.cpp
index b4e04603f..e9698a753 100644
--- a/tests/testGraph.cpp
+++ b/tests/testGraph.cpp
@@ -28,7 +28,6 @@ using namespace boost::assign;
 
 #include <gtsam/slam/pose2SLAM.h>
 #include <gtsam/inference/graph-inl.h>
-#include <gtsam/inference/FactorGraph-inl.h>
 
 using namespace std;
 using namespace gtsam;
diff --git a/tests/testSymbolicFactorGraph.cpp b/tests/testSymbolicFactorGraph.cpp
index 742aac42c..01515f079 100644
--- a/tests/testSymbolicFactorGraph.cpp
+++ b/tests/testSymbolicFactorGraph.cpp
@@ -26,7 +26,6 @@ using namespace boost::assign;
 #include <gtsam/slam/smallExample.h>
 #include <gtsam/inference/SymbolicFactorGraph.h>
 #include <gtsam/inference/BayesNet-inl.h>
-#include <gtsam/inference/FactorGraph-inl.h>
 #include <gtsam/inference/SymbolicSequentialSolver.h>
 #include <gtsam/nonlinear/Ordering.h>