diff --git a/mbcico/ulock.c b/mbcico/ulock.c
index caed6c36..714a3aa4 100644
--- a/mbcico/ulock.c
+++ b/mbcico/ulock.c
@@ -43,9 +43,9 @@
 #define LCKPREFIX LOCKDIR"/LCK.."
 #define LCKTMP LOCKDIR"/TMP."
 
-#ifdef DONT_HAVE_PID_T
-#define pid_t int
-#endif
+//#ifdef DONT_HAVE_PID_T
+//#define pid_t int
+//#endif
 
 
 
diff --git a/mbfido/lhash.c b/mbfido/lhash.c
index 4019c0c7..45f0cc6e 100644
--- a/mbfido/lhash.c
+++ b/mbfido/lhash.c
@@ -1,11 +1,10 @@
 /*****************************************************************************
  *
- * File ..................: mbmail/lhash.c
+ * $Id$
  * Purpose ...............: MBSE BBS Mail Gate
- * Last modification date : 28-Aug-2000
  *
  *****************************************************************************
- * Copyright (C) 1997-2000
+ * Copyright (C) 1997-2003
  *   
  * Michiel Broek		FIDO:		2:280/2802
  * Beekmansbos 10
@@ -223,9 +222,7 @@ char *lh_insert(LHASH *lh, char *data)
 			return(NULL);
 		nn->data=data;
 		nn->next=NULL;
-//#ifndef NO_HASH_COMP
 		nn->hash=hash;
-//#endif
 		*rn=nn;
 		ret=NULL;
 		lh->num_insert++;
@@ -298,8 +295,6 @@ char *lh_retrieve(LHASH *lh, char *data)
 
 
 void lh_doall(LHASH *lh, void (*func)(char *, char *))
-//LHASH *lh;
-//void (*func)();
 {
 	lh_doall_arg(lh,func,NULL);
 }
@@ -307,9 +302,6 @@ void lh_doall(LHASH *lh, void (*func)(char *, char *))
 
 
 void lh_doall_arg(LHASH *lh, void(*func)(char *, char *), char *arg)
-// LHASH *lh;
-//void (*func)();
-//char *arg;
 {
 	int i;
 	LHASH_NODE *a,*n;
@@ -348,12 +340,7 @@ static void expand(LHASH *lh)
 	
 	for (np= *n1; np != NULL; )
 		{
-//#ifndef NO_HASH_COMP
 		hash=np->hash;
-//#else
-//		hash=(*(lh->hash))(np->data);
-//		lh->num_hash_calls++;
-//#endif
 		if ((hash%nni) != p)
 			{ /* move it */
 			*n1= (*n1)->next;
@@ -447,14 +434,12 @@ static LHASH_NODE **getrn(LHASH *lh, char *data, unsigned long *rhash)
 	ret= &(lh->b[(int)nn]);
 	for (n1= *ret; n1 != NULL; n1=n1->next)
 		{
-//#ifndef NO_HASH_COMP
 		lh->num_hash_comps++;
 		if (n1->hash != hash)
 			{
 			ret= &(n1->next);
 			continue;
 			}
-//#endif
 		lh->num_comp_calls++;
 		if ((*cf)(n1->data,data) == 0)
 			break;
diff --git a/mbtask/mbtask.c b/mbtask/mbtask.c
index 230956d1..0b189b16 100644
--- a/mbtask/mbtask.c
+++ b/mbtask/mbtask.c
@@ -120,9 +120,7 @@ int			sched_run = FALSE;	/* Scheduler running	*/
 /*
  * Global thread vaiables
  */
-int		thr_id[NUM_THREADS];		/* thread ID's		*/
 pthread_t	p_thread[NUM_THREADS];		/* thread's structure	*/
-// pthread_mutex_t p_mutex = PTHREAD_MUTEX_INITIALIZER;	/* Ping mutex	*/
 
 
 
diff --git a/unix/mblogin.h b/unix/mblogin.h
index 95ed536a..c8a24378 100644
--- a/unix/mblogin.h
+++ b/unix/mblogin.h
@@ -228,9 +228,6 @@ extern char *strerror();
 # endif
 #endif
 
-// #ifndef HAVE_SNPRINTF
-// #include "snprintf.h"
-// #endif
 
 /*
  * string to use for the pw_passwd field in /etc/passwd when using