diff --git a/modules/p_usrloc/dlist.c b/modules/p_usrloc/dlist.c
index 64989a02b10..9a6f8069ee2 100644
--- a/modules/p_usrloc/dlist.c
+++ b/modules/p_usrloc/dlist.c
@@ -1,6 +1,4 @@
 /*
- * $Id: dlist.c 5160 2008-11-03 17:51:22Z henningw $
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of Kamailio, a free SIP server.
@@ -19,11 +17,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ========
- * 2006-11-28 added get_number_of_users() (Jeffrey Magder - SOMA Networks)
- * 2007-09-12 added partitioning support for fetching all ul contacts
- *            (bogdan)
  */
 
 /*! \file
diff --git a/modules/p_usrloc/dlist.h b/modules/p_usrloc/dlist.h
index de22a04168e..2114ac6f2ae 100644
--- a/modules/p_usrloc/dlist.h
+++ b/modules/p_usrloc/dlist.h
@@ -1,6 +1,4 @@
 /*
- * $Id: dlist.h 5160 2008-11-03 17:51:22Z henningw $
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of Kamailio, a free SIP server.
@@ -19,11 +17,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ========
- * 2006-11-28 Added get_number_of_users() (Jeffrey Magder - SOMA Networks)
- * 2007-09-12 added partitioning support for fetching all ul contacts
- *            (bogdan)
  */
 
 /*! \file
diff --git a/modules/p_usrloc/hslot.c b/modules/p_usrloc/hslot.c
index 388b37f8926..592ec7e5196 100644
--- a/modules/p_usrloc/hslot.c
+++ b/modules/p_usrloc/hslot.c
@@ -1,6 +1,4 @@
 /*
- * $Id: hslot.c 5241 2008-11-21 12:52:25Z henningw $ 
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of Kamailio, a free SIP server.
diff --git a/modules/p_usrloc/hslot.h b/modules/p_usrloc/hslot.h
index 04b3007bd86..ec1ddb0093c 100644
--- a/modules/p_usrloc/hslot.h
+++ b/modules/p_usrloc/hslot.h
@@ -1,6 +1,4 @@
 /*
- * $Id: hslot.h 5241 2008-11-21 12:52:25Z henningw $ 
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of Kamailio, a free SIP server.
diff --git a/modules/p_usrloc/p_usrloc_mod.c b/modules/p_usrloc/p_usrloc_mod.c
index f050c761c64..77bfb241035 100644
--- a/modules/p_usrloc/p_usrloc_mod.c
+++ b/modules/p_usrloc/p_usrloc_mod.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Usrloc module interface
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -21,17 +19,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ---------
- * 2003-01-27 timer activity printing #ifdef-ed to EXTRA_DEBUG (jiri)
- * 2003-03-11 New module interface (janakj)
- * 2003-03-12 added replication and state columns (nils)
- * 2003-03-16 flags export parameter added (janakj)
- * 2003-04-05: default_uri #define used (jiri)
- * 2003-04-21 failed fifo init stops init process (jiri)
- * 2004-03-17 generic callbacks added (bogdan)
- * 2004-06-07 updated to the new DB api (andrei)
- * 2011-01-03 extended module definition for partitioned userlocking (marius)
  */
 
 /*! \file
diff --git a/modules/p_usrloc/p_usrloc_mod.h b/modules/p_usrloc/p_usrloc_mod.h
index 8ae6f59da1a..cce5bfdb241 100644
--- a/modules/p_usrloc/p_usrloc_mod.h
+++ b/modules/p_usrloc/p_usrloc_mod.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * User location module interface
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -21,8 +19,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ---------
  */
 
 /*! \file
diff --git a/modules/p_usrloc/ucontact.c b/modules/p_usrloc/ucontact.c
index a29fccc0c33..cdce6dd5aad 100644
--- a/modules/p_usrloc/ucontact.c
+++ b/modules/p_usrloc/ucontact.c
@@ -1,6 +1,4 @@
 /*
- * $Id: ucontact.c 5272 2008-11-27 12:32:26Z henningw $ 
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of Kamailio, a free SIP server.
@@ -19,11 +17,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ---------
- * 2003-03-12 added replication mark and three zombie states (nils)
- * 2004-03-17 generic callbacks added (bogdan)
- * 2004-06-07 updated to the new DB api (andrei)
  */
 
 /*! \file
diff --git a/modules/p_usrloc/ucontact.h b/modules/p_usrloc/ucontact.h
index 587395f33f0..07216f41d2d 100644
--- a/modules/p_usrloc/ucontact.h
+++ b/modules/p_usrloc/ucontact.h
@@ -1,6 +1,4 @@
 /*
- * $Id: ucontact.h 5272 2008-11-27 12:32:26Z henningw $ 
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of Kamailio, a free SIP server.
@@ -19,11 +17,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ---------
- * 2003-03-12 added replication mark and three zombie states (nils)
- * 2005-07-11 added FL_NAT_SIPPING for nat pinging with SIP method
- *             instead of UDP package (bogdan)
  */
 
 /*! \file
diff --git a/modules/p_usrloc/udomain.c b/modules/p_usrloc/udomain.c
index c53795534ae..8cb93e9069b 100644
--- a/modules/p_usrloc/udomain.c
+++ b/modules/p_usrloc/udomain.c
@@ -1,6 +1,4 @@
 /*
- * $Id: udomain.c 5272 2008-11-27 12:32:26Z henningw $ 
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of Kamailio, a free SIP server.
@@ -19,13 +17,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ---------
- * 2003-03-11 changed to the new locking scheme: locking.h (andrei)
- * 2003-03-12 added replication mark and zombie state (nils)
- * 2004-06-07 updated to the new DB api (andrei)
- * 2004-08-23  hash function changed to process characters as unsigned
- *             -> no negative results occur (jku)
  */
 
 /*! \file
diff --git a/modules/p_usrloc/udomain.h b/modules/p_usrloc/udomain.h
index e1f799801ad..b377b01ac90 100644
--- a/modules/p_usrloc/udomain.h
+++ b/modules/p_usrloc/udomain.h
@@ -1,6 +1,4 @@
 /*
- * $Id: udomain.h 5272 2008-11-27 12:32:26Z henningw $ 
-
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of Kamailio, a free SIP server.
@@ -19,12 +17,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/*
- * History:
- * --------
- *  2003-03-11  changed to new locking scheme: locking.h (andrei)
- */
-
 
 /*! \file
  *  \brief USRLOC - Usrloc domain structure
diff --git a/modules/p_usrloc/ul_callback.c b/modules/p_usrloc/ul_callback.c
index 50673b8b212..7d3ccf3d630 100644
--- a/modules/p_usrloc/ul_callback.c
+++ b/modules/p_usrloc/ul_callback.c
@@ -1,6 +1,4 @@
 /*
- * $Id: ul_callback.c 4518 2008-07-28 15:39:28Z henningw $
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of Kamailio, a free SIP server.
@@ -19,9 +17,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * --------
- *  2004-03-16  created (bogdan)
  */
 
 /*! \file
diff --git a/modules/p_usrloc/ul_mi.c b/modules/p_usrloc/ul_mi.c
index a96a04be64e..65a0c729e5a 100644
--- a/modules/p_usrloc/ul_mi.c
+++ b/modules/p_usrloc/ul_mi.c
@@ -1,6 +1,4 @@
 /*
- * $Id: ul_mi.c 5194 2008-11-13 10:38:11Z henningw $
- *
  * Copyright (C) 2006 Voice Sistem SRL
  *
  * This file is part of Kamailio, a free SIP server.
@@ -19,10 +17,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ---------
- *
- * 2006-12-01  created (bogdan)
  */
 
 /*! \file
diff --git a/modules/p_usrloc/ul_mi.h b/modules/p_usrloc/ul_mi.h
index 98fd2b0c8b5..ca4ce014b07 100644
--- a/modules/p_usrloc/ul_mi.h
+++ b/modules/p_usrloc/ul_mi.h
@@ -1,6 +1,4 @@
 /*
- * $Id: ul_mi.h 5194 2008-11-13 10:38:11Z henningw $
- *
  * Copyright (C) 2006 Voice Sistem SRL
  *
  * This file is part of Kamailio, a free SIP server.
diff --git a/modules/p_usrloc/urecord.c b/modules/p_usrloc/urecord.c
index b2879d6e1b2..16414f0314a 100644
--- a/modules/p_usrloc/urecord.c
+++ b/modules/p_usrloc/urecord.c
@@ -1,6 +1,4 @@
 /*
- * $Id: urecord.c 5241 2008-11-21 12:52:25Z henningw $ 
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of Kamailio, a free SIP server.
@@ -19,11 +17,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ---------
- * 2003-03-12 added replication mark and zombie state support (nils)
- * 2004-03-17 generic callbacks added (bogdan)
- * 2004-06-07 updated to the new DB api (andrei)
  */
 
 /*! \file
diff --git a/modules/p_usrloc/urecord.h b/modules/p_usrloc/urecord.h
index 516fad0562c..3d851f9f029 100644
--- a/modules/p_usrloc/urecord.h
+++ b/modules/p_usrloc/urecord.h
@@ -1,6 +1,4 @@
 /*
- * $Id: urecord.h 5241 2008-11-21 12:52:25Z henningw $ 
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of Kamailio, a free SIP server.
diff --git a/modules/p_usrloc/usrloc.c b/modules/p_usrloc/usrloc.c
index 6017e73ca03..c4305cdfc1b 100644
--- a/modules/p_usrloc/usrloc.c
+++ b/modules/p_usrloc/usrloc.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of Kamailio, a free SIP server.
@@ -19,11 +17,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * ========
- *
- * 2006-11-28 Added a new function to the usrloc_api, to retrieve the number
- *            of registered users.  (Jeffrey Magder - SOMA Networks)
  */
 
 /*! \file
diff --git a/modules/p_usrloc/utime.c b/modules/p_usrloc/utime.c
index ddcc611fbc8..d3069c93d81 100644
--- a/modules/p_usrloc/utime.c
+++ b/modules/p_usrloc/utime.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Usrloc time related functions
  *
  * Copyright (C) 2001-2003 FhG Fokus
diff --git a/modules/p_usrloc/utime.h b/modules/p_usrloc/utime.h
index 7e061f43b00..128fca2efbe 100644
--- a/modules/p_usrloc/utime.h
+++ b/modules/p_usrloc/utime.h
@@ -1,6 +1,4 @@
 /*
- * $Id: utime.h 4518 2008-07-28 15:39:28Z henningw $
- *
  * Usrloc time related functions
  *
  * Copyright (C) 2001-2003 FhG Fokus