diff --git a/AUTHORS b/AUTHORS
index 9c30d5c44..00c691f95 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,3 @@
-<!-- $Id$ -->
 
 
 Alex Roitman shura@gramps-project.org
diff --git a/FAQ b/FAQ
index f6ad93cd6..f3e3f2be3 100644
--- a/FAQ
+++ b/FAQ
@@ -355,4 +355,3 @@ Since Gramps generates HTML pages, you can upload the pages to your personal web
 
 **** End of Gramps Frequently Asked Questions ****
 
-$Id$
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 7ab88a36e..9e5cd03da 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,4 +1,3 @@
-$Id$
 
 UNSTABLE Gramps 4.0.0 Beta2 release.
 
diff --git a/data/authors.xml b/data/authors.xml
index 60905fd9d..7f18e9a62 100644
--- a/data/authors.xml
+++ b/data/authors.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
 <authors xmlns:html="http://www.w3.org/1999/xhtml">
  <author title="author">
   Alex Roitman &lt;<html:a href="mailto:shura@gramps-project.org">shura@gramps-project.org</html:a>&gt;
diff --git a/data/css/GeoView.css b/data/css/GeoView.css
index e7d8fe16f..ed9bc13b0 100644
--- a/data/css/GeoView.css
+++ b/data/css/GeoView.css
@@ -27,7 +27,6 @@ Style Author: Serge Noiraud (2009)
 ----------------------------------------------------------------------------
 This file was created for GeoView usage.
 
-# $Id$
 
  GeoView Styles
 
diff --git a/data/css/Web_Basic-Ash.css b/data/css/Web_Basic-Ash.css
index 5ff14e44a..ab101b683 100644
--- a/data/css/Web_Basic-Ash.css
+++ b/data/css/Web_Basic-Ash.css
@@ -50,7 +50,6 @@ Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
 --------------------------------------------------------------------------------------------------
-# $Id$
 
  NarrativeWeb Styles
 ------------------------------------------------------------------------------------------------ 
diff --git a/data/css/Web_Basic-Cypress.css b/data/css/Web_Basic-Cypress.css
index 68c97feec..1749e3bee 100644
--- a/data/css/Web_Basic-Cypress.css
+++ b/data/css/Web_Basic-Cypress.css
@@ -50,7 +50,6 @@ Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
 --------------------------------------------------------------------------------------------------
-# $Id$
 
  NarrativeWeb Styles
 ------------------------------------------------------------------------------------------------ 
diff --git a/data/css/Web_Basic-Lilac.css b/data/css/Web_Basic-Lilac.css
index 543b380c9..c3d83b137 100644
--- a/data/css/Web_Basic-Lilac.css
+++ b/data/css/Web_Basic-Lilac.css
@@ -50,7 +50,6 @@ Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
 --------------------------------------------------------------------------------------------------
-# $Id$
 
  NarrativeWeb Styles
 ------------------------------------------------------------------------------------------------ 
diff --git a/data/css/Web_Basic-Peach.css b/data/css/Web_Basic-Peach.css
index ba484e689..5ffe93f76 100644
--- a/data/css/Web_Basic-Peach.css
+++ b/data/css/Web_Basic-Peach.css
@@ -50,7 +50,6 @@ Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
 --------------------------------------------------------------------------------------------------
-# $Id$
 
  NarrativeWeb Styles
 ------------------------------------------------------------------------------------------------ 
diff --git a/data/css/Web_Basic-Spruce.css b/data/css/Web_Basic-Spruce.css
index 8600b3181..0466cf5e9 100644
--- a/data/css/Web_Basic-Spruce.css
+++ b/data/css/Web_Basic-Spruce.css
@@ -50,7 +50,6 @@ Characteristic of this style is that it uses the full width of the browser
 window and that horizontal highlighting bars extend over the full width of
 the page.
 --------------------------------------------------------------------------------------------------
-# $Id$
 
  NarrativeWeb Styles
 ------------------------------------------------------------------------------------------------ 
diff --git a/data/css/Web_Citations-Outline.css b/data/css/Web_Citations-Outline.css
index 9820c7427..6b811624e 100644
--- a/data/css/Web_Citations-Outline.css
+++ b/data/css/Web_Citations-Outline.css
@@ -25,7 +25,6 @@ GRAMPS Cascading Style Sheet
 Style Name: Web_Citations-Outline.css
 ******************************************************
 
-# $Id$
 
     Source Citations Outline styles
 ------------------------------------------------------ */
diff --git a/data/css/Web_DropDown-Menus.css b/data/css/Web_DropDown-Menus.css
index 2500499bc..bca58370b 100644
--- a/data/css/Web_DropDown-Menus.css
+++ b/data/css/Web_DropDown-Menus.css
@@ -18,7 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id$
 #
 *************************************************
 GRAMPS Cascading Style Sheet
diff --git a/data/css/Web_Fade-Menus.css b/data/css/Web_Fade-Menus.css
index 30bb468ae..5a3f95241 100644
--- a/data/css/Web_Fade-Menus.css
+++ b/data/css/Web_Fade-Menus.css
@@ -18,7 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id$
 #
 *************************************************
 GRAMPS Cascading Style Sheet
diff --git a/data/css/Web_Horizontal-Menus.css b/data/css/Web_Horizontal-Menus.css
index f920799b4..cd8354806 100644
--- a/data/css/Web_Horizontal-Menus.css
+++ b/data/css/Web_Horizontal-Menus.css
@@ -25,7 +25,6 @@ GRAMPS Cascading Style Sheet
 Style Name: Web_Navigation-Horizontal.css
 ******************************************************
 
-# $Id$
 
     Body Element
 ------------------------------------------------------ */
diff --git a/data/css/Web_Mainz.css b/data/css/Web_Mainz.css
index f367dea48..0865bbfed 100644
--- a/data/css/Web_Mainz.css
+++ b/data/css/Web_Mainz.css
@@ -54,7 +54,6 @@ Middle                  images/Web_Mainz_Mid.png
 Middle Light            images/Web_Mainz_MidLight.png
 ----------------------------------------------------------------------------
 
-# $Id$
 
  NarrativeWeb Styles
 -------------------------------------------------------------------------------------------- 
diff --git a/data/css/Web_Nebraska.css b/data/css/Web_Nebraska.css
index 8f5ddf220..a14df92ce 100644
--- a/data/css/Web_Nebraska.css
+++ b/data/css/Web_Nebraska.css
@@ -45,7 +45,6 @@ gray                #696969
 green               #5D835F
 --------------------------------------------------------------------------------------------
 
-# $Id$
 
  NarrativeWeb Styles
 -------------------------------------------------------------------------------------------- 
diff --git a/data/css/Web_Print-Default.css b/data/css/Web_Print-Default.css
index 1eac13f78..57faa95ae 100644
--- a/data/css/Web_Print-Default.css
+++ b/data/css/Web_Print-Default.css
@@ -41,7 +41,6 @@ black           #000
 white           #FFF
 ---------------------------------------------------------------------------------------------------
 
-# $Id$
 
  NarrativeWeb Styles
 -------------------------------------------------------------------------------------------- 
diff --git a/data/css/Web_Visually.css b/data/css/Web_Visually.css
index bc496b7d8..3a30d0037 100644
--- a/data/css/Web_Visually.css
+++ b/data/css/Web_Visually.css
@@ -45,7 +45,6 @@ Unknown     #000
 Males       Web_Gender_Male.png
 Females     Web_Gender_Female.png
 
-# $Id$
 
  NarrativeWeb Styles
 --------------------------------------------------------------------------------------------  */
diff --git a/data/css/behaviour.css b/data/css/behaviour.css
index 9a06cc85f..18bca964a 100644
--- a/data/css/behaviour.css
+++ b/data/css/behaviour.css
@@ -29,7 +29,6 @@ Style Author: Stephane Charette and Jason Simanek
  Image Gallery 
  ------------- 
 
-# $Id$
 
  ensure RegionBox <ol> is hidden and has no margins/padding that would shift the image */
 ol.RegionBox {
diff --git a/data/css/narrative-maps.css b/data/css/narrative-maps.css
index e2d944544..f8465cf78 100644
--- a/data/css/narrative-maps.css
+++ b/data/css/narrative-maps.css
@@ -18,7 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id$
 #
 ###################################################### */
 body#FamilyMap {
diff --git a/data/gramps.xml.in b/data/gramps.xml.in
index 482fe93b9..e2c6092a1 100644
--- a/data/gramps.xml.in
+++ b/data/gramps.xml.in
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- $Id$ -->
 
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
   <mime-type type="application/x-gramps">
diff --git a/data/gramps_canonicalize.xsl b/data/gramps_canonicalize.xsl
index 3e23f0896..abb410269 100644
--- a/data/gramps_canonicalize.xsl
+++ b/data/gramps_canonicalize.xsl
@@ -19,7 +19,6 @@
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
- $Id$
 -->
 <xsl:stylesheet version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index 15128fd4a..160d4add5 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -21,7 +21,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# $Id$
 -->
 
 <!--
diff --git a/gramps/plugins/gramplet/fanchart2waygramplet.py b/gramps/plugins/gramplet/fanchart2waygramplet.py
index c1b7c670b..3c3488fb1 100644
--- a/gramps/plugins/gramplet/fanchart2waygramplet.py
+++ b/gramps/plugins/gramplet/fanchart2waygramplet.py
@@ -17,7 +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.
 
-# $Id$
 
 ## Based on the normal fanchart
 
diff --git a/help/COPYING-DOCS b/help/COPYING-DOCS
index 287a18362..c12529bbf 100644
--- a/help/COPYING-DOCS
+++ b/help/COPYING-DOCS
@@ -10,4 +10,3 @@ Please see file named COPYING for exact terms of the license.
 Benny Malengier
 January 15, 2008
 
-$Id$
diff --git a/po/bg.po b/po/bg.po
index 95a714b9f..e453c22b6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,5 +1,4 @@
 # Bulgarian translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Kamen Naydenov <pau4o@pixel-bg.com>, 2006
 # Svetoslav Stefanov <lfu.project@gmail.com>, 2009
diff --git a/po/br.po b/po/br.po
index 847fa578f..06cfc417c 100644
--- a/po/br.po
+++ b/po/br.po
@@ -1,5 +1,4 @@
 # Breton translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
diff --git a/po/cs.po b/po/cs.po
index 8b91d154c..b39e27e23 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,5 +1,4 @@
 # Czech translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Radek Malcic <malcic@atlas.cz>, 2004
 # Jiří Pejchal <jiri.pejchal@gmail.com>, 2005
diff --git a/po/da.po b/po/da.po
index a889c9f6e..6dd8e1149 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,5 +1,4 @@
 # Danish translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Dansk oversættelse til GRAMPS
 # Copyright (C) 2002 Free Software Foundation, Inc.
diff --git a/po/de.po b/po/de.po
index 870fb92a6..29894ee75 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,5 +1,4 @@
 # German translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # translation of de.po to Deutsch
 #
diff --git a/po/el.po b/po/el.po
index 413a5a43c..4e85d3f78 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,5 +1,4 @@
 # Greek translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
diff --git a/po/eo.po b/po/eo.po
index 56f19f08d..e41057afd 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,5 +1,4 @@
 # Esperanto translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # translation of nova.po to Esperanto
 # translation of eo.po to Esperanto
diff --git a/po/es.po b/po/es.po
index 2102b248e..17cd4da6a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,5 +1,4 @@
 # Spanish translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Messages in spanish for the gramps genealogical software
 #
diff --git a/po/ga.po b/po/ga.po
index b8f36391c..4fa294618 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,5 +1,4 @@
 # Irish translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
diff --git a/po/genpot.sh b/po/genpot.sh
index d6930cbff..fe1efad13 100755
--- a/po/genpot.sh
+++ b/po/genpot.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id$
 
 # Make translation files
 
diff --git a/po/he.po b/po/he.po
index 3c4e73b1b..9e674fbbb 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,5 +1,4 @@
 # Hebrew translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) 2009 Igal Shapira
 #
diff --git a/po/hr.po b/po/hr.po
index 677b3fbc2..26d4b0132 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,5 +1,4 @@
 # Croatian translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) Gramps project
 # josip <josip@pisoj.com>, 2008-2011.
diff --git a/po/hu.po b/po/hu.po
index 80c141266..5e39d1a42 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,5 +1,4 @@
 # Hungarian translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) 2013 the Gramps Project
 #
diff --git a/po/ja.po b/po/ja.po
index bab487161..6f48e0be2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,5 +1,4 @@
 # Japanese translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # Keiichiro Yamamoto <k.yanmar@gmail.com>, 2011.
diff --git a/po/lt.po b/po/lt.po
index 7a6230617..30c575aa1 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,5 +1,4 @@
 # Lithuanian translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) YEAR ORGANIZATION, 2005.
 #
diff --git a/po/mk.po b/po/mk.po
index 47325072d..e8692c18a 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,5 +1,4 @@
 # Macedonian translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 #
diff --git a/po/nb.po b/po/nb.po
index 6b7a76095..ffbc59430 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,5 +1,4 @@
 # Norwegian (Bokmaal) translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) YEAR ORGANIZATION.
 #
diff --git a/po/nl.po b/po/nl.po
index 45e3a9a2f..454b8e428 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,5 +1,4 @@
 # Dutch translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # translation of nl.po to nederlands
 # Dutch translation of GRAMPS
diff --git a/po/nn.po b/po/nn.po
index e1d84d4d1..6b7c94b8e 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,5 +1,4 @@
 # Norwegian (Nynorsk) translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) 2008
 #
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 20689c344..9f7bb0de1 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,5 +1,4 @@
 # Portuguese (Portugal) translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Tradução em Português (Europeu) do GRAMPS
 # Copyright (C) 2002 Free Software Foundation, Inc.
diff --git a/po/ro.po b/po/ro.po
index 9e1a1c776..af762fbb2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,5 +1,4 @@
 # Romanian translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) YEAR ORGANIZATION
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
diff --git a/po/sk.po b/po/sk.po
index 6143186ac..8c093e117 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,5 +1,4 @@
 # Slovak translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Lubo Vasko <pgval at inmail dot sk>, 2005-2013, 2013.
 # Ondrej Krč-Jediný <hou at centrum dot sk>, 2014-2015
diff --git a/po/sl.po b/po/sl.po
index 6eba49a79..797076a72 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,5 +1,4 @@
 # Slovenian translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (c) 2007 gramps-project
 # Bernard Banko <beernarrd (at) gmail.com>, 2007-2017.
diff --git a/po/sq.po b/po/sq.po
index 728351209..7fe85d377 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -1,5 +1,4 @@
 # Albanian translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 # translation of celestia-doc-index.0.3.6.po to Albanian
diff --git a/po/sr_Latn.po b/po/sr_Latn.po
index 33eeb50ed..47cb02565 100644
--- a/po/sr_Latn.po
+++ b/po/sr_Latn.po
@@ -1,5 +1,4 @@
 # Serbian translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Vlada Perić <vlada.peric@gmail.com>, 2008.
 msgid ""
diff --git a/po/sv.po b/po/sv.po
index f13095ba5..1bbf130f1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,5 +1,4 @@
 # Swedish translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # -*- coding: utf-8 -*-
 # Svenska meddelanden i Gramps.
diff --git a/po/uk.po b/po/uk.po
index 5fe8899e9..b001ddb8b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,5 +1,4 @@
 # Ukrainian translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (c) 2017 Gramps
 # Fedir Zinchuk <fedikw@gmail.com>, 2011-2017.
diff --git a/po/vi.po b/po/vi.po
index bb39f543a..213ff622f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,5 +1,4 @@
 # Vietnamese translation for Gramps
-# $Id$
 # This file is distributed under the same license as the Gramps package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
diff --git a/test/dates.sh b/test/dates.sh
index 8b0374866..c6833d7a8 100755
--- a/test/dates.sh
+++ b/test/dates.sh
@@ -3,7 +3,6 @@
 # Date Handler test for GRAMPS:
 #   o Run date_test.py for every available locale.
 
-# $Id$
 
 TOP_DIR=`dirname $PWD`
 SRC_DIR=$TOP_DIR/src
diff --git a/test/det_ancestor_report.sh b/test/det_ancestor_report.sh
index 873e89ae6..203b0663b 100755
--- a/test/det_ancestor_report.sh
+++ b/test/det_ancestor_report.sh
@@ -3,7 +3,6 @@
 # Report test for GRAMPS: Generate det_ancestor_report testing
 # different option combinations.
 
-# $Id$
 
 REP="det_ancestor_report"
 FMT="txt"
diff --git a/test/det_descendant_report.sh b/test/det_descendant_report.sh
index 77848a0ad..d969974a4 100755
--- a/test/det_descendant_report.sh
+++ b/test/det_descendant_report.sh
@@ -3,7 +3,6 @@
 # Report test for GRAMPS: Generate det_descendant_report testing
 # different option combinations.
 
-# $Id$
 
 REP="det_descendant_report"
 FMT="txt"
diff --git a/test/impex.sh b/test/impex.sh
index 25df87746..bbda5ff6e 100755
--- a/test/impex.sh
+++ b/test/impex.sh
@@ -11,7 +11,6 @@
 #     is also supported for import, and run a text summary report.
 #   o Diff each report with the summary of the produced example DB
 
-# $Id$
 
 TOP_DIR=`dirname $PWD`
 TEST_DIR=$TOP_DIR/test
diff --git a/test/runtest.sh b/test/runtest.sh
index 38ab5d285..9078b1dff 100755
--- a/test/runtest.sh
+++ b/test/runtest.sh
@@ -7,7 +7,6 @@
 # specifying all possible options and their combinations. 
 # Instead, this is a general test for all formats.
 
-# $Id$
 
 TOP_DIR=`dirname $PWD`
 TEST_DIR=$TOP_DIR/test
diff --git a/test/tools.sh b/test/tools.sh
index 0eb4acff6..b9101be7e 100755
--- a/test/tools.sh
+++ b/test/tools.sh
@@ -7,7 +7,6 @@
 # specifying all possible options and their combinations. 
 # Instead, this is a general test for all tools.
 
-# $Id$
 
 TOP_DIR=`dirname $PWD`
 TEST_DIR=$TOP_DIR/test
diff --git a/windows/nonAIO/nsis/gramps.nsi b/windows/nonAIO/nsis/gramps.nsi
index 24945b110..662cc8cb4 100644
--- a/windows/nonAIO/nsis/gramps.nsi
+++ b/windows/nonAIO/nsis/gramps.nsi
@@ -18,7 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id$
 #
 # Description: Nullsoft Installer (NSIS) file to build Windows installer:
 #