diff --git a/cpp/8puzzle.cpp b/cpp/8puzzle.cpp
index f47e934..dbb2189 100755
--- a/cpp/8puzzle.cpp
+++ b/cpp/8puzzle.cpp
@@ -7,11 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include <iostream>
-#include <sstream>
 #include <stdio.h>
 #include <assert.h>
-#include <new>
-
 #include <ctype.h>
 
 // Configuration
@@ -668,7 +665,9 @@ int main( int argc, char *argv[] )
 
 		unsigned int SearchState;
 
+#if DEBUG_LISTS
 		unsigned int SearchSteps = 0;
+#endif
 
 		do
 		{
@@ -711,7 +710,10 @@ int main( int argc, char *argv[] )
 				astarsearch.CancelSearch();
 			}
 #endif
+
+#if DEBUG_LISTS
 			SearchSteps++;
+#endif
 		}
 		while( SearchState == AStarSearch<PuzzleState>::SEARCH_STATE_SEARCHING );
 
diff --git a/cpp/makefile b/cpp/makefile
index 39f8b44..88e7c4a 100644
--- a/cpp/makefile
+++ b/cpp/makefile
@@ -23,9 +23,3 @@ tests : tests.cpp 8puzzle findpath minpathbucharest
 
 test: tests
 	./tests
-
-
-
-
-
-