diff --git a/modules/registrar/api.c b/modules/registrar/api.c
index 564b2528c53..cf8f37adfbe 100644
--- a/modules/registrar/api.c
+++ b/modules/registrar/api.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Functions that process REGISTER message 
  * and store data in usrloc
  *
diff --git a/modules/registrar/api.h b/modules/registrar/api.h
index 11d8b15a339..0fabb3a1a3a 100644
--- a/modules/registrar/api.h
+++ b/modules/registrar/api.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Functions that process REGISTER message 
  * and store data in usrloc
  *
diff --git a/modules/registrar/common.c b/modules/registrar/common.c
index f81f69b4981..53d8cc12d98 100644
--- a/modules/registrar/common.c
+++ b/modules/registrar/common.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Common stuff
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -21,12 +19,7 @@
  * 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-02-14 un-escaping added (janakj)
- * 2006-09-19 AOR may be provided via an AVP instead of being fetched
- *            from URI (bogdan)
-*/
+ */
 
 /*!
  * \file
diff --git a/modules/registrar/common.h b/modules/registrar/common.h
index cf44eeef7cc..5f3f66db882 100644
--- a/modules/registrar/common.h
+++ b/modules/registrar/common.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Common stuff
  *
  * Copyright (C) 2001-2003 FhG Fokus
diff --git a/modules/registrar/config.c b/modules/registrar/config.c
index b0e580da31a..0f628dc30ce 100644
--- a/modules/registrar/config.c
+++ b/modules/registrar/config.c
@@ -1,13 +1,12 @@
 /*
- * $Id$
- * This file is part of SIP-router, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SIP-router is free software; you can redistribute it and/or modify
+ * Kamailio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version
  *
- * SIP-router is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
diff --git a/modules/registrar/config.h b/modules/registrar/config.h
index 249e895f65f..f82ba63dc6d 100644
--- a/modules/registrar/config.h
+++ b/modules/registrar/config.h
@@ -1,7 +1,5 @@
 /*
- * $Id$
- *
- * SIP-router is distributed in the hope that it will be useful,
+ * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
diff --git a/modules/registrar/lookup.c b/modules/registrar/lookup.c
index 0e481f3c326..6468e54047a 100644
--- a/modules/registrar/lookup.c
+++ b/modules/registrar/lookup.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Lookup contacts in usrloc
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -21,9 +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-03-12 added support for zombie state (nils)
  */
 /*!
  * \file
diff --git a/modules/registrar/lookup.h b/modules/registrar/lookup.h
index 1a88c946424..1e77bfeb7b1 100644
--- a/modules/registrar/lookup.h
+++ b/modules/registrar/lookup.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Lookup contacts in usrloc
  *
  * Copyright (C) 2001-2003 FhG Fokus
diff --git a/modules/registrar/path.c b/modules/registrar/path.c
index 0e242e3996c..8571eeada95 100644
--- a/modules/registrar/path.c
+++ b/modules/registrar/path.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Helper functions for Path support.
  *
  * Copyright (C) 2006 Andreas Granig <agranig@linguin.org>
diff --git a/modules/registrar/path.h b/modules/registrar/path.h
index 12c94d9dd62..1914bf40b90 100644
--- a/modules/registrar/path.h
+++ b/modules/registrar/path.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Helper functions for Path support.
  *
  * Copyright (C) 2006 Andreas Granig <agranig@linguin.org>
diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c
index 83c0d25cb30..437883cc6c9 100644
--- a/modules/registrar/reg_mod.c
+++ b/modules/registrar/reg_mod.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Registrar module interface
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -21,29 +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-03-11  updated to the new module exports interface (andrei)
- *  2003-03-16  flags export parameter added (janakj)
- *  2003-03-21  save_noreply added, provided by Maxim Sobolev
- *              <sobomax@portaone.com> (janakj)
- *  2005-07-11  added sip_natping_flag for nat pinging with SIP method
- *              instead of UDP package (bogdan)
- *  2006-09-19  AOR may be provided via an AVP instead of being fetched
- *              from URI (bogdan)
- *  2006-10-04  removed the "desc_time_order" parameter, as its functionality
- *              was moved to usrloc (Carsten Bock, BASIS AudioNet GmbH)
- *  2006-11-22  save_noreply and save_memory merged into save();
- *              removed the module parameter "use_domain" - now it is
- *              imported from usrloc module (bogdan)
- *  2006-11-28  Added statistics tracking for the number of accepted/rejected
- *              registrations, as well as for the max expiry time, max 
- *              contacts and default expiry time(Jeffrey Magder-SOMA Networks)
- *  2007-02-24  sip_natping_flag moved into branch flags, so migrated to 
- *              nathelper module (bogdan)
- *  2009-12-09  Commented out tcp_persistent_flag param, because sr_3.0 tm
- *              does not support it (Juha)
- *
  */
 
 /*!
diff --git a/modules/registrar/reg_mod.h b/modules/registrar/reg_mod.h
index 5dffa752ae3..892a60668d5 100644
--- a/modules/registrar/reg_mod.h
+++ b/modules/registrar/reg_mod.h
@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * registrar module interface
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -21,16 +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:
- * --------
- *
- * 2005-07-11  added sip_natping_flag for nat pinging with SIP method
- *             instead of UDP package (bogdan)
- * 2006-11-28  Added statistics tracking for the number of accepted/rejected
- *             registrations, as well as for the max expiry time, max contacts,
- *             and default expiry time. (Jeffrey Magder - SOMA Networks)
- * 2007-02-24  sip_natping_flag moved into branch flags, so migrated to 
- *             nathelper module (bogdan)
  */
 
 /*!
diff --git a/modules/registrar/regpv.c b/modules/registrar/regpv.c
index bfdf2d49803..719bec3ff0c 100644
--- a/modules/registrar/regpv.c
+++ b/modules/registrar/regpv.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Export vontact attrs as PV
  *
  * Copyright (C) 2008 Daniel-Constantin Mierla (asipto.com)
diff --git a/modules/registrar/regpv.h b/modules/registrar/regpv.h
index de986ae70a6..1926d640305 100644
--- a/modules/registrar/regpv.h
+++ b/modules/registrar/regpv.h
@@ -1,7 +1,5 @@
 /*
- * $Id$
- *
- * Export vontact attrs as PV
+ * Export contact attrs as PV
  *
  * Copyright (C) 2008 Daniel-Constantin Mierla (asipto.com)
  *
diff --git a/modules/registrar/regtime.c b/modules/registrar/regtime.c
index cc383665c29..2e9ed87dcf3 100644
--- a/modules/registrar/regtime.c
+++ b/modules/registrar/regtime.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Registrar time related functions
  *
  * Copyright (C) 2001-2003 FhG Fokus
diff --git a/modules/registrar/regtime.h b/modules/registrar/regtime.h
index cf2d6e08c01..0815da51d02 100644
--- a/modules/registrar/regtime.h
+++ b/modules/registrar/regtime.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Registrar time related functions
  *
  * Copyright (C) 2001-2003 FhG Fokus
diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c
index b5a67c09a45..ef5b6016c22 100644
--- a/modules/registrar/reply.c
+++ b/modules/registrar/reply.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Send a reply
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -21,12 +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-18: buffer overflow patch committed (Jan on behalf of Maxim)
- * 2003-01-21: Errors reported via Error-Info header field - janakj
- * 2003-09-11: updated to new build_lump_rpl() interface (bogdan)
- * 2003-11-11: build_lump_rpl() removed, add_lump_rpl() has flags (bogdan)
  */
 
 /*!
diff --git a/modules/registrar/reply.h b/modules/registrar/reply.h
index 1fda99110fa..f10840e5b9b 100644
--- a/modules/registrar/reply.h
+++ b/modules/registrar/reply.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Send a reply
  *
  * Copyright (C) 2001-2003 FhG Fokus
diff --git a/modules/registrar/rerrno.c b/modules/registrar/rerrno.c
index 227aaf0ffbc..8650fcea2c3 100644
--- a/modules/registrar/rerrno.c
+++ b/modules/registrar/rerrno.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Registrar errno
  *
  * Copyright (C) 2001-2003 FhG Fokus
diff --git a/modules/registrar/rerrno.h b/modules/registrar/rerrno.h
index c7624b01a45..694f682cb23 100644
--- a/modules/registrar/rerrno.h
+++ b/modules/registrar/rerrno.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Registrar errno
  *
  * Copyright (C) 2001-2003 FhG Fokus
diff --git a/modules/registrar/save.c b/modules/registrar/save.c
index a3a5b2968a1..1391647815f 100644
--- a/modules/registrar/save.c
+++ b/modules/registrar/save.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Process REGISTER request and send reply
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -22,21 +20,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 next baby-step to removing ZT - PRESERVE_ZT (jiri)
- * 2003-02-28 scrathcpad compatibility abandoned (jiri)
- * 2003-03-21 save_noreply added, patch provided by Maxim Sobolev 
- *            <sobomax@portaone.com> (janakj)
- * 2005-07-11 added sip_natping_flag for nat pinging with SIP method
- *            instead of UDP package (bogdan)
- * 2006-04-13 added tcp_persistent_flag for keeping the TCP connection as long
- *            as a TCP contact is registered (bogdan)
- * 2006-11-22 save_noreply and save_memory merged into save() (bogdan)
- * 2006-11-28 Added statistic support for the number of accepted/rejected 
- *            registrations. (Jeffrey Magder - SOMA Networks) 
- * 2007-02-24  sip_natping_flag moved into branch flags, so migrated to 
- *             nathelper module (bogdan)
  */
 /*!
  * \file
diff --git a/modules/registrar/save.h b/modules/registrar/save.h
index 6240c4d1b82..f8fc0944443 100644
--- a/modules/registrar/save.h
+++ b/modules/registrar/save.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Functions that process REGISTER message 
  * and store data in usrloc
  *
@@ -22,11 +20,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-21  save_noreply added, provided by Maxim Sobolev 
- *             <sobomax@portaone.com> (janakj)
- * 2006-11-22  save_noreply and save_memory merged into save() (bogdan)
  */
 /*!
  * \file
diff --git a/modules/registrar/sip_msg.c b/modules/registrar/sip_msg.c
index fc5bba1c985..5ca83ebcf5d 100644
--- a/modules/registrar/sip_msg.c
+++ b/modules/registrar/sip_msg.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * SIP message related functions
  *
  * Copyright (C) 2001-2003 FhG Fokus
diff --git a/modules/registrar/sip_msg.h b/modules/registrar/sip_msg.h
index ef247bf92d9..c405b9fa44e 100644
--- a/modules/registrar/sip_msg.h
+++ b/modules/registrar/sip_msg.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * SIP message related functions
  *
  * Copyright (C) 2001-2003 FhG Fokus