diff --git a/C/bignum.c b/C/bignum.c
index cddd9a930..3b5cf2c02 100644
--- a/C/bignum.c
+++ b/C/bignum.c
@@ -222,7 +222,7 @@ Yap_BigIntOfTerm(Term t)
 Term
 Yap_MkULLIntTerm(YAP_ULONG_LONG n)
 {
-#ifdef __GNUC__ && USE_GMP
+#if __GNUC__ && USE_GMP
     MP_INT *new = Yap_PreAllocBigNum();
     char tmp[256];
 
diff --git a/C/parser.c b/C/parser.c
index 5bb353c55..3a1d14592 100644
--- a/C/parser.c
+++ b/C/parser.c
@@ -512,14 +512,6 @@ ParseTerm(int prio, JMPBUFF *FailBuff)
 	  func = Yap_MkFunctor((Atom) t, 1);
 	  t = ParseTerm(oprprio, FailBuff);
 	  t = Yap_MkApplTerm(func, 1, &t);
-#ifdef DEBUG
-	  if (Yap_Option['p' - 'a' + 1]) {
-	    Yap_DebugPutc(Yap_c_error_stream,'[');
-	    Yap_plwrite (t, Yap_DebugPutc, 0);
-	    Yap_DebugPutc(Yap_c_error_stream,']');
-	    Yap_DebugPutc(Yap_c_error_stream,'\n');
-	  }
-#endif
 	  /* check for possible overflow against local stack */
 	  if (H > ASP-4096) {
 	    Yap_ErrorMessage = "Stack Overflow";
@@ -540,14 +532,6 @@ ParseTerm(int prio, JMPBUFF *FailBuff)
 
   case Number_tok:
     t = Yap_tokptr->TokInfo;
-#ifdef DEBUG
-	  if (Yap_Option['p' - 'a' + 1]) {
-	    Yap_DebugPutc(Yap_c_error_stream,'[');
-	    Yap_plwrite (t, Yap_DebugPutc, 0);
-	    Yap_DebugPutc(Yap_c_error_stream,']');
-	    Yap_DebugPutc(Yap_c_error_stream,'\n');
-	  }
-#endif
     NextToken;
     break;
 
@@ -562,14 +546,6 @@ ParseTerm(int prio, JMPBUFF *FailBuff)
 	t = MkAtomTerm(Yap_LookupAtom(p));
       else
 	t = Yap_StringToList(p);
-#ifdef DEBUG
-	  if (Yap_Option['p' - 'a' + 1]) {
-	    Yap_DebugPutc(Yap_c_error_stream,'[');
-	    Yap_plwrite (t, Yap_DebugPutc, 0);
-	    Yap_DebugPutc(Yap_c_error_stream,']');
-	    Yap_DebugPutc(Yap_c_error_stream,'\n');
-	  }
-#endif
       NextToken;
     }
   break;
diff --git a/pl/init.yap b/pl/init.yap
index 110dc6a88..35f5e7752 100644
--- a/pl/init.yap
+++ b/pl/init.yap
@@ -139,3 +139,4 @@ library_directory(D) :-
 
 :- get_value(system_library_directory,D), assert(library_directory(D)).
 
+