diff --git a/src/const.h b/src/const.h
index 9d0da3358556f0c87b19ede31053f2d39bd94425..5ce5ee3cbbdd353aadb00f7ae94c8803093eec2a 100644
--- a/src/const.h
+++ b/src/const.h
@@ -68,9 +68,8 @@
 
 /* SPH variant to use */
 //#define MINIMAL_SPH
-//#define GADGET2_SPH
+#define GADGET2_SPH
 //#define DEFAULT_SPH
-#define NO_SPH
 
 /* Gravity properties */
 /* valid choices EXTERNAL_POTENTIAL_POINTMASS */
diff --git a/src/debug.c b/src/debug.c
index 84d345ed0777567d4bb5eb87d556b686192af816..4c1434118c98aab7def28d3a53493767d249d774 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -34,8 +34,6 @@
 #include "./hydro/Gadget2/hydro_debug.h"
 #elif defined(DEFAULT_SPH)
 #include "./hydro/Default/hydro_debug.h"
-#elif defined(NO_SPH)
-#include "./hydro/Gadget2/hydro_debug.h"
 #else
 #error "Invalid choice of SPH variant"
 #endif
diff --git a/src/hydro.h b/src/hydro.h
index 4851523f23acb04acb4c0260be77fb148353ecbd..aacbb6ac1d16b38133ee573ee2b7ad95918fc9e5 100644
--- a/src/hydro.h
+++ b/src/hydro.h
@@ -34,10 +34,6 @@
 #include "./hydro/Default/hydro_iact.h"
 #include "./hydro/Default/hydro.h"
 #define SPH_IMPLEMENTATION "Default version of SPH"
-#elif defined(NO_SPH)
-#include "./hydro/Gadget2/hydro_iact.h"
-#include "./hydro/Gadget2/hydro.h"
-#define SPH_IMPLEMENTATION "No SPH i.e. use Gadget2 framework for now..."
 #else
 #error "Invalid choice of SPH variant"
 #endif
diff --git a/src/hydro_io.h b/src/hydro_io.h
index 3ca7b0b06ccaff18e0103e8b96935b35e0ca6fac..30d663f647c9b763e9b19177e9ba8ef374855768 100644
--- a/src/hydro_io.h
+++ b/src/hydro_io.h
@@ -28,8 +28,6 @@
 #include "./hydro/Gadget2/hydro_io.h"
 #elif defined(DEFAULT_SPH)
 #include "./hydro/Default/hydro_io.h"
-#elif defined(NO_SPH)
-#include "./hydro/Gadget2/hydro_io.h"
 #else
 #error "Invalid choice of SPH variant"
 #endif
diff --git a/src/part.h b/src/part.h
index e76a367448a032dc6fafd982f7c6e62decf15de1..5d4c9c88a1acadea3d23a3df618c04da389fb61d 100644
--- a/src/part.h
+++ b/src/part.h
@@ -45,8 +45,6 @@
 #include "./hydro/Gadget2/hydro_part.h"
 #elif defined(DEFAULT_SPH)
 #include "./hydro/Default/hydro_part.h"
-#elif defined(NO_SPH)
-#include "./hydro/Gadget2/hydro_part.h"
 #else
 #error "Invalid choice of SPH variant"
 #endif