Nuke arch-tags.

977 files changed, 0 insertions, 977 deletions

diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1
index 922c5c9d33..8f73a76fb8 100644
--- a/lisp/ChangeLog.1
+++ b/lisp/ChangeLog.1
@@ -3265,4 +3265,3 @@
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: b6060738-7fac-4c9c-80ae-67995bae78a7
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index b9eda9a6ba..f316431c1d 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -23552,4 +23552,3 @@ See ChangeLog.9 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: 5fcf8004-6f58-452a-b9d6-6950323a19c1
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index 2fd903b49d..80f6c55c24 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -14354,4 +14354,3 @@ See ChangeLog.10 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;; arch-tag: 2fe8d7b0-27e3-4634-a0b7-db70ff071825
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index e591dab293..46a5ce4f0d 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -33366,4 +33366,3 @@ See ChangeLog.11 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: e39939be-dab3-400e-86f5-0e2701a883c1
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index 2919d6f655..3788dcaf31 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -20568,4 +20568,3 @@ See ChangeLog.13 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;; arch-tag: c241c1f9-d668-48bf-920a-2897ed0340bc
diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index 57ae07d0f1..babeda746c 100644
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -4010,4 +4010,3 @@ See ChangeLog.1 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: c315ba16-14ba-4b07-86e6-013a18f11be7
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index 07b5e8ed6f..a8d9580f16 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -12456,4 +12456,3 @@ See ChangeLog.2 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: f07a3446-5672-464a-8fdc-2ca92e8e7b2a
diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index f0e9ea6a60..79214a5db8 100644
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -8954,4 +8954,3 @@ See ChangeLog.3 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: 91035822-35c7-44a9-8417-2454b88c3db2
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index 247f22936a..5a5e5d3699 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -9283,4 +9283,3 @@ See ChangeLog.4 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: 1a8fbb45-25d0-48e2-a926-29ca4e3d343a
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 3626be96a1..4f42e191fc 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -8040,4 +8040,3 @@ See ChangeLog.5 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: f90e8ffe-6bd0-4423-97d9-637ac4382520
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 649ebb2c4b..fdbae2c289 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -23125,4 +23125,3 @@ See ChangeLog.6 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: 0995d517-13da-45ab-9c2d-7911aa25512b
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 5ff7885d2f..d93e9ddec5 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -10011,4 +10011,3 @@ See ChangeLog.7 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: efdc1531-ed46-4e14-be59-bee4b23088f3
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index d3a7b391a0..1e9b3d16f9 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -20711,4 +20711,3 @@ See ChangeLog.8 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: a7cd2b86-43eb-409b-883f-3700fa85334f
diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el
index b22b2afdd1..9d34ae2ef1 100644
--- a/lisp/abbrevlist.el
+++ b/lisp/abbrevlist.el
@@ -53,5 +53,4 @@
 
 (provide 'abbrevlist)
 
-;; arch-tag: 178f0638-6597-4c16-bcee-576c3d8e9217
 ;;; abbrevlist.el ends here
diff --git a/lisp/align.el b/lisp/align.el
index 72c12e14ab..0dff2873e9 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -1605,5 +1605,4 @@ aligner would have dealt with are."
 
 (run-hooks 'align-load-hook)
 
-;; arch-tag: ef79cccf-1db8-4888-a8a1-d7ce2d1532f7
 ;;; align.el ends here
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 8321edb21b..8b12d737f4 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -594,5 +594,4 @@ ESCAPE-SEQ is a SGR control sequences such as \\033[34m.  The parameter
 
 (provide 'ansi-color)
 
-;; arch-tag: 00726118-9432-44fd-b72d-d2af7591c99c
 ;;; ansi-color.el ends here
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 21b9ef6409..696d5de9b0 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1137,5 +1137,4 @@ If non-nil TEXT is a string that will be printed as a heading."
 
 (provide 'apropos)
 
-;; arch-tag: d56fa2ac-e56b-4ce3-84ff-852f9c0dc66e
 ;;; apropos.el ends here
diff --git a/lisp/autoarg.el b/lisp/autoarg.el
index 693163d0db..3b596b7ef2 100644
--- a/lisp/autoarg.el
+++ b/lisp/autoarg.el
@@ -144,5 +144,4 @@ which invoked this function, excluding the Autoarg keymap."
 
 (provide 'autoarg)
 
-;; arch-tag: 2ba2ab4f-d60e-402a-ae4d-37e29af723c2
 ;;; autoarg.el ends here
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index e096fb5107..a5634dde5a 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -410,5 +410,4 @@ insert a template for the file depending on the mode of the buffer."
 
 (provide 'autoinsert)
 
-;; arch-tag: 5b6630ac-c735-43cf-b097-b78c622af909
 ;;; autoinsert.el ends here
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 5abe12fae6..4caf0cafc5 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -576,5 +576,4 @@ the timer when no buffers need to be checked."
 
 (run-hooks 'auto-revert-load-hook)
 
-;; arch-tag: f6bcb07b-4841-477e-9e44-b18678e58876
 ;;; autorevert.el ends here
diff --git a/lisp/avoid.el b/lisp/avoid.el
index 7c87282bed..853567d366 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -409,5 +409,4 @@ definition of \"random distance\".)"
 (if mouse-avoidance-mode
     (mouse-avoidance-mode mouse-avoidance-mode))
 
-;; arch-tag: 64ad4ef8-a870-4183-8d96-3aa93b7a6800
 ;;; avoid.el ends here
diff --git a/lisp/battery.el b/lisp/battery.el
index 3acb467a2d..1b13f46691 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -553,5 +553,4 @@ MATCH-NUM in the match.  Otherwise, return nil."
 
 (provide 'battery)
 
-;; arch-tag: 65916f50-4754-4b6b-ac21-0b510f545a37
 ;;; battery.el ends here
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 040b1afea8..c1df92b2e9 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1214,5 +1214,4 @@ if `inhibit-field-text-motion' is non-nil."
 ;; no-update-autoloads: t
 ;; End:
 
-;; arch-tag: 23b5c7e6-e47b-49ed-8c6c-ed213c5fffe0
 ;;; bindings.el ends here
diff --git a/lisp/bs.el b/lisp/bs.el
index 03780dea9a..4b6812aeaf 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -1486,5 +1486,4 @@ name of buffer configuration."
 ;; Now provide feature bs
 (provide 'bs)
 
-;; arch-tag: c0d9ab34-bf06-4368-ae9d-af88878e6802
 ;;; bs.el ends here
diff --git a/lisp/button.el b/lisp/button.el
index d2ab92b02e..c52e3d8e37 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -477,5 +477,4 @@ Returns the button found."
 
 (provide 'button)
 
-;; arch-tag: 5f2c7627-413b-4097-b282-630f89d9c5e9
 ;;; button.el ends here
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index 7732c1c7f2..7ab908bd50 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -1271,5 +1271,4 @@ If the current Calc language does not use placeholders, return nil."
 ;; generated-autoload-file: "calc-loaddefs.el"
 ;; End:
 
-;; arch-tag: 5599e45d-e51e-44bb-9a20-9f4ed8c96c32
 ;;; calc-aent.el ends here
diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el
index 2f1b4cc4ad..f0348d7453 100644
--- a/lisp/calc/calc-alg.el
+++ b/lisp/calc/calc-alg.el
@@ -1914,5 +1914,4 @@
 
 (provide 'calc-alg)
 
-;; arch-tag: 52e7dcdf-9688-464d-a02b-4bbe789348d0
 ;;; calc-alg.el ends here
diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el
index bec3c0661c..cf395e79b3 100644
--- a/lisp/calc/calc-arith.el
+++ b/lisp/calc/calc-arith.el
@@ -3067,5 +3067,4 @@
 
 (provide 'calc-arith)
 
-;; arch-tag: 6c396b5b-14c6-40ed-bb2a-7cc2e8111465
 ;;; calc-arith.el ends here
diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el
index 3cd5b7af30..fb09c3305c 100644
--- a/lisp/calc/calc-bin.el
+++ b/lisp/calc/calc-bin.el
@@ -854,5 +854,4 @@ the size of a Calc bignum digit.")
 
 (provide 'calc-bin)
 
-;; arch-tag: f6dba7bc-53b2-41ae-919c-c266ab0ca8b3
 ;;; calc-bin.el ends here
diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el
index a282a4fbf2..5f0c733a91 100644
--- a/lisp/calc/calc-comb.el
+++ b/lisp/calc/calc-comb.el
@@ -1027,5 +1027,4 @@
 
 (provide 'calc-comb)
 
-;; arch-tag: 1d75ee9b-0815-42bd-a321-bb3dc001cc02
 ;;; calc-comb.el ends here
diff --git a/lisp/calc/calc-cplx.el b/lisp/calc/calc-cplx.el
index 88df0c385f..fdc9372ddc 100644
--- a/lisp/calc/calc-cplx.el
+++ b/lisp/calc/calc-cplx.el
@@ -355,5 +355,4 @@
 
 (provide 'calc-cplx)
 
-;; arch-tag: de73a331-941c-4507-ae76-46c76adc70dd
 ;;; calc-cplx.el ends here
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index 74ab819de3..b6685b6182 100644
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -1382,5 +1382,4 @@ The command \\[yank] can retrieve it from there."
 ;; generated-autoload-file: "calc-loaddefs.el"
 ;; End:
 
-;; arch-tag: 1b8f311e-fba1-40d3-b8c3-1d6f68fd26fc
 ;;; calc-embed.el ends here
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 21ca02728b..ff6755ca23 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -3504,5 +3504,4 @@ A key may contain additional specs for Inverse, Hyperbolic, and Inv+Hyp.")
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: 1814ba7f-a390-49dc-9e25-a5adc205e97e
 ;;; calc-ext.el ends here
diff --git a/lisp/calc/calc-fin.el b/lisp/calc/calc-fin.el
index 78eb1447ec..6ab96d12da 100644
--- a/lisp/calc/calc-fin.el
+++ b/lisp/calc/calc-fin.el
@@ -410,5 +410,4 @@
 
 (provide 'calc-fin)
 
-;; arch-tag: 82f30ca8-d02f-4b33-84b4-bb6ecd84597b
 ;;; calc-fin.el ends here
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 2d94455cb9..24fc05282e 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -1922,5 +1922,4 @@ and ends on the last Sunday of October at 2 a.m."
 
 (provide 'calc-forms)
 
-;; arch-tag: a3d8f33b-9508-4043-8060-d02b8c9c750c
 ;;; calc-forms.el ends here
diff --git a/lisp/calc/calc-frac.el b/lisp/calc/calc-frac.el
index ca6030328a..ca9d4e6f8e 100644
--- a/lisp/calc/calc-frac.el
+++ b/lisp/calc/calc-frac.el
@@ -234,5 +234,4 @@
 
 (provide 'calc-frac)
 
-;; arch-tag: 89d65274-0b3b-42d8-aacd-eaf86da5b4ea
 ;;; calc-frac.el ends here
diff --git a/lisp/calc/calc-funcs.el b/lisp/calc/calc-funcs.el
index 780dc2acfc..7509749b32 100644
--- a/lisp/calc/calc-funcs.el
+++ b/lisp/calc/calc-funcs.el
@@ -1009,5 +1009,4 @@
 
 (provide 'calc-funcs)
 
-;; arch-tag: 421ddb7a-550f-4dda-a31c-06638ebfc43a
 ;;; calc-funcs.el ends here
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index e98fe5745a..37db8ebbd7 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -1506,5 +1506,4 @@ This \"dumb\" driver will be present in Gnuplot 3.0."
 
 (provide 'calc-graph)
 
-;; arch-tag: e4b06a52-c386-4d54-a2bb-7c0a0ef533c2
 ;;; calc-graph.el ends here
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 066785fc8f..847eccf658 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -688,5 +688,4 @@ C-w  Describe how there is no warranty for Calc."
 
 (provide 'calc-help)
 
-;; arch-tag: 2d347593-7591-449e-a64a-93dab5f2f686
 ;;; calc-help.el ends here
diff --git a/lisp/calc/calc-incom.el b/lisp/calc/calc-incom.el
index 07b5702bcc..4c3a37a76d 100644
--- a/lisp/calc/calc-incom.el
+++ b/lisp/calc/calc-incom.el
@@ -230,5 +230,4 @@
 
 (provide 'calc-incom)
 
-;; arch-tag: b8001270-4dc7-481b-a3e3-a952e19b390d
 ;;; calc-incom.el ends here
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index 8b55fabe7b..bc768bf669 100644
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -2497,5 +2497,4 @@ order to Calc's."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: 483bfe15-f290-4fef-bb7d-ce65be687f2e
 ;;; calc-lang.el ends here
diff --git a/lisp/calc/calc-macs.el b/lisp/calc/calc-macs.el
index 8da071276f..e7a2b149ab 100644
--- a/lisp/calc/calc-macs.el
+++ b/lisp/calc/calc-macs.el
@@ -207,5 +207,4 @@
 
 (provide 'calc-macs)
 
-;; arch-tag: 08ba8ec2-fcff-4b80-a079-ec661bdb057e
 ;;; calc-macs.el ends here
diff --git a/lisp/calc/calc-map.el b/lisp/calc/calc-map.el
index 0ffc15d6a4..a37fe5375f 100644
--- a/lisp/calc/calc-map.el
+++ b/lisp/calc/calc-map.el
@@ -1274,5 +1274,4 @@
 
 (provide 'calc-map)
 
-;; arch-tag: 980eac49-00e0-4870-b72a-e726b74c7990
 ;;; calc-map.el ends here
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el
index cd1b86d6b9..047f3d24d7 100644
--- a/lisp/calc/calc-math.el
+++ b/lisp/calc/calc-math.el
@@ -2165,5 +2165,4 @@ If this can't be done, return NIL."
 
 (provide 'calc-math)
 
-;; arch-tag: c7367e8e-d0b8-4f70-8577-2fb3f31dbb4c
 ;;; calc-math.el ends here
diff --git a/lisp/calc/calc-menu.el b/lisp/calc/calc-menu.el
index 40f8ff9987..78d7ac5981 100644
--- a/lisp/calc/calc-menu.el
+++ b/lisp/calc/calc-menu.el
@@ -1461,4 +1461,3 @@
 
 (provide 'calc-menu)
 
-;; arch-tag: 9612c86a-cd4f-4baa-ab0b-40af7344d21f
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index 14968834cd..aea4f1b068 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -963,5 +963,4 @@ doing 'M-x toggle-debug-on-error', then reproducing the bug.
 ;; generated-autoload-file: "calc-loaddefs.el"
 ;; End:
 
-;; arch-tag: 7984d9d0-62e5-41dc-afb8-e904b975f250
 ;;; calc-misc.el ends here
diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el
index e9edd0c172..caee8997a5 100644
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -677,5 +677,4 @@
 
 (provide 'calc-mode)
 
-;; arch-tag: ecc70eea-c712-43f2-9085-4205e58d6ddf
 ;;; calc-mode.el ends here
diff --git a/lisp/calc/calc-mtx.el b/lisp/calc/calc-mtx.el
index 1c2a74d2a8..1dc160cc1e 100644
--- a/lisp/calc/calc-mtx.el
+++ b/lisp/calc/calc-mtx.el
@@ -365,5 +365,4 @@
 
 (provide 'calc-mtx)
 
-;; arch-tag: fc0947b1-90e1-4a23-8950-d8ead9c3a306
 ;;; calc-mtx.el ends here
diff --git a/lisp/calc/calc-nlfit.el b/lisp/calc/calc-nlfit.el
index 985d9326fc..68c4da24ce 100644
--- a/lisp/calc/calc-nlfit.el
+++ b/lisp/calc/calc-nlfit.el
@@ -818,4 +818,3 @@
 
 (provide 'calc-nlfit)
 
-;; arch-tag: 6eba3cd6-f48b-4a84-8174-10c15a024928
diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el
index c06ce9be46..40da9bd12e 100644
--- a/lisp/calc/calc-poly.el
+++ b/lisp/calc/calc-poly.el
@@ -1200,5 +1200,4 @@ If no partial fraction representation can be found, return nil."
 
 (provide 'calc-poly)
 
-;; arch-tag: d2566c51-2ccc-45f1-8c50-f3462c2953ff
 ;;; calc-poly.el ends here
diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index a1463634fe..efdb8fc88e 100644
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -2365,5 +2365,4 @@ Redefine the corresponding command."
 
 (provide 'calc-prog)
 
-;; arch-tag: 4c5a183b-c9e5-4632-bb3f-e41a764518b0
 ;;; calc-prog.el ends here
diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el
index f7c5727a0c..86bb340f4a 100644
--- a/lisp/calc/calc-rewr.el
+++ b/lisp/calc/calc-rewr.el
@@ -2108,5 +2108,4 @@
 
 (provide 'calc-rewr)
 
-;; arch-tag: ca8d7b7d-bff1-4535-90f3-e2241f5e786b
 ;;; calc-rewr.el ends here
diff --git a/lisp/calc/calc-rules.el b/lisp/calc/calc-rules.el
index d5ebe715c8..8199449759 100644
--- a/lisp/calc/calc-rules.el
+++ b/lisp/calc/calc-rules.el
@@ -445,5 +445,4 @@ fitparam(n) = x  :=  x ]"))
 
 (provide 'calc-rules)
 
-;; arch-tag: 0ed54a52-38f3-4ed7-9ca7-b8ecf8f2febe
 ;;; calc-rules.el ends here
diff --git a/lisp/calc/calc-sel.el b/lisp/calc/calc-sel.el
index f2d82612e7..46442dd68c 100644
--- a/lisp/calc/calc-sel.el
+++ b/lisp/calc/calc-sel.el
@@ -876,5 +876,4 @@
 
 (provide 'calc-sel)
 
-;; arch-tag: e5169792-777d-428f-bff5-acca66813fa2
 ;;; calc-sel.el ends here
diff --git a/lisp/calc/calc-stat.el b/lisp/calc/calc-stat.el
index 9605a059f1..f3d4e08ee1 100644
--- a/lisp/calc/calc-stat.el
+++ b/lisp/calc/calc-stat.el
@@ -583,5 +583,4 @@
 
 (provide 'calc-stat)
 
-;; arch-tag: 423858e9-8513-489c-9f35-710cd9d9c307
 ;;; calc-stat.el ends here
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index ccef6f745d..d9d7e705e3 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -681,5 +681,4 @@
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: 2fbfec82-a521-42ca-bcd8-4f254ae6313e
 ;;; calc-store.el ends here
diff --git a/lisp/calc/calc-stuff.el b/lisp/calc/calc-stuff.el
index 2078080d6f..c1fdea5770 100644
--- a/lisp/calc/calc-stuff.el
+++ b/lisp/calc/calc-stuff.el
@@ -295,5 +295,4 @@ With a prefix, push that prefix as a number onto the stack."
 
 (provide 'calc-stuff)
 
-;; arch-tag: 789332ef-a178-49d3-8fb7-5d7ed7e21f56
 ;;; calc-stuff.el ends here
diff --git a/lisp/calc/calc-trail.el b/lisp/calc/calc-trail.el
index 5e490dfc7c..16ee4835d7 100644
--- a/lisp/calc/calc-trail.el
+++ b/lisp/calc/calc-trail.el
@@ -181,5 +181,4 @@
 
 (provide 'calc-trail)
 
-;; arch-tag: 59b76655-d882-4aab-a3ee-b83870e530d0
 ;;; calc-trail.el ends here
diff --git a/lisp/calc/calc-undo.el b/lisp/calc/calc-undo.el
index 72cc2e62f7..508385be39 100644
--- a/lisp/calc/calc-undo.el
+++ b/lisp/calc/calc-undo.el
@@ -148,5 +148,4 @@
 
 (provide 'calc-undo)
 
-;; arch-tag: eeb485d2-fb3d-454a-9d79-450af1f50d6c
 ;;; calc-undo.el ends here
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 0c622b15a7..5104dab1a7 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1557,5 +1557,4 @@ If EXPR is nil, return nil."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: e993314f-3adc-4191-be61-4ef8874881c4
 ;;; calc-units.el ends here
diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el
index 504e8c426a..a645b7611b 100644
--- a/lisp/calc/calc-vec.el
+++ b/lisp/calc/calc-vec.el
@@ -1675,5 +1675,4 @@ of two matrices is a matrix."
 
 (provide 'calc-vec)
 
-;; arch-tag: 7902a7af-ec69-440a-8635-ebb4db263402
 ;;; calc-vec.el ends here
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index e03295f811..0006fb0f33 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -3838,5 +3838,4 @@ See Info node `(calc)Defining Functions'."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: 0c3b170c-4ce6-4eaf-8d9b-5834d1fe938f
 ;;; calc.el ends here
diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el
index 9f8df92a0f..22a134706f 100644
--- a/lisp/calc/calcalg2.el
+++ b/lisp/calc/calcalg2.el
@@ -3669,5 +3669,4 @@
 
 (provide 'calcalg2)
 
-;; arch-tag: f2932ec8-dd63-418b-a542-11a644b9d4c4
 ;;; calcalg2.el ends here
diff --git a/lisp/calc/calcalg3.el b/lisp/calc/calcalg3.el
index 600d21303c..5c7632d40e 100644
--- a/lisp/calc/calcalg3.el
+++ b/lisp/calc/calcalg3.el
@@ -1928,5 +1928,4 @@
 
 (provide 'calcalg3)
 
-;; arch-tag: ff9f2920-8111-48b5-b3fa-b0682c3e44a6
 ;;; calcalg3.el ends here
diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index c083b6605f..30b82eaf6f 100644
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -1675,5 +1675,4 @@
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: 7c45d10a-a286-4dab-af49-7ae8989fbf78
 ;;; calccomp.el ends here
diff --git a/lisp/calc/calcsel2.el b/lisp/calc/calcsel2.el
index dfe79d07a8..41d61e634e 100644
--- a/lisp/calc/calcsel2.el
+++ b/lisp/calc/calcsel2.el
@@ -300,5 +300,4 @@
 
 (provide 'calcsel2)
 
-;; arch-tag: 7c5b8d65-b8f0-45d9-820d-9930f8ee114b
 ;;; calcsel2.el ends here
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 0a4e5d7ae6..1e9bb68906 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -1824,5 +1824,4 @@ To use this, apply a binary operator (evaluate it), then call this."
 
 (provide 'calculator)
 
-;; arch-tag: a1b9766c-af8a-4a74-b466-65ad8eeb0c73
 ;;; calculator.el ends here
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index aabaffeb34..d95136b421 100644
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -361,5 +361,4 @@ Prefix argument ARG will make the entry nonmarking."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: c1cb1d67-862a-4264-a01c-41cb4df01f14
 ;;; cal-bahai.el ends here
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index 3c3148aca3..c91669d578 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -686,5 +686,4 @@ Echo Chinese date unless NOECHO is non-nil."
 
 (provide 'cal-china)
 
-;; arch-tag: 7e5b7e0d-676c-47e3-8696-93e7ea0ab644
 ;;; cal-china.el ends here
diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el
index 68841b9342..7030b0bd93 100644
--- a/lisp/calendar/cal-coptic.el
+++ b/lisp/calendar/cal-coptic.el
@@ -269,5 +269,4 @@ Echo Ethiopic date unless NOECHO is t."
 
 (provide 'cal-coptic)
 
-;; arch-tag: 72d49161-25df-4072-9312-b182cdca7627
 ;;; cal-coptic.el ends here
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index bb98da1668..1481d650e7 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -474,5 +474,4 @@ Conversion to daylight saving time is done according to
 
 (provide 'cal-dst)
 
-;; arch-tag: a141d204-213c-4ca5-bdc6-f9df3aa92aad
 ;;; cal-dst.el ends here
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index c18d55529f..fd0977e55e 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -269,5 +269,4 @@ Echo French Revolutionary date unless NOECHO is non-nil."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9
 ;;; cal-french.el ends here
diff --git a/lisp/calendar/cal-html.el b/lisp/calendar/cal-html.el
index 89b1e89a3b..ef9f3a4ad9 100644
--- a/lisp/calendar/cal-html.el
+++ b/lisp/calendar/cal-html.el
@@ -443,5 +443,4 @@ specified by EVENT.  Note that any existing output files are overwritten."
 
 (provide 'cal-html)
 
-;; arch-tag: 4e73377d-d2c1-46ea-a103-02c111da5f57
 ;;; cal-html.el ends here
diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el
index 4e8488000e..02550b751b 100644
--- a/lisp/calendar/cal-islam.el
+++ b/lisp/calendar/cal-islam.el
@@ -345,5 +345,4 @@ Prefix argument ARG makes the entry nonmarking."
 
 (provide 'cal-islam)
 
-;; arch-tag: a951b6c1-6f47-48d5-bac3-1b505cd719f7
 ;;; cal-islam.el ends here
diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index f95049ead3..8b896a4dee 100644
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -155,5 +155,4 @@ Interactively, goes to the first day of the specified week."
 
 (provide 'cal-iso)
 
-;; arch-tag: 3c0154cc-d30f-4981-9f60-42bdf7a468f6
 ;;; cal-iso.el ends here
diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el
index 0713d235f2..bbc4b11332 100644
--- a/lisp/calendar/cal-julian.el
+++ b/lisp/calendar/cal-julian.el
@@ -218,5 +218,4 @@ Echo astronomical (Julian) day number unless NOECHO is non-nil."
 
 (provide 'cal-julian)
 
-;; arch-tag: 0520acdd-1c60-4188-9aa8-9b8c24d856ae
 ;;; cal-julian.el ends here
diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index 0fd9a628c7..8165748949 100644
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -390,5 +390,4 @@ Echo Mayan date unless NOECHO is non-nil."
 
 (provide 'cal-mayan)
 
-;; arch-tag: 54f35144-cd0f-4873-935a-a60129de07df
 ;;; cal-mayan.el ends here
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index e15211cd77..cd90877248 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -281,5 +281,4 @@ is non-nil."
 
 (provide 'cal-menu)
 
-;; arch-tag: aa81cf73-ce89-48a4-97ec-9ef861e87fe9
 ;;; cal-menu.el ends here
diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index a6a1ae7a47..e919146864 100644
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -406,5 +406,4 @@ Negative DAY counts backward from end of year."
 
 (provide 'cal-move)
 
-;; arch-tag: d0883c46-7e16-4914-8ff8-8f67e699b781
 ;;; cal-move.el ends here
diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el
index 646b14e3da..fe18160307 100644
--- a/lisp/calendar/cal-persia.el
+++ b/lisp/calendar/cal-persia.el
@@ -218,5 +218,4 @@ Echo Persian date unless NOECHO is non-nil."
 
 (provide 'cal-persia)
 
-;; arch-tag: 2832383c-e4b4-4dc2-8ee9-cfbdd53e5e2d
 ;;; cal-persia.el ends here
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index f4d39167ba..a0134241ad 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -1832,5 +1832,4 @@ Add trailing COMMENT if present."
 
 (provide 'cal-tex)
 
-;; arch-tag: ca8168a4-5a00-4508-a565-17e3bccce6d0
 ;;; cal-tex.el ends here
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index e4e4db1ee6..30e1ea5447 100644
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -189,5 +189,4 @@ See `calendar-frame-setup' for more information."
 
 (provide 'cal-x)
 
-;; arch-tag: c6dbddca-ae84-442d-87fc-244b76e38e17
 ;;; cal-x.el ends here
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 680a2ee91e..3daa807faf 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -2295,5 +2295,4 @@ the entry."
 
 (provide 'icalendar)
 
-;; arch-tag: 74fdbe8e-0451-4e38-bb61-4416e822f4fc
 ;;; icalendar.el ends here
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 53c7f9b1a6..e60437c560 100644
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -408,5 +408,4 @@ as governed by the values of `calendar-daylight-savings-starts',
 
 (provide 'lunar)
 
-;; arch-tag: 72f0b8a4-7bcc-4a1b-b67a-ff53c4a1d222
 ;;; lunar.el ends here
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index bcaf4ac57e..4f1e4557e5 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -1065,5 +1065,4 @@ Requires floating point."
 
 (provide 'solar)
 
-;; arch-tag: bc0ff693-df58-4666-bde4-2a7837ccb8fe
 ;;; solar.el ends here
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 3e47485aad..48e68842d5 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -973,5 +973,4 @@ If INCLUDE-SEP is non-nil, return point after the separator."
 
 (provide 'todo-mode)
 
-;; arch-tag: 6fd91be5-776e-4464-a109-da4ea0e4e497
 ;;; todo-mode.el ends here
diff --git a/lisp/case-table.el b/lisp/case-table.el
index ab4f83e810..75b51582ea 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -175,5 +175,4 @@ SYNTAX should be \" \", \"w\", \".\" or \"_\"."
 
 (provide 'case-table)
 
-;; arch-tag: 3c2cf885-2c9a-449a-9972-2e269191896d
 ;;; case-table.el ends here
diff --git a/lisp/cdl.el b/lisp/cdl.el
index ca7ea59ed5..6a99f66e56 100644
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@@ -45,5 +45,4 @@
 
 (provide 'cdl)
 
-;; arch-tag: b8e95a6e-2387-4077-ad9a-af54b09b8615
 ;;; cdl.el ends here
diff --git a/lisp/cedet/cedet-cscope.el b/lisp/cedet/cedet-cscope.el
index afb06044f2..09ad5bd027 100644
--- a/lisp/cedet/cedet-cscope.el
+++ b/lisp/cedet/cedet-cscope.el
@@ -173,5 +173,4 @@ there is already a database in DIR."
 
 (provide 'cedet-cscope)
 
-;; arch-tag: 9973f1ad-f13b-4399-bc67-7f488478d78d
 ;;; cedet-cscope.el ends here
diff --git a/lisp/cedet/cedet-files.el b/lisp/cedet/cedet-files.el
index b20cb3a172..c48a1c36a7 100644
--- a/lisp/cedet/cedet-files.el
+++ b/lisp/cedet/cedet-files.el
@@ -90,5 +90,4 @@ specific conversions during tests."
 
 (provide 'cedet-files)
 
-;; arch-tag: 4884c616-82c3-475d-ac9f-039e3431a702
 ;;; cedet-files.el ends here
diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el
index 8ac4ba1d0b..3fe8256125 100644
--- a/lisp/cedet/cedet-global.el
+++ b/lisp/cedet/cedet-global.el
@@ -186,5 +186,4 @@ If a database already exists, then just update it."
 
 (provide 'cedet-global)
 
-;; arch-tag: 0d0d3ac2-91ef-4820-bb2b-1d59ccf38392
 ;;; cedet-global.el ends here
diff --git a/lisp/cedet/cedet-idutils.el b/lisp/cedet/cedet-idutils.el
index 1f8470ac20..71773d1461 100644
--- a/lisp/cedet/cedet-idutils.el
+++ b/lisp/cedet/cedet-idutils.el
@@ -200,5 +200,4 @@ IDUtils must start from scratch when updating a database."
 
 (provide 'cedet-idutils)
 
-;; arch-tag: 663ca082-5b3d-4384-8710-cc74f990b501
 ;;; cedet-idutils.el ends here
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index 7abc5c543f..600aac2faa 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -132,5 +132,4 @@ if the package has not been loaded."
 
 (provide 'cedet)
 
-;; arch-tag: ad4b0b63-d1f9-4a41-b003-9bbb2feb5226
 ;;; cedet.el ends here
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index ad5f5ca01a..36f64aa567 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -1083,5 +1083,4 @@ If the result is a list or vector, then use the data debugger to display it."
 (if (featurep 'eieio)
     (require 'eieio-datadebug))
 
-;; arch-tag: 4807227d-08e7-45c4-8ea5-9e4595c3bfb1
 ;;; data-debug.el ends here
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index 5665d28384..002d3d4027 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -538,5 +538,4 @@ Note: This needs some work."
 ;; generated-autoload-load-name: "ede/cpp-root"
 ;; End:
 
-;; arch-tag: c3ac8160-cba6-447e-8b9c-accb7e2d942e
 ;;; ede/cpp-root.el ends here
diff --git a/lisp/cedet/ede/dired.el b/lisp/cedet/ede/dired.el
index 68a2899f3a..a107dab665 100644
--- a/lisp/cedet/ede/dired.el
+++ b/lisp/cedet/ede/dired.el
@@ -84,5 +84,4 @@ negative, force off."
 
 (provide 'ede/dired)
 
-;; arch-tag: 95d3e0a7-a8b7-43a9-b7df-ba647e4c56f6
 ;;; ede/dired.el ends here
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index 1ea35ea8c2..fc02bdc5a9 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -299,5 +299,4 @@ Knows about how the Emacs source tree is organized."
 ;; generated-autoload-load-name: "ede/emacs"
 ;; End:
 
-;; arch-tag: 7cd0be95-663d-4101-8799-2f8216fd8233
 ;;; ede/emacs.el ends here
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 595845a190..c92275c583 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -501,5 +501,4 @@ Argument DIR is the directory to trim upwards."
 ;; generated-autoload-load-name: "ede/files"
 ;; End:
 
-;; arch-tag: 28e17358-0208-4678-828c-23fb0e783fd6
 ;;; ede/files.el ends here
diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index a9f87f3dcf..ac70191434 100644
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -245,5 +245,4 @@ Knows about how the Linux source tree is organized."
 ;; generated-autoload-load-name: "ede/linux"
 ;; End:
 
-;; arch-tag: 41f310c8-b169-4259-8a2d-0ff4bd0a736d
 ;;; ede/linux.el ends here
diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el
index 79f6d63615..1acf436308 100644
--- a/lisp/cedet/ede/locate.el
+++ b/lisp/cedet/ede/locate.el
@@ -348,5 +348,4 @@ that created this EDE locate object."
 ;; generated-autoload-load-name: "ede/locate"
 ;; End:
 
-;; arch-tag: a04cb356-d11c-4f69-bd72-5a8a2aff708c
 ;;; ede/locate.el ends here
diff --git a/lisp/cedet/ede/make.el b/lisp/cedet/ede/make.el
index fc1e7cc8a1..66ba721206 100644
--- a/lisp/cedet/ede/make.el
+++ b/lisp/cedet/ede/make.el
@@ -105,5 +105,4 @@ If NOERROR is nil, then throw an error on failure.  Return t otherwise."
 ;; generated-autoload-load-name: "ede/make"
 ;; End:
 
-;; arch-tag: cc54abdb-7ca5-4902-9735-eda3c6a77852
 ;;; ede/make.el ends here
diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el
index 56c4c07236..562f346cce 100644
--- a/lisp/cedet/ede/makefile-edit.el
+++ b/lisp/cedet/ede/makefile-edit.el
@@ -126,5 +126,4 @@ Return nil if it isn't a variable."
 
 (provide 'ede/makefile-edit)
 
-;; arch-tag: aba26b5f-4306-40d9-b63c-84a9590ac986
 ;;; ede/makefile-edit.el ends here
diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el
index a2258c1d16..add7da03e9 100644
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -184,5 +184,4 @@ Results in --add-missing being passed to automake."
 
 (provide 'ede/pconf)
 
-;; arch-tag: 8d514f68-2abe-4b35-8b4e-bea4fd0c3eab
 ;;; ede/pconf.el ends here
diff --git a/lisp/cedet/ede/proj-archive.el b/lisp/cedet/ede/proj-archive.el
index 58499dfe8e..0f4bbc943c 100644
--- a/lisp/cedet/ede/proj-archive.el
+++ b/lisp/cedet/ede/proj-archive.el
@@ -61,5 +61,4 @@ This makes sure that the archive is removed with 'make clean'."
 
 (provide 'ede/proj-archive)
 
-;; arch-tag: a0b2cfe8-0d11-4a4f-8e47-ebfb11b6ac33
 ;;; ede/proj-archive.el ends here
diff --git a/lisp/cedet/ede/proj-aux.el b/lisp/cedet/ede/proj-aux.el
index 7d469fe097..bcec712d0e 100644
--- a/lisp/cedet/ede/proj-aux.el
+++ b/lisp/cedet/ede/proj-aux.el
@@ -44,5 +44,4 @@
 
 (provide 'ede/proj-aux)
 
-;; arch-tag: 668e96e0-2b30-474e-ba3c-9fa4fa696922
 ;;; ede/proj-aux.el ends here
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index 9ec5cc6430..bdcaa1cdbb 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -355,5 +355,4 @@ compiler it decides to use after inserting in the rule."
 
 (provide 'ede/proj-comp)
 
-;; arch-tag: ade67766-1a5d-467a-826a-93e95594d717
 ;;; ede/proj-comp.el ends here
diff --git a/lisp/cedet/ede/proj-info.el b/lisp/cedet/ede/proj-info.el
index da2264ffe8..e0084f91e5 100644
--- a/lisp/cedet/ede/proj-info.el
+++ b/lisp/cedet/ede/proj-info.el
@@ -183,5 +183,4 @@ files in the project."
 
 (provide 'ede/proj-info)
 
-;; arch-tag: e4b7ce51-ae46-4d7c-a5fb-073f435cdcbf
 ;;; ede/proj-info.el ends here
diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el
index 9b35d44daa..5833e37c10 100644
--- a/lisp/cedet/ede/proj-misc.el
+++ b/lisp/cedet/ede/proj-misc.el
@@ -93,5 +93,4 @@ All listed sources are included in the distribution.")
 
 (provide 'ede/proj-misc)
 
-;; arch-tag: e5e5f8d2-9897-4a1b-8a29-5944ec5a892d
 ;;; ede/proj-misc.el ends here
diff --git a/lisp/cedet/ede/proj-obj.el b/lisp/cedet/ede/proj-obj.el
index 897f373185..fbca97a08a 100644
--- a/lisp/cedet/ede/proj-obj.el
+++ b/lisp/cedet/ede/proj-obj.el
@@ -320,5 +320,4 @@ Optional argument MORESOURCE is not used."
 
 (provide 'ede/proj-obj)
 
-;; arch-tag: f521b89f-1a3f-4910-ba81-65de3f421698
 ;;; ede/proj-obj.el ends here
diff --git a/lisp/cedet/ede/proj-prog.el b/lisp/cedet/ede/proj-prog.el
index e68606f33a..436b8f3503 100644
--- a/lisp/cedet/ede/proj-prog.el
+++ b/lisp/cedet/ede/proj-prog.el
@@ -141,5 +141,4 @@ Optional COMMAND is the command to run in place of asking the user."
 
 (provide 'ede/proj-prog)
 
-;; arch-tag: 0bfa9364-f385-4745-a846-462146a79a25
 ;;; ede/proj-prog.el ends here
diff --git a/lisp/cedet/ede/proj-scheme.el b/lisp/cedet/ede/proj-scheme.el
index 64a1750368..2ab9c85c6e 100644
--- a/lisp/cedet/ede/proj-scheme.el
+++ b/lisp/cedet/ede/proj-scheme.el
@@ -46,5 +46,4 @@
 
 (provide 'ede/proj-scheme)
 
-;; arch-tag: 451081e6-0d45-4560-9821-8ee03e8401ab
 ;;; ede/proj-scheme.el ends here
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index 2e422c640f..ea8b919ef8 100644
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -207,5 +207,4 @@ We need to override -program which has an LDADD element."
 
 (provide 'ede/proj-shared)
 
-;; arch-tag: 05f22c3e-b269-4411-9425-65e8fe4ab74a
 ;;; ede/proj-shared.el ends here
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 36a73e02e7..1a3574c00f 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -676,5 +676,4 @@ Optional argument FORCE will force items to be regenerated."
 
 (provide 'ede/proj)
 
-;; arch-tag: eb8a40f8-0d2c-41c4-b273-af04101d1cdf
 ;;; ede/proj.el ends here
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index ac3e8bfc6e..c4fd938f11 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -1020,5 +1020,4 @@ per file or in .dir-locals.el or similar."
 
 (provide 'ede/project-am)
 
-;; arch-tag: 528db935-f186-4240-b647-e305c5b784a2
 ;;; ede/project-am.el ends here
diff --git a/lisp/cedet/ede/shell.el b/lisp/cedet/ede/shell.el
index c13ce392da..039198b92b 100644
--- a/lisp/cedet/ede/shell.el
+++ b/lisp/cedet/ede/shell.el
@@ -79,5 +79,4 @@ COMMAND is a text string representing the thing to be run."
 ;; generated-autoload-load-name: "ede/shell"
 ;; End:
 
-;; arch-tag: 71bb9dc4-ad1c-4ba3-a95e-531a90500ca9
 ;;; ede/shell.el ends here
diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el
index 14b3a043a6..bea08178e3 100644
--- a/lisp/cedet/ede/simple.el
+++ b/lisp/cedet/ede/simple.el
@@ -117,5 +117,4 @@ Each directory needs a project file to control it.")
 
 (provide 'ede/simple)
 
-;; arch-tag: a0c4264a-89ce-4364-afab-2512acd3b22a
 ;;; ede/simple.el ends here
diff --git a/lisp/cedet/ede/source.el b/lisp/cedet/ede/source.el
index fa555c13fa..5e55f4df3b 100644
--- a/lisp/cedet/ede/source.el
+++ b/lisp/cedet/ede/source.el
@@ -170,5 +170,4 @@ Used to guess header files, but uses the auxsource regular expression."
 
 (provide 'ede/source)
 
-;; arch-tag: 60165fe2-920e-4adf-8531-25655388467d
 ;;; ede/source.el ends here
diff --git a/lisp/cedet/ede/srecode.el b/lisp/cedet/ede/srecode.el
index 6cd288b534..63fc5adcc8 100644
--- a/lisp/cedet/ede/srecode.el
+++ b/lisp/cedet/ede/srecode.el
@@ -91,5 +91,4 @@ Note: Just like `srecode-insert', but templates found in 'ede app."
 
 (provide 'ede/srecode)
 
-;; arch-tag: 75bec542-7cc8-41a4-b5a0-8fb247609f03
 ;;; ede/srecode.el ends here
diff --git a/lisp/cedet/ede/system.el b/lisp/cedet/ede/system.el
index e10e4686fd..8e1513930f 100644
--- a/lisp/cedet/ede/system.el
+++ b/lisp/cedet/ede/system.el
@@ -143,5 +143,4 @@ Download tramp, and use /r:machine: for names on remote sites w/out FTP access."
 ;; generated-autoload-load-name: "ede/system"
 ;; End:
 
-;; arch-tag: a974ea44-151e-488b-b5d4-df2c05be6fe6
 ;;; ede/system.el ends here
diff --git a/lisp/cedet/ede/util.el b/lisp/cedet/ede/util.el
index 749fbd51fa..27b2833023 100644
--- a/lisp/cedet/ede/util.el
+++ b/lisp/cedet/ede/util.el
@@ -101,5 +101,4 @@ If BUFFER isn't specified, use the current buffer."
 ;; generated-autoload-load-name: "ede/util"
 ;; End:
 
-;; arch-tag: 3cddf449-7f6a-4c76-86dd-04142c60eba2
 ;;; ede/util.el ends here
diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el
index 24f87ff322..a52e91e1d2 100644
--- a/lisp/cedet/inversion.el
+++ b/lisp/cedet/inversion.el
@@ -538,5 +538,4 @@ The package should have VERSION available for download."
 
 (provide 'inversion)
 
-;; arch-tag: 7239729c-3051-4d85-bb09-dcf92363aa3b
 ;;; inversion.el ends here
diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index f74cd5d2f3..a7664453eb 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -255,5 +255,4 @@ Only pulses the line if `pulse-command-advice-flag' is non-nil."
 
 (provide 'pulse)
 
-;; arch-tag: 6e2f78c1-65b3-4164-a141-872cb1552959
 ;;; pulse.el ends here
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 889b12da05..a83a9a4280 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -1153,5 +1153,4 @@ minor mode is enabled." t nil)
 
 ;; (require 'semantic/load)
 
-;; arch-tag: 31583e10-6508-41a9-be40-f83d0ae0a4ed
 ;;; semantic.el ends here
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index a6b8af5af2..92bb0898c6 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -795,5 +795,4 @@ CONTEXT's content is described in `semantic-analyze-current-context'."
 ;; generated-autoload-load-name: "semantic/analyze"
 ;; End:
 
-;; arch-tag: 1102143a-1c05-4631-83e8-45aafc6b4a59
 ;;; semantic/analyze.el ends here
diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el
index 66d923d579..e22e2e7d9b 100644
--- a/lisp/cedet/semantic/analyze/complete.el
+++ b/lisp/cedet/semantic/analyze/complete.el
@@ -276,5 +276,4 @@ FLAGS can be any number of:
 ;; generated-autoload-load-name: "semantic/analyze/complete"
 ;; End:
 
-;; arch-tag: 97071c7e-2459-4e7a-8875-8cc5bbbc1f4d
 ;;; semantic/analyze/complete.el ends here
diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el
index 9542c32899..4d307e7069 100644
--- a/lisp/cedet/semantic/analyze/fcn.el
+++ b/lisp/cedet/semantic/analyze/fcn.el
@@ -334,5 +334,4 @@ SCOPE is the current scope."
 
 (provide 'semantic/analyze/fcn)
 
-;; arch-tag: 32525305-515e-4b96-ad11-216d3a99f829
 ;;; semantic/analyze/fcn.el ends here
diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el
index 65cea0e52f..de82133915 100644
--- a/lisp/cedet/semantic/analyze/refs.el
+++ b/lisp/cedet/semantic/analyze/refs.el
@@ -350,5 +350,4 @@ Only works for tags in the global namespace."
 ;; generated-autoload-load-name: "semantic/analyze/refs"
 ;; End:
 
-;; arch-tag: f8c59a91-1829-42b3-b083-437c6881841c
 ;;; semantic/analyze/refs.el ends here
diff --git a/lisp/cedet/semantic/bovine.el b/lisp/cedet/semantic/bovine.el
index 82f9108c2c..0b33aaeff3 100644
--- a/lisp/cedet/semantic/bovine.el
+++ b/lisp/cedet/semantic/bovine.el
@@ -293,5 +293,4 @@ list of semantic tokens found."
 ;; generated-autoload-load-name: "semantic/bovine"
 ;; End:
 
-;; arch-tag: 1e820899-2a26-499a-b0c0-57301365a6b0
 ;;; semantic/bovine.el ends here
diff --git a/lisp/cedet/semantic/bovine/c-by.el b/lisp/cedet/semantic/bovine/c-by.el
index 0308ace619..83ce85c5f0 100644
--- a/lisp/cedet/semantic/bovine/c-by.el
+++ b/lisp/cedet/semantic/bovine/c-by.el
@@ -2194,5 +2194,4 @@
 
 (provide 'semantic/bovine/c-by)
 
-;; arch-tag: 27da9f71-d2ef-473f-92a7-b0006b1a8491
 ;;; semantic/bovine/c-by.el ends here
diff --git a/lisp/cedet/semantic/bovine/debug.el b/lisp/cedet/semantic/bovine/debug.el
index 7b2affe151..c5db370f67 100644
--- a/lisp/cedet/semantic/bovine/debug.el
+++ b/lisp/cedet/semantic/bovine/debug.el
@@ -144,5 +144,4 @@ Argument CONDITION is the thrown error condition."
 
 (provide 'semantic/bovine/debug)
 
-;; arch-tag: d1bf98b3-faeb-4dc3-ac34-cac6264fd94e
 ;;; semantic/bovine/debug.el ends here
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 6216915605..c27434f414 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -963,5 +963,4 @@ ELisp variables can be pretty long, so track this one too.")
 
 (provide 'semantic/bovine/el)
 
-;; arch-tag: d634cbab-9610-4510-9fce-048ae1eb7aa6
 ;;; semantic/bovine/el.el ends here
diff --git a/lisp/cedet/semantic/bovine/gcc.el b/lisp/cedet/semantic/bovine/gcc.el
index 8c1f6f52f1..c04d4fdb11 100644
--- a/lisp/cedet/semantic/bovine/gcc.el
+++ b/lisp/cedet/semantic/bovine/gcc.el
@@ -221,5 +221,4 @@ It should also include other symbols GCC was compiled with.")
 ;; generated-autoload-load-name: "semantic/bovine/gcc"
 ;; End:
 
-;; arch-tag: 7086f4a0-1ce8-48e2-9783-d750d3765186
 ;;; semantic/bovine/gcc.el ends here
diff --git a/lisp/cedet/semantic/bovine/make-by.el b/lisp/cedet/semantic/bovine/make-by.el
index 1db454f6ea..ce775f90d5 100644
--- a/lisp/cedet/semantic/bovine/make-by.el
+++ b/lisp/cedet/semantic/bovine/make-by.el
@@ -384,5 +384,4 @@
 
 (provide 'semantic/bovine/make-by)
 
-;; arch-tag: 8c3749b8-7b19-46e0-af01-2a4d02fd0352
 ;;; semantic/bovine/make-by.el ends here
diff --git a/lisp/cedet/semantic/bovine/make.el b/lisp/cedet/semantic/bovine/make.el
index d51f9e2140..d3ac80afa1 100644
--- a/lisp/cedet/semantic/bovine/make.el
+++ b/lisp/cedet/semantic/bovine/make.el
@@ -238,5 +238,4 @@ Uses default implementation, and also gets a list of filenames."
 ;; generated-autoload-load-name: "semantic/bovine/make"
 ;; End:
 
-;; arch-tag: 8122d1f5-d4b7-4f6e-b909-d61ac65ef118
 ;;; semantic/bovine/make.el ends here
diff --git a/lisp/cedet/semantic/bovine/scm-by.el b/lisp/cedet/semantic/bovine/scm-by.el
index ac8211bfc8..7ceffda0eb 100644
--- a/lisp/cedet/semantic/bovine/scm-by.el
+++ b/lisp/cedet/semantic/bovine/scm-by.el
@@ -188,5 +188,4 @@
 
 (provide 'semantic/bovine/scm-by)
 
-;; arch-tag: 945749cc-a039-434f-bf95-bf2480a506c3
 ;;; semantic/bovine/scm-by.el ends here
diff --git a/lisp/cedet/semantic/bovine/scm.el b/lisp/cedet/semantic/bovine/scm.el
index 92b61129fb..84eab2e314 100644
--- a/lisp/cedet/semantic/bovine/scm.el
+++ b/lisp/cedet/semantic/bovine/scm.el
@@ -115,5 +115,4 @@ syntax as specified by the syntax table."
 ;; generated-autoload-load-name: "semantic/bovine/scm"
 ;; End:
 
-;; arch-tag: 4f929838-b817-447d-848c-d47789ff140f
 ;;; semantic/bovine/scm.el ends here
diff --git a/lisp/cedet/semantic/chart.el b/lisp/cedet/semantic/chart.el
index f4d08a7c6c..9c9a8f3633 100644
--- a/lisp/cedet/semantic/chart.el
+++ b/lisp/cedet/semantic/chart.el
@@ -171,5 +171,4 @@ items are charted.  TAGTABLE is passed to
 
 (provide 'semantic/chart)
 
-;; arch-tag: 026573b1-f4f1-4dda-ae77-b6451283ff23
 ;;; semantic/chart.el ends here
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index f9f7d4b8de..9f8bb2502e 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -2159,5 +2159,4 @@ use `semantic-complete-analyze-inline' to complete."
 ;; generated-autoload-load-name: "semantic/complete"
 ;; End:
 
-;; arch-tag: a07c8f71-e53b-416e-9704-3a99ef101b09
 ;;; semantic/complete.el ends here
diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el
index 2608dfb092..31aa7dc4c3 100644
--- a/lisp/cedet/semantic/ctxt.el
+++ b/lisp/cedet/semantic/ctxt.el
@@ -619,5 +619,4 @@ means that the first symbol might be:
 ;; generated-autoload-load-name: "semantic/ctxt"
 ;; End:
 
-;; arch-tag: 04f3ae3c-78bb-40ca-b112-ba77f5e4ea88
 ;;; semantic/ctxt.el ends here
diff --git a/lisp/cedet/semantic/db-debug.el b/lisp/cedet/semantic/db-debug.el
index 09e7064069..e866811b57 100644
--- a/lisp/cedet/semantic/db-debug.el
+++ b/lisp/cedet/semantic/db-debug.el
@@ -107,5 +107,4 @@
 
 (provide 'semantic/db-debug)
 
-;; arch-tag: 9bdc11bd-fb76-4a32-9545-78ed143b7184
 ;;; semantic/db-debug.el ends here
diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el
index e931c40aff..430f85ea88 100644
--- a/lisp/cedet/semantic/db-ebrowse.el
+++ b/lisp/cedet/semantic/db-ebrowse.el
@@ -661,5 +661,4 @@ Return a list of tags."
 
 (provide 'semantic/db-ebrowse)
 
-;; arch-tag: e7d15223-6074-4c87-baf0-98fdd22ff873
 ;;; semantic/db-ebrowse.el ends here
diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index c842ff61d7..af77362e7f 100644
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -343,5 +343,4 @@ Return a list of tags."
 
 (provide 'semantic/db-el)
 
-;; arch-tag: e54f556e-fa3f-4bc5-9b15-744a659a6e65
 ;;; semantic/db-el.el ends here
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index 35281c5190..03c39515a1 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -452,5 +452,4 @@ Optional NOERROR prevents errors from being displayed."
 ;; generated-autoload-load-name: "semantic/db-file"
 ;; End:
 
-;; arch-tag: f4a0d9de-6c25-4bf3-aff3-a10c58fd575d
 ;;; semantic/db-file.el ends here
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 47182bd8a0..8c093b12de 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -1369,5 +1369,4 @@ Return a table of all matching tags."
 ;; generated-autoload-load-name: "semantic/db-find"
 ;; End:
 
-;; arch-tag: 5d4162f5-5092-46d7-beed-55c78aab4116
 ;;; semantic/db-find.el ends here
diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el
index ddcfde8668..2046a4ce76 100644
--- a/lisp/cedet/semantic/db-global.el
+++ b/lisp/cedet/semantic/db-global.el
@@ -220,5 +220,4 @@ Like `semanticdb-find-tags-for-completion-method' for global."
 ;; generated-autoload-load-name: "semantic/db-global"
 ;; End:
 
-;; arch-tag: ec0edab2-26c2-438f-a3d2-0d953364f8cc
 ;;; semantic/db-global.el ends here
diff --git a/lisp/cedet/semantic/db-javascript.el b/lisp/cedet/semantic/db-javascript.el
index 40b49195d8..587708afd6 100644
--- a/lisp/cedet/semantic/db-javascript.el
+++ b/lisp/cedet/semantic/db-javascript.el
@@ -307,5 +307,4 @@ Return a list of tags."
 
 (provide 'semantic/db-javascript)
 
-;; arch-tag: 69cf8ad1-7ea9-41af-851c-41f24c873374
 ;;; semantic/db-javascript.el ends here
diff --git a/lisp/cedet/semantic/db-mode.el b/lisp/cedet/semantic/db-mode.el
index bbe117a25a..0ec00d3a6c 100644
--- a/lisp/cedet/semantic/db-mode.el
+++ b/lisp/cedet/semantic/db-mode.el
@@ -217,5 +217,4 @@ Argument NEW-TABLE is the new table of tags."
 ;; generated-autoload-load-name: "semantic/db-mode"
 ;; End:
 
-;; arch-tag: f5da903d-2d34-4adf-8572-e60340e1ad59
 ;;; semantic/db-mode.el ends here
diff --git a/lisp/cedet/semantic/db-ref.el b/lisp/cedet/semantic/db-ref.el
index 0ca49510d3..6330834f56 100644
--- a/lisp/cedet/semantic/db-ref.el
+++ b/lisp/cedet/semantic/db-ref.el
@@ -171,5 +171,4 @@ refreshed before dumping the result."
 
 (provide 'semantic/db-ref)
 
-;; arch-tag: bea73e70-dbbe-4c30-a58d-289dc3a40172
 ;;; semantic/db-ref.el ends here
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index b4308674b8..2d2a70caa6 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -622,5 +622,4 @@ If there isn't one, create it.
 ;; generated-autoload-load-name: "semantic/db-typecache"
 ;; End:
 
-;; arch-tag: cd7c37a8-2006-4ead-a037-977ffe7e7624
 ;;; semanticdb-typecache.el ends here
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index 1d54d2df4f..a4858fe840 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -1040,5 +1040,4 @@ If file does not have tags available, then load the file, and create them."
 ;; generated-autoload-load-name: "semantic/db"
 ;; End:
 
-;; arch-tag: d9f75280-737d-494f-9f70-09a649d27433
 ;;; semantic/db.el ends here
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index 2271c602b0..5d267c3e38 100644
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -566,5 +566,4 @@ A frame is of the form:
 ;; generated-autoload-load-name: "semantic/debug"
 ;; End:
 
-;; arch-tag: 6f189d2d-8a65-45a5-a7f0-9894625eb860
 ;;; semantic/debug.el ends here
diff --git a/lisp/cedet/semantic/decorate.el b/lisp/cedet/semantic/decorate.el
index 8690e08806..3bf61f801b 100644
--- a/lisp/cedet/semantic/decorate.el
+++ b/lisp/cedet/semantic/decorate.el
@@ -296,5 +296,4 @@ OVERLAY is passed in by isearch."
 
 (provide 'semantic/decorate)
 
-;; arch-tag: 30e5b6cb-dba0-41cd-920a-bc1dce267ad8
 ;;; semantic/decorate.el ends here
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index af4e4463fd..4a2d675f77 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -773,5 +773,4 @@ If TABLE is not in a buffer, do nothing."
 ;; generated-autoload-load-name: "semantic/decorate/include"
 ;; End:
 
-;; arch-tag: c3277137-be3f-43e2-af89-3b14b9bd7479
 ;;; semantic/decorate/include.el ends here
diff --git a/lisp/cedet/semantic/decorate/mode.el b/lisp/cedet/semantic/decorate/mode.el
index a41b043870..f7f33d09fb 100644
--- a/lisp/cedet/semantic/decorate/mode.el
+++ b/lisp/cedet/semantic/decorate/mode.el
@@ -520,5 +520,4 @@ Use a primary decoration."
 ;; generated-autoload-load-name: "semantic/decorate/mode"
 ;; End:
 
-;; arch-tag: c1ac7888-e323-4467-96d6-18eb2820ed58
 ;;; semantic/decorate/mode.el ends here
diff --git a/lisp/cedet/semantic/dep.el b/lisp/cedet/semantic/dep.el
index 03a0a2b099..f06b0f6fe3 100644
--- a/lisp/cedet/semantic/dep.el
+++ b/lisp/cedet/semantic/dep.el
@@ -231,5 +231,4 @@ provided mode, not from the current major mode."
 ;; generated-autoload-load-name: "semantic/dep"
 ;; End:
 
-;; arch-tag: f6975d6a-845f-44c5-9a22-5dfeee46dce2
 ;;; semantic/dep.el ends here
diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el
index c19b1e39bb..2804ab20e2 100644
--- a/lisp/cedet/semantic/doc.el
+++ b/lisp/cedet/semantic/doc.el
@@ -127,5 +127,4 @@ If NOSNARF is 'lex, then return the lex token."
 ;; generated-autoload-load-name: "semantic/doc"
 ;; End:
 
-;; arch-tag: fe6e965b-4a81-4304-aab8-22ca113194ca
 ;;; semantic/doc.el ends here
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index ff4064195b..3e7ccd387d 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -966,5 +966,4 @@ lost if not transferred into NEWTAG."
 ;; generated-autoload-load-name: "semantic/edit"
 ;; End:
 
-;; arch-tag: 91c7fbf0-a418-4220-a90a-b58c74b450e3
 ;;; semantic/edit.el ends here
diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el
index 207c8b0561..c58a6c2648 100644
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -700,5 +700,4 @@ details are available of findable."
 ;; generated-autoload-load-name: "semantic/find"
 ;; End:
 
-;; arch-tag: db00c93e-e561-4bd6-942b-96eca5aaa9a6
 ;;; semantic/find.el ends here
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index 86059de86f..7d4748684b 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -720,5 +720,4 @@ Optional argument COLOR means highlight the prototype with font-lock colors."
 ;; generated-autoload-load-name: "semantic/format"
 ;; End:
 
-;; arch-tag: deae500e-20b6-437e-8856-884f6c46bc3e
 ;;; semantic/format.el ends here
diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el
index 5e0eac28a3..db76530f9a 100644
--- a/lisp/cedet/semantic/fw.el
+++ b/lisp/cedet/semantic/fw.el
@@ -395,5 +395,4 @@ FILE, NOWARN, RAWFILE, and WILDCARDS are passed into `find-file-noselect'"
 
 (provide 'semantic/fw)
 
-;; arch-tag: e7eeffbf-112b-4665-92fc-5f69479ca2c4
 ;;; semantic/fw.el ends here
diff --git a/lisp/cedet/semantic/grammar-wy.el b/lisp/cedet/semantic/grammar-wy.el
index 58f7f9900e..ef5b67c361 100644
--- a/lisp/cedet/semantic/grammar-wy.el
+++ b/lisp/cedet/semantic/grammar-wy.el
@@ -475,5 +475,4 @@
 
 (provide 'semantic/grammar-wy)
 
-;; arch-tag: dd050eb7-84a8-421c-b734-478dd2bd55bc
 ;;; semantic/grammar-wy.el ends here
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 7da4d409ff..a0dbf9685c 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -262,5 +262,4 @@ tag with greater section value than LEVEL is found."
 ;; generated-autoload-load-name: "semantic/html"
 ;; End:
 
-;; arch-tag: 2a088b99-4585-46d5-bce8-3a5a8ec5eb2e
 ;;; semantic/html.el ends here
diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el
index 0e9c6456ac..08f2357eab 100644
--- a/lisp/cedet/semantic/ia-sb.el
+++ b/lisp/cedet/semantic/ia-sb.el
@@ -367,5 +367,4 @@ TEXT TAG and INDENT are the details."
 ;; generated-autoload-load-name: "semantic/ia-sb"
 ;; End:
 
-;; arch-tag: 4ab9f509-6978-415f-9938-9266edad9886
 ;;; semantic/ia-sb.el ends here
diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el
index feb6abe5ee..44f2db382a 100644
--- a/lisp/cedet/semantic/ia.el
+++ b/lisp/cedet/semantic/ia.el
@@ -445,5 +445,4 @@ parts of the parent classes are displayed."
 ;; generated-autoload-load-name: "semantic/ia"
 ;; End:
 
-;; arch-tag: ceeed1f2-e5b6-4f7c-a85a-a2f8ee0193ca
 ;;; semantic/ia.el ends here
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index a545eb469e..865315ebe0 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -1315,5 +1315,4 @@ mouse-3: popup context menu"
 ;; generated-autoload-load-name: "semantic/idle"
 ;; End:
 
-;; arch-tag: 4bfd54da-5023-4cc1-91ae-e1fefc1a8d1b
 ;;; semantic-idle.el ends here
diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el
index f0c6b44c10..c280c9668d 100644
--- a/lisp/cedet/semantic/java.el
+++ b/lisp/cedet/semantic/java.el
@@ -459,5 +459,4 @@ removed from the result list."
 
 (provide 'semantic/java)
 
-;; arch-tag: ca14cb88-9343-48a9-9aa0-14d05be8d49f
 ;;; semantic/java.el ends here
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index 9c4d4ecff1..cad85b1f42 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -1230,5 +1230,4 @@ If BUFFER is not provided, use the current buffer."
 ;; generated-autoload-load-name: "semantic/lex-spp"
 ;; End:
 
-;; arch-tag: 8877d83e-07ea-4d86-a960-e3562138d8a5
 ;;; semantic-lex-spp.el ends here
diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el
index 0f2a3f87dd..5ad1ce736e 100644
--- a/lisp/cedet/semantic/mru-bookmark.el
+++ b/lisp/cedet/semantic/mru-bookmark.el
@@ -401,5 +401,4 @@ Useful for debugging mrub problems."
 ;; generated-autoload-load-name: "semantic/mru-bookmark"
 ;; End:
 
-;; arch-tag: 297fa190-2942-460b-941d-f117db4e1fbf
 ;;; semantic/mru-bookmark.el ends here
diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el
index b6efb03094..8f8217aa2d 100644
--- a/lisp/cedet/semantic/sb.el
+++ b/lisp/cedet/semantic/sb.el
@@ -416,5 +416,4 @@ Returns the tag list, or t for an error."
 
 (provide 'semantic/sb)
 
-;; arch-tag: 82aa0570-9e27-41a3-a834-2641dbb2f829
 ;;; semantic/sb.el ends here
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 8e121264d6..d0f0a8460c 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -814,5 +814,4 @@ hits in order, with the first tag being in the closest scope."
 ;; generated-autoload-load-name: "semantic/scope"
 ;; End:
 
-;; arch-tag: 056ab514-3e28-4d6e-84ed-9283dce5a01e
 ;;; semantic/scope.el ends here
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index fd2989adbe..4ba0de9816 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -861,5 +861,4 @@ Use a senator search function when semantic isearch mode is enabled."
 ;; generated-autoload-load-name: "semantic/senator"
 ;; End:
 
-;; arch-tag: 397100d0-e2db-467e-8c19-d8d4d99d51f1
 ;;; semantic/senator.el ends here
diff --git a/lisp/cedet/semantic/sort.el b/lisp/cedet/semantic/sort.el
index 9ac87187c9..8583c1bac9 100644
--- a/lisp/cedet/semantic/sort.el
+++ b/lisp/cedet/semantic/sort.el
@@ -566,5 +566,4 @@ See `semantic-tag-external-class' for details."
 ;; generated-autoload-load-name: "semantic/sort"
 ;; End:
 
-;; arch-tag: 9231c8e7-ac7f-4b35-9302-651a02e5fef0
 ;;; semantic-sort.el ends here
diff --git a/lisp/cedet/semantic/symref/filter.el b/lisp/cedet/semantic/symref/filter.el
index 068f859512..260e9e7fd3 100644
--- a/lisp/cedet/semantic/symref/filter.el
+++ b/lisp/cedet/semantic/symref/filter.el
@@ -137,5 +137,4 @@ Depends on the SRecode Field editing API."
 
 (provide 'semantic/symref/filter)
 
-;; arch-tag: 14b9e795-02bf-408b-b375-c3f8ff6a4e38
 ;;; semantic/symref/filter.el ends here
diff --git a/lisp/cedet/semantic/symref/global.el b/lisp/cedet/semantic/symref/global.el
index 7658ed7db0..b290a0f3c3 100644
--- a/lisp/cedet/semantic/symref/global.el
+++ b/lisp/cedet/semantic/symref/global.el
@@ -70,5 +70,4 @@ Moves cursor to end of the match."
 ;; generated-autoload-load-name: "semantic/symref/global"
 ;; End:
 
-;; arch-tag: 1f061cc0-d8dd-44b1-9de3-3d00cb6e8abe
 ;;; semantic/symref/global.el ends here
diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el
index f7f1834a59..6fa2d65eba 100644
--- a/lisp/cedet/semantic/symref/grep.el
+++ b/lisp/cedet/semantic/symref/grep.el
@@ -187,5 +187,4 @@ Moves cursor to end of the match."
 ;; generated-autoload-load-name: "semantic/symref/grep"
 ;; End:
 
-;; arch-tag: 43d4469d-963c-4094-ac6f-99f7490973ce
 ;;; semantic/symref/grep.el ends here
diff --git a/lisp/cedet/semantic/symref/idutils.el b/lisp/cedet/semantic/symref/idutils.el
index b859db073e..0fc940708e 100644
--- a/lisp/cedet/semantic/symref/idutils.el
+++ b/lisp/cedet/semantic/symref/idutils.el
@@ -72,5 +72,4 @@ Moves cursor to end of the match."
 ;; generated-autoload-load-name: "semantic/symref/idutils"
 ;; End:
 
-;; arch-tag: 7e872652-cbe2-4083-a4d3-2a7c88c4c65c
 ;;; semantic/symref/idutils.el ends here
diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el
index 7127a7c206..15d51ebd3f 100644
--- a/lisp/cedet/semantic/tag-ls.el
+++ b/lisp/cedet/semantic/tag-ls.el
@@ -251,5 +251,4 @@ Return the name of TAG found in the toplevel STREAM."
 ;; generated-autoload-load-name: "semantic/tag-ls"
 ;; End:
 
-;; arch-tag: 06041439-e4bf-46f9-ab30-7805888d4464
 ;;; semantic/tag-ls.el ends here
diff --git a/lisp/cedet/semantic/tag-write.el b/lisp/cedet/semantic/tag-write.el
index 737cd79664..0c3118cc9b 100644
--- a/lisp/cedet/semantic/tag-write.el
+++ b/lisp/cedet/semantic/tag-write.el
@@ -175,5 +175,4 @@ The VALUE is a list of tags."
 ;; generated-autoload-load-name: "semantic/tag-write"
 ;; End:
 
-;; arch-tag: aa2301b3-f0c5-4d73-b456-43eaba5b2198
 ;;; semantic/tag-write.el ends here
diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el
index 267f3b9351..15cbcdaadf 100644
--- a/lisp/cedet/semantic/tag.el
+++ b/lisp/cedet/semantic/tag.el
@@ -1369,5 +1369,4 @@ and `semantic-tag-type-interfaces' instead" "23.2")
 ;; generated-autoload-load-name: "semantic/tag"
 ;; End:
 
-;; arch-tag: f7813634-c4f0-4817-a487-cbaa84333353
 ;;; semantic/tag.el ends here
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 4959f06507..881d0c6dc4 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -688,5 +688,4 @@ If TAG is nil, it is derived from the deffn under POINT."
 
 (provide 'semantic/texi)
 
-;; arch-tag: a8649049-46da-407b-a620-d175c1fedca6
 ;;; semantic/texi.el ends here
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index f2798f0d90..36d1479ac6 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -1011,5 +1011,4 @@ function was called, move the overlay."
 ;; generated-autoload-load-name: "semantic/util-modes"
 ;; End:
 
-;; arch-tag: 18f5a3d8-1fd7-4c17-b149-a313c126987d
 ;;; semantic/util-modes.el ends here
diff --git a/lisp/cedet/semantic/util.el b/lisp/cedet/semantic/util.el
index 2775153e55..0c0334dcdc 100644
--- a/lisp/cedet/semantic/util.el
+++ b/lisp/cedet/semantic/util.el
@@ -436,5 +436,4 @@ determining which symbols are considered."
 ;;
 (require 'semantic/util-modes)
 
-;; arch-tag: eaa7808d-83b9-43fe-adf0-4fb742dcb956
 ;;; semantic/util.el ends here
diff --git a/lisp/cedet/semantic/wisent.el b/lisp/cedet/semantic/wisent.el
index 36c3698943..5135ca0668 100644
--- a/lisp/cedet/semantic/wisent.el
+++ b/lisp/cedet/semantic/wisent.el
@@ -343,5 +343,4 @@ the standard function `semantic-parse-region'."
 
 (provide 'semantic/wisent)
 
-;; arch-tag: c24ddd69-d41c-4604-8221-29a93fc4fa79
 ;;; semantic/wisent.el ends here
diff --git a/lisp/cedet/semantic/wisent/java-tags.el b/lisp/cedet/semantic/wisent/java-tags.el
index b8362c3c55..d7c1b1e7d9 100644
--- a/lisp/cedet/semantic/wisent/java-tags.el
+++ b/lisp/cedet/semantic/wisent/java-tags.el
@@ -121,5 +121,4 @@ Use the alternate LALR(1) parser."
 ;; generated-autoload-load-name: "semantic/wisent/java-tags"
 ;; End:
 
-;; arch-tag: 4125e018-58db-4456-b878-e58c602f4add
 ;;; semantic/wisent/java-tags.el ends here
diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el
index 6731715d12..e5c43f73a2 100644
--- a/lisp/cedet/semantic/wisent/javascript.el
+++ b/lisp/cedet/semantic/wisent/javascript.el
@@ -102,5 +102,4 @@ This function overrides `get-local-variables'."
 ;; generated-autoload-load-name: "semantic/wisent/javascript"
 ;; End:
 
-;; arch-tag: 15416a3a-84ca-4b3b-a13c-e7a1891ec3ea
 ;;; semantic/wisent/javascript-jv.el ends here
diff --git a/lisp/cedet/semantic/wisent/javat-wy.el b/lisp/cedet/semantic/wisent/javat-wy.el
index 258b1ac4af..5b59fef160 100644
--- a/lisp/cedet/semantic/wisent/javat-wy.el
+++ b/lisp/cedet/semantic/wisent/javat-wy.el
@@ -679,5 +679,4 @@ It ignores whitespaces, newlines and comments."
 
 (provide 'semantic/wisent/javat-wy)
 
-;; arch-tag: b035ba00-e014-4c71-9bc7-a9dbf3d5b911
 ;;; semantic/wisent/javat-wy.el ends here
diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el
index 021002059f..2fd48bbc1a 100644
--- a/lisp/cedet/semantic/wisent/js-wy.el
+++ b/lisp/cedet/semantic/wisent/js-wy.el
@@ -488,5 +488,4 @@
 
 (provide 'semantic/wisent/js-wy)
 
-;; arch-tag: ff9ecf05-18e6-46a6-a3bb-e7f43f04640f
 ;;; semantic/wisent/js-wy.el ends here
diff --git a/lisp/cedet/semantic/wisent/wisent.el b/lisp/cedet/semantic/wisent/wisent.el
index 32eb638548..ac73b5f60a 100644
--- a/lisp/cedet/semantic/wisent/wisent.el
+++ b/lisp/cedet/semantic/wisent/wisent.el
@@ -476,5 +476,4 @@ automaton has only one entry point."
 
 (provide 'semantic/wisent/wisent)
 
-;; arch-tag: c299c5a4-d96f-4f1c-8307-ef2af3c8bdcb
 ;;; semantic/wisent/wisent.el ends here
diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el
index 3bc17f0dbf..00fe612f9d 100644
--- a/lisp/cedet/srecode.el
+++ b/lisp/cedet/srecode.el
@@ -52,5 +52,4 @@
 
 (provide 'srecode)
 
-;; arch-tag: 6c671a1c-40e5-4ed3-ab05-84249c3afdaf
 ;;; srecode.el ends here
diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index 0d2f017e6b..43e5d14ee3 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -186,4 +186,3 @@ do not contain any text from preceding or following text."
 
 ;;; srecode/args.el ends here
 
-;; arch-tag: 645fc31e-30a9-469b-9215-fb320a46ee96
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index b404c4a812..0abbcb3ac6 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -654,5 +654,4 @@ Argument INDENT specifies the indentation level for the list."
 ;; generated-autoload-load-name: "srecode/compile"
 ;; End:
 
-;; arch-tag: d993ffab-2704-4bb2-bd92-eafe803af3be
 ;;; srecode/compile.el ends here
diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el
index ab9d4a5fe6..62ee6be42e 100644
--- a/lisp/cedet/srecode/cpp.el
+++ b/lisp/cedet/srecode/cpp.el
@@ -213,5 +213,4 @@ special behavior for tag of classes include, using and function."
 ;; generated-autoload-load-name: "srecode/cpp"
 ;; End:
 
-;; arch-tag: 4659755c-88b4-405e-818f-bb1f776a8e82
 ;;; srecode/cpp.el ends here
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index b951788bec..ad42e1b500 100644
--- a/lisp/cedet/srecode/ctxt.el
+++ b/lisp/cedet/srecode/ctxt.el
@@ -244,5 +244,4 @@ This might add the following:
 
 (provide 'srecode/ctxt)
 
-;; arch-tag: 5a004702-28e5-4e26-9b14-8a78eae49865
 ;;; srecode/ctxt.el ends here
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index e04aad3306..30052c0749 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -708,5 +708,4 @@ STATE is the current compiler state."
 
 (provide 'srecode/dictionary)
 
-;; arch-tag: c664179c-171c-4709-9b56-d5a2fd30e457
 ;;; srecode/dictionary.el ends here
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index 6d4231f396..210c303055 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -837,5 +837,4 @@ not account for verb parts."
 ;; generated-autoload-load-name: "srecode/document"
 ;; End:
 
-;; arch-tag: 5ce9b30b-7862-4ab8-b3f8-a4df37a2e0fe
 ;;; srecode/document.el ends here
diff --git a/lisp/cedet/srecode/el.el b/lisp/cedet/srecode/el.el
index e8c585cca6..9d051d6d20 100644
--- a/lisp/cedet/srecode/el.el
+++ b/lisp/cedet/srecode/el.el
@@ -109,5 +109,4 @@ Calls `srecode-semantic-apply-tag-to-dict-default' first."
 ;; generated-autoload-load-name: "srecode/el"
 ;; End:
 
-;; arch-tag: c1852a36-d45b-4263-8f3e-03f4f3c795d9
 ;;; srecode/el.el ends here
diff --git a/lisp/cedet/srecode/expandproto.el b/lisp/cedet/srecode/expandproto.el
index 92c5326a85..9ff766ad52 100644
--- a/lisp/cedet/srecode/expandproto.el
+++ b/lisp/cedet/srecode/expandproto.el
@@ -129,5 +129,4 @@
 ;; generated-autoload-load-name: "srecode/expandproto"
 ;; End:
 
-;; arch-tag: f0371b5f-9bec-46a1-9b5d-8dff0e897426
 ;;; srecode/expandproto.el ends here
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index df556b29e0..4d3f533a35 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -239,5 +239,4 @@ Return nil if nothing was extracted."
 
 (provide 'srecode/extract)
 
-;; arch-tag: 051f5901-46ae-4319-8c84-16daf971e226
 ;;; srecode/extract.el ends here
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el
index 817bb93d2f..ae9bf3502f 100644
--- a/lisp/cedet/srecode/fields.el
+++ b/lisp/cedet/srecode/fields.el
@@ -447,5 +447,4 @@ PRE-LEN is used in the after mode for the length of the changed text."
 
 (provide 'srecode/fields)
 
-;; arch-tag: 00cea6f0-42ac-4b15-b778-46e6db0bfcb5
 ;;; srecode/fields.el ends here
diff --git a/lisp/cedet/srecode/filters.el b/lisp/cedet/srecode/filters.el
index 0afd32bbb4..4b8a8abfec 100644
--- a/lisp/cedet/srecode/filters.el
+++ b/lisp/cedet/srecode/filters.el
@@ -54,4 +54,3 @@
 
 ;;; srecode/filters.el ends here
 
-;; arch-tag: fcc95ddc-8d9a-4b15-bb51-2707ead986c7
diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el
index 39b7656d00..888e4b6bd9 100644
--- a/lisp/cedet/srecode/find.el
+++ b/lisp/cedet/srecode/find.el
@@ -278,5 +278,4 @@ DEFAULT is what to use if the user presses RET."
 
 (provide 'srecode/find)
 
-;; arch-tag: 49d18e58-45a0-48f5-92e1-4a1dcd4e36a6
 ;;; srecode/find.el ends here
diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el
index bf1a684c19..b865b5ec62 100644
--- a/lisp/cedet/srecode/getset.el
+++ b/lisp/cedet/srecode/getset.el
@@ -363,5 +363,4 @@ Base selection on the field related to POINT."
 ;; generated-autoload-load-name: "srecode/getset"
 ;; End:
 
-;; arch-tag: c2098b7a-df7f-4e8a-a9e3-2be8798a7554
 ;;; srecode/getset.el ends here
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 1df08d2c74..f69706370d 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -1020,5 +1020,4 @@ template where a ^ inserter occurs."
 ;; generated-autoload-load-name: "srecode/insert"
 ;; End:
 
-;; arch-tag: a5aa3401-924a-4617-8513-2f0f01256872
 ;;; srecode/insert.el ends here
diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el
index 97f4eb3459..5393b83aa6 100644
--- a/lisp/cedet/srecode/java.el
+++ b/lisp/cedet/srecode/java.el
@@ -58,5 +58,4 @@ FILENAME_AS_CLASS - file converted to a Java class name."
 ;; generated-autoload-load-name: "srecode/java"
 ;; End:
 
-;; arch-tag: d796b86c-3a0e-457c-a346-9f1ccfdc5e2c
 ;;; srecode/java.el ends here
diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el
index e3f78ed997..d6da232bd3 100644
--- a/lisp/cedet/srecode/map.el
+++ b/lisp/cedet/srecode/map.el
@@ -415,5 +415,4 @@ Return non-nil if the map changed."
 ;; generated-autoload-load-name: "srecode/map"
 ;; End:
 
-;; arch-tag: dc90c737-1e87-455a-bbd1-6b72cdbfb7fd
 ;;; srecode/map.el ends here
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index bdb8172eb5..30797453fb 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -396,5 +396,4 @@ programming modes."
 ;; generated-autoload-load-name: "srecode/mode"
 ;; End:
 
-;; arch-tag: 56ad9d6b-899b-4a68-8636-1432b6bc149b
 ;;; srecode/mode.el ends here
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 0926ccf4da..5991b0f9b6 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -428,5 +428,4 @@ as `function' will leave point where code might be inserted."
 
 (provide 'srecode/semantic)
 
-;; arch-tag: b87ccbd6-bd87-48bc-8182-1043a9052d79
 ;;; srecode/semantic.el ends here
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 7df06a608f..5e16303425 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -740,5 +740,4 @@ When optional BUFFER is provided, search that buffer."
 ;; generated-autoload-load-name: "srecode/srt-mode"
 ;; End:
 
-;; arch-tag: 9c613c25-d885-417a-8f0d-1824b26b22a5
 ;;; srecode/srt-mode.el ends here
diff --git a/lisp/cedet/srecode/srt-wy.el b/lisp/cedet/srecode/srt-wy.el
index 3dde065c2a..9281451694 100644
--- a/lisp/cedet/srecode/srt-wy.el
+++ b/lisp/cedet/srecode/srt-wy.el
@@ -274,5 +274,4 @@ It ignores whitespace, newlines and comments."
 
 (provide 'srecode/srt-wy)
 
-;; arch-tag: 1be4c0bc-2a79-4f75-a07a-1ac518f41271
 ;;; srecode/srt-wy.el ends here
diff --git a/lisp/cedet/srecode/srt.el b/lisp/cedet/srecode/srt.el
index 3fc5f4cb90..e070e59fd9 100644
--- a/lisp/cedet/srecode/srt.el
+++ b/lisp/cedet/srecode/srt.el
@@ -104,5 +104,4 @@ MODE - The mode of this buffer.  If not declared yet, guess."
 
 (provide 'srecode/srt)
 
-;; arch-tag: fb69da04-0bd6-48fe-b935-f8668420ecaf
 ;;; srecode/srt.el ends here
diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el
index 8cba7aff7f..c80c88c8fb 100644
--- a/lisp/cedet/srecode/table.el
+++ b/lisp/cedet/srecode/table.el
@@ -259,4 +259,3 @@ Use PREDICATE is the same as for the `sort' function."
 
 ;;; srecode/table.el ends here
 
-;; arch-tag: 547d2f1d-2694-49b3-ab13-b2cda6b25b4d
diff --git a/lisp/cedet/srecode/template.el b/lisp/cedet/srecode/template.el
index d127375fbf..d61146e164 100644
--- a/lisp/cedet/srecode/template.el
+++ b/lisp/cedet/srecode/template.el
@@ -72,5 +72,4 @@
 ;; generated-autoload-load-name: "srecode/template"
 ;; End:
 
-;; arch-tag: 037fbca7-e846-4521-b801-3463f50c3080
 ;;; srecode/template.el ends here
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 2ac2a240c0..e581a185cd 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -285,5 +285,4 @@ that class.
 ;; generated-autoload-load-name: "srecode/texi"
 ;; End:
 
-;; arch-tag: 6f0e7f45-2281-49e4-b73c-680cba477094
 ;;; srecode/texi.el ends here
diff --git a/lisp/chistory.el b/lisp/chistory.el
index 9cc6d86605..bd3539b2e9 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -189,5 +189,4 @@ and runs the normal hook `command-history-hook'."
 
 (provide 'chistory)
 
-;; arch-tag: c201a0cd-89f2-4d39-a532-4cb309391dbd
 ;;; chistory.el ends here
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index be3401ce5b..c319ecf135 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -523,5 +523,4 @@ This is a good place to put keybindings."
 
 (provide 'cmuscheme)
 
-;; arch-tag: e8795f4a-c496-45a2-97b4-8e0f2a2c57d2
 ;;; cmuscheme.el ends here
diff --git a/lisp/completion.el b/lisp/completion.el
index b0e2c40448..1f052b6029 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -2470,5 +2470,4 @@ TYPE is the type of the wrapper to be added.  Can be :before or :under."
 
 (provide 'completion)
 
-;; arch-tag: 6990dafe-4abd-4a1f-8c42-ffb25e120f5e
 ;;; completion.el ends here
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 02920f10bc..734a3d3ddf 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -172,5 +172,4 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
 
 
 
-;; arch-tag: b7b6421a-bf7a-44fd-a382-6f44976bdf68
 ;;; cus-dep.el ends here
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 7868de8da2..70686296ad 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4863,5 +4863,4 @@ if that value is non-nil."
 
 (provide 'cus-edit)
 
-;; arch-tag: 64533aa4-1b1a-48c3-8812-f9dc718e8a6f
 ;;; cus-edit.el ends here
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index befccf8a7e..f669310117 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -378,5 +378,4 @@ This means reset FACE to its value in FROM-THEME."
 
 (provide 'cus-face)
 
-;; arch-tag: 9a5c4b63-0d27-4c92-a5af-f2c7ed764c2b
 ;;; cus-face.el ends here
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index e38cc823eb..df05a30738 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -663,5 +663,4 @@ Theme files are named *-theme.el in `"))
   (widget-toggle-action widget event)
   (setq custom-theme-allow-multiple-selections (widget-value widget)))
 
-;; arch-tag: cd6919bc-63af-410e-bae2-b6702e762344
 ;;; cus-theme.el ends here
diff --git a/lisp/custom.el b/lisp/custom.el
index 2d8891f0e1..f5da8eb595 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1409,5 +1409,4 @@ This means reset VARIABLE.  (The argument IGNORED is ignored)."
 
 (provide 'custom)
 
-;; arch-tag: 041b6116-aabe-4f9a-902d-74092bc3dab2
 ;;; custom.el ends here
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 4bc3a33f4e..063ba40874 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -995,5 +995,4 @@ Leaves point at the location of the start of the expansion."
 
 (provide 'dabbrev)
 
-;; arch-tag: 29e58596-f080-4306-a409-70296cf9d46f
 ;;; dabbrev.el ends here
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 01791b8fc8..422cfbc81a 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -477,5 +477,4 @@ START and END delimits the corners of text rectangle."
 (provide 'delim-col)
 
 
-;; arch-tag: 1cc0c5c5-1b2a-43e4-9ba5-bf9441cfd1a9
 ;;; delim-col.el ends here
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 5f08fd8791..bc89e18e85 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -177,5 +177,4 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
 
 (provide 'delsel)
 
-;; arch-tag: 1e388890-1b50-4ed0-9347-763b1343b6ed
 ;;; delsel.el ends here
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 65761e752b..65590a737f 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -769,5 +769,4 @@ as well as widgets, buttons, overlays, and text properties."
 
 (provide 'descr-text)
 
-;; arch-tag: fc55a498-f3e9-4312-b5bd-98cc02480af1
 ;;; descr-text.el ends here
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 9be0ad74ad..dcb8642734 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1312,5 +1312,4 @@ If there are no buffers left to create, kill the timer."
 
 (provide 'desktop)
 
-;; arch-tag: 221907c3-1771-4fd3-9c2e-c6f700c6ede9
 ;;; desktop.el ends here
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 591451d5a8..266308ce0b 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1830,5 +1830,4 @@ variables `dired-x-variable-list' in the message."
 ;; generated-autoload-file: "dired.el"
 ;; End:
 
-;; arch-tag: 71a43ba2-7a00-4793-a028-0613dd7765ae
 ;;; dired-x.el ends here
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index af45a70b8d..0cf19577ff 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -281,5 +281,4 @@ in `.emacs'."
 
 (provide 'disp-table)
 
-;; arch-tag: ffe4c28c-960c-47aa-b8a8-ae89d371ffc7
 ;;; disp-table.el ends here
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 4f70048097..757fc951b5 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -227,5 +227,4 @@ TEXT is the text as a string, WINDOW is the window where the drop happened."
 
 (provide 'dnd)
 
-;; arch-tag: 0472f6a5-2e8f-4304-9e44-1a0877c771b7
 ;;; dnd.el ends here
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 12632e8933..5867c74dbf 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -1481,5 +1481,4 @@ See the command `doc-view-mode' for more information on this mode."
 ;; mode: outline-minor
 ;; End:
 
-;; arch-tag: 5d6e5c5e-095f-489e-b4e4-1ca90a7d79be
 ;;; doc-view.el ends here
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index 213d436161..eaf6ab02ce 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -313,5 +313,4 @@ that your video hardware might not support 50-line mode."
 
 (provide 'dos-fns)
 
-;; arch-tag: 00b03579-8ebb-4a02-8762-5c5a929774ad
 ;;; dos-fns.el ends here
diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el
index 03bfc88565..1b769fbd0f 100644
--- a/lisp/dos-vars.el
+++ b/lisp/dos-vars.el
@@ -44,5 +44,4 @@ in `standard-display-table' as appropriate for your codepage, if
   :type '(hook)
   :version "20.3.3")
 
-;; arch-tag: dce8a0d9-ab29-413f-84ed-8b89d6190546
 ;;; dos-vars.el ends here
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index c163aae857..c4c9c20b42 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -458,5 +458,4 @@ indicates a specific program should be invoked."
 
 (provide 'dos-w32)
 
-;; arch-tag: dcfefdd2-362f-4fbc-9141-9634f5f4d6a7
 ;;; dos-w32.el ends here
diff --git a/lisp/double.el b/lisp/double.el
index 19702c9bef..853ba09e2c 100644
--- a/lisp/double.el
+++ b/lisp/double.el
@@ -169,5 +169,4 @@ when pressed twice.  See variable `double-map' for details."
 
 (provide 'double)
 
-;; arch-tag: 2e170036-44cb-4493-bc32-ada0a4395221
 ;;; double.el ends here
diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el
index 3597e8338e..1f6f43e75d 100644
--- a/lisp/dynamic-setting.el
+++ b/lisp/dynamic-setting.el
@@ -107,4 +107,3 @@ Changes can be
 (define-key special-event-map [config-changed-event]
   'dynamic-setting-handle-config-changed-event)
 
-;; arch-tag: 3a57e78f-1cd6-48b6-ab75-98f160dcc017
diff --git a/lisp/echistory.el b/lisp/echistory.el
index 8d69d64228..3c0a4a0b8b 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -150,5 +150,4 @@ The Command History listing is recomputed each time this mode is invoked."
 
 (provide 'echistory)
 
-;; arch-tag: 1e5018fe-190f-44a7-9109-a895dcac4c50
 ;;; echistory.el ends here
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index d4b8c3a4f7..2aa80a000b 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -785,5 +785,4 @@ This function assumes that the events can be stored in a string."
 
 (provide 'edmacro)
 
-;; arch-tag: 726807b4-3ae6-49de-b0ae-b9590973e0d7
 ;;; edmacro.el ends here
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index adaff345bf..d0f620e487 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -426,5 +426,4 @@ will select it.)"
 
 (provide 'ehelp)
 
-;; arch-tag: e0e3037f-42c0-433e-ba18-322c5d951f46
 ;;; ehelp.el ends here
diff --git a/lisp/electric.el b/lisp/electric.el
index e1c91e8be3..f777ac1af5 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -383,5 +383,4 @@ one of those symbols.")
 
 (provide 'electric)
 
-;; arch-tag: dae045eb-dc2d-4fb7-9f27-9cc2ce277be8
 ;;; electric.el ends here
diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index 085e71ad0b..bc603e068a 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -119,5 +119,4 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks."
 
 (provide 'elide-head)
 
-;; arch-tag: a00e6b5b-6aeb-45b1-b734-63e23df80928
 ;;; elide-head.el ends here
diff --git a/lisp/emacs-lisp/.gitignore b/lisp/emacs-lisp/.gitignore
index 88830a1c6e..133e79e817 100644
--- a/lisp/emacs-lisp/.gitignore
+++ b/lisp/emacs-lisp/.gitignore
@@ -1,3 +1,2 @@
 !*-loaddefs.el
 
-# arch-tag: d0a60bce-b886-4817-b4c3-9a81ba0308bc
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index c4cee41dcb..a0aab822cf 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3966,5 +3966,4 @@ Use only in REAL emergencies."
 
 (provide 'advice)
 
-;; arch-tag: 29f8c9a1-8c88-471f-95d7-e28541c6b7c0
 ;;; advice.el ends here
diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el
index e90c9df7f8..c506685dd3 100644
--- a/lisp/emacs-lisp/assoc.el
+++ b/lisp/emacs-lisp/assoc.el
@@ -138,5 +138,4 @@ extra values are ignored.  Returns the created alist."
 
 (provide 'assoc)
 
-;; arch-tag: 3e58bd89-d912-4b74-a0dc-6ed9735922bc
 ;;; assoc.el ends here
diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el
index 63774bc229..3892a94788 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -466,5 +466,4 @@ If there is no such element in the tree, the value is nil."
 
 (provide 'avl-tree)
 
-;; arch-tag: 47e26701-43c9-4222-bd79-739eac6357a9
 ;;; avl-tree.el ends here
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index 9d43ad5bc1..9cb0a0cd89 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -241,5 +241,4 @@ LEVEL is only used internally and indicates the nesting level:
 	tail))
      (t (cons 'list heads)))))
 
-;; arch-tag: 1a26206a-6b5e-4c56-8e24-2eef0f7e0e7a
 ;;; backquote.el ends here
diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el
index 8f6d8a5d9d..31d3b61c5a 100644
--- a/lisp/emacs-lisp/benchmark.el
+++ b/lisp/emacs-lisp/benchmark.el
@@ -116,5 +116,4 @@ For non-interactive use see also `benchmark-run' and
 
 (provide 'benchmark)
 
-;; arch-tag: be570e24-4b51-4784-adf3-fa2b56c31946
 ;;; benchmark.el ends here
diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el
index 244b838fa2..91a30860b1 100644
--- a/lisp/emacs-lisp/bindat.el
+++ b/lisp/emacs-lisp/bindat.el
@@ -649,5 +649,4 @@ The port (if any) is omitted.  IP can be a string, as well."
 
 (provide 'bindat)
 
-;; arch-tag: 5e6708c3-03e2-4ad7-9885-5041b779c3fb
 ;;; bindat.el ends here
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index eb80fcf43b..46a5f4d7c1 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -292,5 +292,4 @@ In interpreted code, this is entirely equivalent to `progn'."
 ;;       (file-format emacs19))"
 ;;   nil)
 
-;; arch-tag: 76f8328a-1f66-4df2-9b6d-5c3666dc05e9
 ;;; byte-run.el ends here
diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el
index a84be94056..f3e13e5d8c 100644
--- a/lisp/emacs-lisp/check-declare.el
+++ b/lisp/emacs-lisp/check-declare.el
@@ -314,5 +314,4 @@ Returns non-nil if any false statements are found."
 
 (provide 'check-declare)
 
-;; arch-tag: a4d6cdc4-deb7-4502-b327-0e4ef3d82d96
 ;;; check-declare.el ends here.
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index eae4489074..cb58316ebc 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -826,5 +826,4 @@ This also does some trivial optimizations to make the form prettier."
 ;; generated-autoload-file: "cl-loaddefs.el"
 ;; End:
 
-;; arch-tag: bcd03437-0871-43fb-a8f1-ad0e0b5427ed
 ;;; cl-extra.el ends here
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 9c021fa70e..59ec8a203b 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -691,5 +691,4 @@ For example, the function `case' has an indent property
 ;(put 'defclass 'common-lisp-indent-function '((&whole 2 &rest (&whole 2 &rest 1) &rest (&whole 2 &rest 1)))
 ;(put 'defgeneric 'common-lisp-indent-function 'defun)
 
-;; arch-tag: 7914d50f-92ec-4476-93fc-0f043a380e03
 ;;; cl-indent.el ends here
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index 31a7eed448..fc73aebe5f 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -1018,5 +1018,4 @@ Atoms are compared by `eql'; cons cells are compared recursively.
 ;; generated-autoload-file: "cl-loaddefs.el"
 ;; End:
 
-;; arch-tag: ec1cc072-9006-4225-b6ba-d6b07ed1710c
 ;;; cl-seq.el ends here
diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el
index 9dab72fae4..5224f1aed2 100644
--- a/lisp/emacs-lisp/cl-specs.el
+++ b/lisp/emacs-lisp/cl-specs.el
@@ -469,5 +469,4 @@
 (def-edebug-spec loop-d-type-spec
   (&or (loop-d-type-spec . [&or nil loop-d-type-spec]) cl-type-spec))
 
-;; arch-tag: b29aa3c2-cf67-4af8-9ee1-318fea61b478
 ;;; cl-specs.el ends here
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 41be827d67..c01c6f1527 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -676,5 +676,4 @@ If ALIST is non-nil, the new pairs are prepended to it."
 ;; byte-compile-warnings: (not cl-functions)
 ;; End:
 
-;; arch-tag: 5f07fa74-f153-4524-9303-21f5be125851
 ;;; cl.el ends here
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index b9071d3f96..8e7fc9a012 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -311,5 +311,4 @@ Uses heuristic: year >= 50 means 19xx, < 50 means 20xx."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: b4991afb-b6b1-4590-bebe-e076d9d4aee8
 ;;; copyright.el ends here
diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index 8c7d48d7e0..83dbc40c20 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -321,5 +321,4 @@ INHERIT-INPUT-METHOD."
 
 (provide 'crm)
 
-;; arch-tag: db1911d9-86c6-4a42-b32a-4910701b15a6
 ;;; crm.el ends here
diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el
index 5b8ce9909b..ff3c881ef9 100644
--- a/lisp/emacs-lisp/cust-print.el
+++ b/lisp/emacs-lisp/cust-print.el
@@ -681,5 +681,4 @@ See `custom-format' for the details."
 
 (provide 'cust-print)
 
-;; arch-tag: 3a5a8650-622c-48c4-87d8-e01bf72ec580
 ;;; cust-print.el ends here
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 12189862d6..7cfcaab1d7 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -890,5 +890,4 @@ To specify a nil argument interactively, exit with an empty minibuffer."
 
 (provide 'debug)
 
-;; arch-tag: b6ec7047-f801-4103-9c63-d69322db9d3b
 ;;; debug.el ends here
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 7936bc67af..9886c69c81 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -457,5 +457,4 @@ Where the new table already has an entry, nothing is copied from the old one."
 
 (provide 'derived)
 
-;; arch-tag: 630be248-47d1-4f02-afa0-8207de0ebea0
 ;;; derived.el ends here
diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index ae69f13143..dc33804213 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -264,5 +264,4 @@ OBJ should be a call to BYTE-CODE generated by the byte compiler."
 
 (provide 'disass)
 
-;; arch-tag: 89482fe4-a087-4761-8dc6-d771054e763a
 ;;; disass.el ends here
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index fe096b091d..ac0853a054 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -676,5 +676,4 @@ In some cases we use that to select between the local and global maps."
 
 (provide 'easymenu)
 
-;; arch-tag: 2a04020d-90d2-476d-a7c6-71e072007a4a
 ;;; easymenu.el ends here
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index 2ed82682ab..71f37188fc 100644
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -329,5 +329,4 @@ a set type."
 
 (provide 'eieio-base)
 
-;; arch-tag: 6260571e-9e8a-41a0-880f-a937b0c2ea8b
 ;;; eieio-base.el ends here
diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el
index 6de13cfe31..993a71284d 100644
--- a/lisp/emacs-lisp/eieio-custom.el
+++ b/lisp/emacs-lisp/eieio-custom.el
@@ -461,5 +461,4 @@ Return the symbol for the group, or nil"
 
 (provide 'eieio-custom)
 
-;; arch-tag: bc122762-a771-48d5-891b-7835b16dd924
 ;;; eieio-custom.el ends here
diff --git a/lisp/emacs-lisp/eieio-datadebug.el b/lisp/emacs-lisp/eieio-datadebug.el
index 20b129aed1..5baff64a37 100644
--- a/lisp/emacs-lisp/eieio-datadebug.el
+++ b/lisp/emacs-lisp/eieio-datadebug.el
@@ -145,5 +145,4 @@ PREBUTTONTEXT is some text between PREFIX and the object button."
 
 (provide 'eieio-datadebug)
 
-;; arch-tag: 6c7c2890-7614-41b0-816b-c61f3f6a8130
 ;;; eieio-datadebug.el ends here
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index db7de6e3f9..73db22d48e 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -693,5 +693,4 @@ INDENT is the current indentation level."
 
 (provide 'eieio-opt)
 
-;; arch-tag: 71eab5f5-462f-4fa1-8ed1-f5ca1bf9adb6
 ;;; eieio-opt.el ends here
diff --git a/lisp/emacs-lisp/eieio-speedbar.el b/lisp/emacs-lisp/eieio-speedbar.el
index a8d096b60b..e48ce43e00 100644
--- a/lisp/emacs-lisp/eieio-speedbar.el
+++ b/lisp/emacs-lisp/eieio-speedbar.el
@@ -422,5 +422,4 @@ to create a speedbar button."
 
 (provide 'eieio-speedbar)
 
-;; arch-tag: eaac1283-10b0-4419-a929-982b87e83234
 ;;; eieio-speedbar.el ends here
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 4c4eddeb8a..4db5e7979b 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -2956,5 +2956,4 @@ Optional argument NOESCAPE is passed to `prin1-to-string' when appropriate."
 
 (provide 'eieio)
 
-;; arch-tag: c1aeab9c-2938-41a3-842b-1a38bd26e9f2
 ;;; eieio ends here
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 9f74168815..4dc1ced246 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -540,5 +540,4 @@ The words \"&rest\", \"&optional\" are returned unchanged."
 
 (provide 'eldoc)
 
-;; arch-tag: c9a58f9d-2055-46c1-9b82-7248b71a8375
 ;;; eldoc.el ends here
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 9a66527285..97f96e76f2 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -660,5 +660,4 @@ displayed."
 
 (provide 'elp)
 
-;; arch-tag: c4eef311-9b3e-4bb2-8a54-3485d41b4eb1
 ;;; elp.el ends here
diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el
index 9928f8f75c..f70fb6955b 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -578,5 +578,4 @@ Return nil if the buffer has been deleted."
 ;; eval: (put 'ewoc--set-buffer-bind-dll-let* 'lisp-indent-hook 2)
 ;; End:
 
-;; arch-tag: d78915b9-9a07-44bf-aac6-04a1fc1bd6d4
 ;;; ewoc.el ends here
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 11318aaab5..9f9391a5aa 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -563,5 +563,4 @@ Set mark before moving, if the buffer already existed."
 
 (provide 'find-func)
 
-;; arch-tag: 43ecd81c-74dc-4d9a-8f63-a61e55670d64
 ;;; find-func.el ends here
diff --git a/lisp/emacs-lisp/find-gc.el b/lisp/emacs-lisp/find-gc.el
index 00c7c0556b..b78a55242a 100644
--- a/lisp/emacs-lisp/find-gc.el
+++ b/lisp/emacs-lisp/find-gc.el
@@ -159,5 +159,4 @@ Also store it in `find-gc-unsafe'."
 
 (provide 'find-gc)
 
-;; arch-tag: 4a26a538-a008-40d9-a1ef-23bb6dbecef4
 ;;; find-gc.el ends here
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index 8178cef7a4..507bd0c160 100644
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -316,5 +316,4 @@ regular expression that can be used as an element of
 
 (provide 'generic)
 
-;; arch-tag: 239c1fc4-1303-48d9-9ac0-657d655669ea
 ;;; generic.el ends here
diff --git a/lisp/emacs-lisp/gulp.el b/lisp/emacs-lisp/gulp.el
index fe8c6e7fae..43055fb995 100644
--- a/lisp/emacs-lisp/gulp.el
+++ b/lisp/emacs-lisp/gulp.el
@@ -175,5 +175,4 @@ That is a list of elements, each of the form (MAINTAINER PACKAGES...)."
 
 (provide 'gulp)
 
-;; arch-tag: 42750a11-460a-4efc-829f-342d075530e5
 ;;; gulp.el ends here
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index c54e3898e5..5dc9f08a58 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -156,5 +156,4 @@
 
 (provide 'helper)
 
-;; arch-tag: a0984577-d3e9-4124-ae0d-c46fe740f6a9
 ;;; helper.el ends here
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index b772c25dcb..809a75db52 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -616,5 +616,4 @@ Prompts for bug subject TOPIC.  Leaves you in a mail buffer."
 
 (provide 'lisp-mnt)
 
-;; arch-tag: fa3c5ab4-a37b-4e46-b7cf-b6d78b90e69e
 ;;; lisp-mnt.el ends here
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 5f81cb42f8..3ad38eb195 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -690,5 +690,4 @@ considered."
 	      (unless (eq predicate 'fboundp)
 		(lambda (str) (if (fboundp (intern-soft str)) " <f>"))))))))
 
-;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e
 ;;; lisp.el ends here
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 48839936d7..da918c8911 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -182,5 +182,4 @@ definitions to shadow the loaded ones for use in file byte-compilation."
 
 (provide 'macroexp)
 
-;; arch-tag: af9b8c24-c196-43bc-91e1-a3570790fa5a
 ;;; macroexp.el ends here
diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index aefc631c3b..931cf27a21 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -275,5 +275,4 @@ the current %s and exit."
     ;; Return the number of actions that were taken.
     actions))
 
-;; arch-tag: 1d0a3201-a151-4c10-b231-4da47c9e6dc3
 ;;; map-ynp.el ends here
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 34ac4f95d5..7846da0060 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -202,5 +202,4 @@ Ignores leading comment characters."
 
 (provide 'pp)				; so (require 'pp) works
 
-;; arch-tag: b0f7c65b-02c7-42bb-9ee3-508a59b8fbb9
 ;;; pp.el ends here
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index fa05c190e6..07d5b0e52e 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -713,5 +713,4 @@ If SUBEXP is non-nil mark only the corresponding sub-expressions."
 
 (provide 're-builder)
 
-;; arch-tag: 5c5515ac-4085-4524-a421-033f44f032e7
 ;;; re-builder.el ends here
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 9c82fa09fc..e2ae390d19 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -293,5 +293,4 @@ Merges keywords to avoid backtracking in Emacs' regexp matcher."
 
 (provide 'regexp-opt)
 
-;; arch-tag: 6c5a66f4-29af-4fd6-8c3b-4b554d5b4370
 ;;; regexp-opt.el ends here
diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el
index 53cf21b2f9..7e961a01fb 100644
--- a/lisp/emacs-lisp/regi.el
+++ b/lisp/emacs-lisp/regi.el
@@ -254,5 +254,4 @@ useful information:
 
 (provide 'regi)
 
-;; arch-tag: 804b4e45-4109-4f76-9a88-21887b881747
 ;;; regi.el ends here
diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index 91ea5a93aa..41afd5be4f 100644
--- a/lisp/emacs-lisp/ring.el
+++ b/lisp/emacs-lisp/ring.el
@@ -236,5 +236,4 @@ If SEQ is already a ring, return it."
 
 (provide 'ring)
 
-;; arch-tag: e707682b-ed69-47c9-b20f-cf2c68cc92d2
 ;;; ring.el ends here
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index f7e0e44b0c..7763d93c97 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -578,5 +578,4 @@ Point is at POS when this function returns."
 
 (provide 'syntax)
 
-;; arch-tag: 302f1eeb-e77c-4680-a8c5-c543e01161a5
 ;;; syntax.el ends here
diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index ad5234d6f0..2446ac7552 100644
--- a/lisp/emacs-lisp/tcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
@@ -722,5 +722,4 @@ spreadsheet files with invalid formatting."
   ;;Could do this here: (testcover-end "ses.el")
   (message "Done"))
 
-;; arch-tag: 87052ba4-5cf8-46cf-9375-fe245f3360b8
 ;; testcover-ses.el ends here.
diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el
index 4c75063220..42dc6bc1a5 100644
--- a/lisp/emacs-lisp/tcover-unsafep.el
+++ b/lisp/emacs-lisp/tcover-unsafep.el
@@ -138,5 +138,4 @@
   (testcover-end "unsafep.el")
   (message "Done"))
 
-;; arch-tag: a7616c27-1998-47ae-9304-76d1439dbf29
 ;; testcover-unsafep.el ends here.
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index aeefa1bcca..ce5eb2e70f 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -534,5 +534,4 @@ coverage tests.  This function creates many overlays."
   (goto-char (next-overlay-change (point)))
   (end-of-line))
 
-;; arch-tag: 72324a4a-4a2e-4142-9249-cc56d6757588
 ;; testcover.el ends here.
diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el
index f310609ec1..2e3f56af4d 100644
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -167,5 +167,4 @@ This produces more reliable results with some processes."
 
 (provide 'tq)
 
-;; arch-tag: 65dea08c-4edd-4cde-83a5-e8a15b993b79
 ;;; tq.el ends here
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 77b8e1e118..df05bc00a7 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -299,5 +299,4 @@ was not traced this is a noop."
 
 (provide 'trace)
 
-;; arch-tag: cfd170a7-4932-4331-8c8b-b7151942e5a1
 ;;; trace.el ends here
diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el
index d31777ba9d..fb3163455b 100644
--- a/lisp/emacs-lisp/unsafep.el
+++ b/lisp/emacs-lisp/unsafep.el
@@ -261,5 +261,4 @@ If TO-BIND is t, check whether SYM is safe to bind."
 	     (local-variable-p sym)))
     `(global-variable ,sym))))
 
-;; arch-tag: 6216f98b-eb8f-467a-9c33-7a7644f50658
 ;;; unsafep.el ends here
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 28c20cbc79..c14ccbc386 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -337,5 +337,4 @@ this is equivalent to `display-warning', using
 
 (provide 'warnings)
 
-;; arch-tag: faaad1c8-7b2a-4161-af38-5ab4afde0496
 ;;; warnings.el ends here
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index bf6b4446bf..8cf2e8c839 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -98,5 +98,4 @@ If the buffer is locked, signal error and display its name."
 
 (provide 'emacs-lock)
 
-;; arch-tag: 58e6cb43-7cf0-401a-bcb6-4902a0b8bdc1
 ;;; emacs-lock.el ends here
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index f3145227df..25a2a6043a 100644
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -381,5 +381,4 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise."
 (run-hooks 'crisp-load-hook)
 (provide 'crisp)
 
-;; arch-tag: e5369375-fafb-4240-b7ae-4cb460ef05ee
 ;;; crisp.el ends here
diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el
index d02d4b9cdc..701ac0f4ff 100644
--- a/lisp/emulation/cua-gmrk.el
+++ b/lisp/emulation/cua-gmrk.el
@@ -381,5 +381,4 @@ With prefix argument, don't jump to global mark when cancelling it."
 
 (provide 'cua-gmrk)
 
-;; arch-tag: 553d8076-a91d-48ae-825d-6cb962a5f67f
 ;;; cua-gmrk.el ends here
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 1d8fdcd1af..0c825686b1 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -1492,5 +1492,4 @@ With prefix arg, indent to that column."
 
 (provide 'cua-rect)
 
-;; arch-tag: b730df53-17b9-4a89-bd63-4a71ec196731
 ;;; cua-rect.el ends here
diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el
index 6183946ee9..7de9cfbc61 100644
--- a/lisp/emulation/edt-lk201.el
+++ b/lisp/emulation/edt-lk201.el
@@ -57,5 +57,4 @@
     ("HELP" . [help]) ("DO" . [menu]) ("F17" . [f17]) ("F18" . [f18])
     ("F19" . [f19]) ("F20" . [f20])))
 
-;; arch-tag: 36f498cf-c3f6-41b0-911b-83b1348855ec
 ;;; edt-lk201.el ends here
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index 87359af665..da85e1b073 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -547,5 +547,4 @@
 (sit-for 600)
 (kill-emacs t)
 
-;; arch-tag: 9eea59c8-b8b7-4d66-b858-c8920624c518
 ;;; edt-mapper.el ends here
diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el
index f896b7d30b..c635d075a8 100644
--- a/lisp/emulation/edt-pc.el
+++ b/lisp/emulation/edt-pc.el
@@ -87,5 +87,4 @@
     ("HELP" . "" ) ("DO" . "" ) ("F17" . "" ) ("F18" . "" )
     ("F19" . "" ) ("F20" . "" )))
 
-;; arch-tag: 4593d053-183a-4062-97de-57b8877595ce
 ;;; edt-pc.el ends here
diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el
index 23c4f4e8f6..3196cb090f 100644
--- a/lisp/emulation/edt-vt100.el
+++ b/lisp/emulation/edt-vt100.el
@@ -48,5 +48,4 @@
   "Set terminal width to 132 columns."
   (vt100-wide-mode 1))
 
-;; arch-tag: c9f10c95-915f-44b5-93ff-4654abca4dd4
 ;;; edt-vt100.el ends here
diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el
index b634cc21c2..d5824f204c 100644
--- a/lisp/emulation/keypad.el
+++ b/lisp/emulation/keypad.el
@@ -270,5 +270,4 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.'"
 
       (setq i (1+ i)))))
 
-;; arch-tag: 0899d2bd-9e12-4b4e-9aef-d0014d3b6414
 ;;; keypad.el ends here
diff --git a/lisp/emulation/pc-mode.el b/lisp/emulation/pc-mode.el
index fb915dbaa6..8306e4b783 100644
--- a/lisp/emulation/pc-mode.el
+++ b/lisp/emulation/pc-mode.el
@@ -53,5 +53,4 @@ C-Escape does list-buffers."
 
 (provide 'pc-mode)
 
-;; arch-tag: df007c05-f885-4cd0-8c1e-487d0f8dd9c9
 ;;; pc-mode.el ends here
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index 5e3b8a6d5b..a9ae5aa354 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -983,5 +983,4 @@ but before calling PC Selection mode):
       (setq pc-select-key-bindings-alist nil
 	    pc-select-saved-settings-alist nil))))
 
-;; arch-tag: 10697b70-ae07-4f3e-ad23-7814a3f418c2
 ;;; pc-select.el ends here
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index ea2638b5eb..704d51f21e 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -2465,5 +2465,4 @@ Constrain the cursor to the flow of the text.
 
 (provide 'tpu-edt)
 
-;; arch-tag: f3dfe61c-2cbd-4f73-b9cc-eb215020b857
 ;;; tpu-edt.el ends here
diff --git a/lisp/emulation/tpu-mapper.el b/lisp/emulation/tpu-mapper.el
index 6bba1a3c1a..0ca8c2e5fc 100644
--- a/lisp/emulation/tpu-mapper.el
+++ b/lisp/emulation/tpu-mapper.el
@@ -350,5 +350,4 @@ your local X guru can try to figure out why the key is being ignored."
 ")
   (goto-char (point-min)))
 
-;; arch-tag: bab5872f-cd3a-4c1c-aedb-047b67646f6c
 ;;; tpu-mapper.el ends here
diff --git a/lisp/emulation/vi.el b/lisp/emulation/vi.el
index a65dd44e39..5bab974164 100644
--- a/lisp/emulation/vi.el
+++ b/lisp/emulation/vi.el
@@ -1488,5 +1488,4 @@ With ARG, inserts that many newlines."
 
 (provide 'vi)
 
-;; arch-tag: ac9bdac3-8acb-4ddd-bdae-c6dd873153b3
 ;;; vi.el ends here
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index dcbf9ce2ad..7e1076f9ce 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -3054,5 +3054,4 @@ vip-s-string"
 
 (provide 'vip)
 
-;; arch-tag: bff623ef-48f7-41d4-9aa3-2e840c9ab415
 ;;; vip.el ends here
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index e4cfbe8857..9cbaa2b178 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -2303,5 +2303,4 @@ Type 'mak ' (including the space) to run make with no args."
 
 
 
-;; arch-tag: 56b80d36-f880-4d10-bd66-85ad91a295db
 ;;; viper-ex.el ends here
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 79d7505f51..cdada14ff4 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -673,5 +673,4 @@ form ((key . function) (key . function) ... )."
 ;; End:
 
 
-;; arch-tag: 43af4b2f-0bea-400b-889e-221ebc00acb1
 ;;; viper-keym.el ends here
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 3af24a46f9..66e6ea9009 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -932,5 +932,4 @@ name from there."
     (call-last-kbd-macro)))
 
 
-;; arch-tag: ecd3cc5c-8cd0-4bbe-b2ec-7e75a4b7d0aa
 ;;; viper-macs.el ends here
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index 69ad062fc2..dae488320b 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -663,5 +663,4 @@ This buffer may be different from the one where the click occurred."
 ;; End:
 
 
-;; arch-tag: e56b2390-06c4-4dd1-96f5-c7876e2d8c2f
 ;;; viper-mous.el ends here
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 70e5466346..67592f691b 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1555,5 +1555,4 @@ This option is appropriate if you like Emacs-style words."
 ;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
 ;; End:
 
-;; arch-tag: 7f023fd5-dd9e-4378-a397-9c179553b0e3
 ;;; viper-util.el ends here
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 9f2247ffc6..e8b471d252 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -1375,5 +1375,4 @@ These two lines must come in the order given.
 ;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
 ;; End:
 
-;; arch-tag: 5f3e844c-c4e6-4bbd-9b73-63bdc14e7d79
 ;;; viper.el ends here
diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el
index 0919fbb9d9..291d8443ac 100644
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/emulation/ws-mode.el
@@ -742,5 +742,4 @@ sWith: " )
 
 (provide 'ws-mode)
 
-;; arch-tag: 6dd864bf-2ccb-4d59-af6e-492eba2890a3
 ;;; ws-mode.el ends here
diff --git a/lisp/env.el b/lisp/env.el
index 985bc5a997..585fa5999d 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -210,5 +210,4 @@ in the environment list of the selected frame."
 
 (provide 'env)
 
-;; arch-tag: b7d6a8f7-bc81-46db-8e39-8d721d4ed0b8
 ;;; env.el ends here
diff --git a/lisp/epa-dired.el b/lisp/epa-dired.el
index 7f54c99b6b..e0612d4f9a 100644
--- a/lisp/epa-dired.el
+++ b/lisp/epa-dired.el
@@ -74,5 +74,4 @@ If no one is selected, symmetric encryption will be performed.  "))
 
 (provide 'epa-dired)
 
-;; arch-tag: 2025700b-48d0-4684-bc94-228ad1f8e9ff
 ;;; epa-dired.el ends here
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 1f9500ded8..2f29914df1 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -298,5 +298,4 @@ If no one is selected, symmetric encryption will be performed.  "))))
 
 (provide 'epa-file)
 
-;; arch-tag: 5715152f-0eb1-4dbc-9008-07098775314d
 ;;; epa-file.el ends here
diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el
index 14ad668837..594f482b57 100644
--- a/lisp/epa-hook.el
+++ b/lisp/epa-hook.el
@@ -109,5 +109,4 @@ Return the new status of auto encryption (non-nil means on)."
 
 (provide 'epa-hook)
 
-;; arch-tag: f75c8a50-d32e-4eb3-9ec6-9e940c1fc8b5
 ;;; epa-hook.el ends here
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 43bfbe0853..dbcd47bafa 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -197,5 +197,4 @@ Don't use this command in Lisp programs!"
 
 (provide 'epa-mail)
 
-;; arch-tag: a6f82b3f-d177-4a11-af95-040da55927d2
 ;;; epa-mail.el ends here
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index b556464e6e..f29bb1ac44 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -147,5 +147,4 @@ Note that the buffer name starts with a space."
 
 (provide 'epg-config)
 
-;; arch-tag: 9aca7cb8-5f63-4bcb-84ee-46fd2db0763f
 ;;; epg-config.el ends here
diff --git a/lisp/epg.el b/lisp/epg.el
index e4bd257d0e..bfebdf143b 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -2650,5 +2650,4 @@ Type names are resolved using `epg-dn-type-alist'."
 
 (provide 'epg)
 
-;; arch-tag: de8f0acc-1bcf-4c14-a09e-bfffe1b579b7
 ;;; epg.el ends here
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 26e8c9aee2..b03a404380 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -153,4 +153,3 @@ See ChangeLog.08 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-;; arch-tag: d4703244-4a8d-49b1-ab34-ad0d56600ef8
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index db2cb574b2..30adfeaa85 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -1056,4 +1056,3 @@
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: 306c4b58-f9ae-4f3d-9fd9-db2d743f05a6
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index 5785f3a0a4..421399fd55 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -2617,4 +2617,3 @@ See ChangeLog.01 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: a6779d5e-99fa-442b-98cf-90e73eb2c272
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index 71df66c806..f62d7d5504 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -2161,4 +2161,3 @@ See ChangeLog.02 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: 808865e1-3cce-4c5b-9997-95a8b7a9d384
diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index 39bdfbd8c9..2030a2a163 100644
--- a/lisp/erc/ChangeLog.04
+++ b/lisp/erc/ChangeLog.04
@@ -2093,4 +2093,3 @@ See ChangeLog.03 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: cc606d2d-635b-4b36-829b-a50e3c51e2d1
diff --git a/lisp/erc/ChangeLog.05 b/lisp/erc/ChangeLog.05
index 7facf9c31c..b0f496b86f 100644
--- a/lisp/erc/ChangeLog.05
+++ b/lisp/erc/ChangeLog.05
@@ -1238,4 +1238,3 @@ See ChangeLog.04 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: 70f1733a-3e2f-43c2-91c3-d9ace93f82ba
diff --git a/lisp/erc/ChangeLog.06 b/lisp/erc/ChangeLog.06
index 3f69f164e0..1df6c6190c 100644
--- a/lisp/erc/ChangeLog.06
+++ b/lisp/erc/ChangeLog.06
@@ -1452,4 +1452,3 @@ See ChangeLog.05 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a
diff --git a/lisp/erc/ChangeLog.07 b/lisp/erc/ChangeLog.07
index 050873f835..693e712c58 100644
--- a/lisp/erc/ChangeLog.07
+++ b/lisp/erc/ChangeLog.07
@@ -834,4 +834,3 @@ See ChangeLog.06 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-;; arch-tag: 3369b6e5-96b1-4b32-96cd-9a905c747496
diff --git a/lisp/erc/ChangeLog.08 b/lisp/erc/ChangeLog.08
index 404b1df8f7..995cc7a182 100644
--- a/lisp/erc/ChangeLog.08
+++ b/lisp/erc/ChangeLog.08
@@ -427,4 +427,3 @@ See ChangeLog.07 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-;; arch-tag: 15787dfd-e091-4c8c-8b88-747b474e1ac7
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index f77a75f474..a1d6913877 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -286,4 +286,3 @@ activer server buffer available."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 16fc241e-8358-4b56-9fe2-116bdd0ba3bc
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index cb05338208..2e9fa42480 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1994,4 +1994,3 @@ See `erc-display-error-notice'." nil
 ;; indent-tabs-mode: nil
 ;; End:
 
-;; arch-tag: a64e6bb7-a780-4efd-8f98-083b18c7c84a
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index cf70c2e47f..4595a8e3f4 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -534,4 +534,3 @@ and `apropos' for other symbols."
 ;; indent-tabs-mode: nil
 ;; End:
 
-;; arch-tag: 7d23bed4-2f30-4273-a03f-d7a274c605c4
diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el
index e66170227c..ee6a0979ee 100644
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -202,5 +202,4 @@ PARSED is an `erc-parsed' response struct."
 
 (provide 'erc-capab)
 
-;; arch-tag: 27b6d668-7ee5-4e47-b9f0-27d7a4362062
 ;;; erc-capab.el ends here
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index f9830f9dae..c80ec5c0b9 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -165,4 +165,3 @@ If START or END is negative, it counts from the end."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 8948ffe0-aff8-4ad8-a196-368ebbfd58ff
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 5578e52791..db9668b510 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -1251,4 +1251,3 @@ other client."
 ;; indent-tabs-mode: nil
 ;; End:
 
-;; arch-tag: cda5a6b3-c510-4dbe-b699-84cccfa04edb
diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el
index fe9e4bec2f..9f39577e2d 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -174,5 +174,4 @@ in the alist is `nil', prompt for the appropriate values."
 
 (provide 'erc-ezbounce)
 
-;; arch-tag: e972aa7b-a9f4-4d16-a489-074ec7a1002e
 ;;; erc-ezbounce.el ends here
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index c3d6f50b53..6604f73649 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -193,4 +193,3 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'."
 ;; indent-tabs-mode: nil
 ;; End:
 
-;; arch-tag: 89224581-c2c2-4e26-92e5-e3a390dc516a
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index 5d86a2022f..f94d6fc01c 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -569,5 +569,4 @@ servers.  If called from a program, PROC specifies the server process."
 
 (provide 'erc-goodies)
 
-;; arch-tag: d987ae26-9e28-4c72-9596-e617309fb582
 ;;; erc-goodies.el ends here
diff --git a/lisp/erc/erc-hecomplete.el b/lisp/erc/erc-hecomplete.el
index 0c03f10c27..ea27a489ed 100644
--- a/lisp/erc/erc-hecomplete.el
+++ b/lisp/erc/erc-hecomplete.el
@@ -220,4 +220,3 @@ Window configurations are stored in
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 3be13ee8-8fdb-41ab-83c2-6582c757b91e
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index 42dc37cb03..a483f93a3c 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -190,4 +190,3 @@
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: fbad56a5-8595-45e0-a8c8-d8bb91e26944
diff --git a/lisp/erc/erc-identd.el b/lisp/erc/erc-identd.el
index 2442d5e8aa..47a9a558d7 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -118,4 +118,3 @@ The default port is specified by `erc-identd-port'."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: e0b5f926-0f35-40b9-8ddb-ca06b62a7544
diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
index 7ab91db33b..ffe48177ac 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -133,4 +133,3 @@ Don't rely on this function, read it first!"
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 35c69082-ca29-43f7-a050-8da5f400de81
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index df676ba6af..d337bcd743 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -202,4 +202,3 @@ This function is run from `erc-nickserv-identified-hook'."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: d62d8b15-8e31-49d6-8a73-12f11e717414
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
index b86cf4e6c0..73c630f8a6 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -223,4 +223,3 @@ to RFC and send the LIST header (#321) at start of list transmission."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 99c5f9cb-6bac-4224-86bf-e394768cd1d0
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index de6d755eb6..3b5e81d271 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -451,4 +451,3 @@ You can save every individual message by putting this function on
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 54072f99-9f0a-4846-8908-2ccde92221de
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 24170caa12..e0603a6409 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -635,4 +635,3 @@ This function is meant to be called from `erc-text-matched-hook'."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 1f1f595e-abcc-4b0b-83db-598a1d3f0f82
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index 627b0453c8..b5c399278c 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -148,4 +148,3 @@ ERC menu yet.")
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 671219f2-b082-4753-a185-1d0c7e0c05bd
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index 4003431f6a..9662c556d4 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -209,4 +209,3 @@ join from that split has been detected or not.")
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 61a85cb0-7e7b-4312-a4f6-313c7a25a6e8
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index f20f0b397d..6cb8192273 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -865,4 +865,3 @@ VALUE is the options value.")
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 68cccabd-f66b-456c-9abe-5f993a2dc91c
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index 80427be16d..7da36b14f1 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -251,4 +251,3 @@ with args, toggle notify status of people."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 0fb19dd0-1359-458a-89b7-81dc195a588e
diff --git a/lisp/erc/erc-page.el b/lisp/erc/erc-page.el
index aaaf800956..510cb4af58 100644
--- a/lisp/erc/erc-page.el
+++ b/lisp/erc/erc-page.el
@@ -109,4 +109,3 @@ receive pages if `erc-page-mode' is on."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 82fd2e0e-6060-4dd2-9788-8c1411e844de
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index 0b1071ce79..540fd19365 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -279,4 +279,3 @@ up to where point is right now."
 ;; indent-tabs-mode: nil
 ;; End:
 
-;; arch-tag: 32a7703b-be87-45a4-82f3-9eed5a628911
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
index df339fec4e..a75099775e 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -94,4 +94,3 @@ It replaces text according to `erc-replace-alist'."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: dd904a59-d8a6-47f8-ac3a-76b698289a18
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 6564d1446f..2c958db477 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -144,4 +144,3 @@ containing a password."
 ;; indent-tabs-mode: nil
 ;; End:
 
-;; arch-tag: b77924a8-a80e-489d-84cd-b351761ea5c8
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 582737e724..88716d1e9a 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -445,4 +445,3 @@ When called interactively, read the password using `read-passwd'."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: d401c8aa-d938-4255-96a9-3efb64c47e58
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
index 9664df90f3..66a4ebc8d1 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -147,4 +147,3 @@ See also `play-sound-file'."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 53657d1d-007f-4a20-91c1-588e71cf0cee
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index aa45230af0..9e59ec9466 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -366,4 +366,3 @@ The INDENT level is ignored."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 7a6558a4-3308-4bf5-a284-e1d042c933c6
diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
index 6e8fe5649d..6cf3d558f6 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -106,5 +106,4 @@ The cadr is the beginning and the caddr is the end."
 
 (provide 'erc-spelling)
 
-;; arch-tag: 04ae1c46-0fd1-4e1a-8b80-55bfa471c945
 ;;; erc-spelling.el ends here
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 1efe8983cf..a107598e5c 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -422,4 +422,3 @@ NOW is position of point currently."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 57aefab4-63e0-4c48-91d5-6efa145487e0
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index f07d963cfd..4303a529cb 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -1068,4 +1068,3 @@ switch back to the last non-ERC buffer visited.  Next is defined by
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 11b439f5-e5d7-4c6c-bb3f-eda98f9b0ac1
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index 9ed32b6c6e..6363564661 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -115,4 +115,3 @@ Meant to be used in hooks, like `erc-insert-post-hook'."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 22a2ea78-871f-4870-8f1e-efe534170311
diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index 80b4afab09..36bb5f4f12 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -136,4 +136,3 @@ being evaluated and should return strings."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: a13b62fe-2399-4562-af4e-f18a8dd4b9c8
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index ab3f12a59b..90ed3dbeef 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -6529,4 +6529,3 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: d19587f6-627e-48c1-8d86-58595fa3eca3
diff --git a/lisp/eshell/.gitignore b/lisp/eshell/.gitignore
index 8f16f9600f..2abf84ba3e 100644
--- a/lisp/eshell/.gitignore
+++ b/lisp/eshell/.gitignore
@@ -1,3 +1,2 @@
 esh-groups.el
 
-# arch-tag: 270e983f-fee5-4b6d-a00b-c1bafdee8690
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index 11f1bd4e9f..0ed1b298f6 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -279,5 +279,4 @@ These are all the command aliases which begin with NAME."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 8b018fc1-4e07-4ccc-aa73-c0a1ba361f82
 ;;; em-alias.el ends here
diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index 8600bf4891..14d8eb5d04 100644
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -96,5 +96,4 @@ This can be any sexp, and should end with at least two newlines."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: e738b4ef-8671-42ae-a757-291779b92491
 ;;; em-banner.el ends here
diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index 342521e106..1fff2c1e20 100644
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -184,5 +184,4 @@ or `eshell-printn' for display."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 385a31b1-cb95-46f0-9829-9d352ee77db8
 ;;; em-basic.el ends here
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index 0ecf713131..30d8ac5407 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -455,5 +455,4 @@ to writing a completion function."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 0e914699-673a-45f8-8cbf-82e1dbc571bc
 ;;; em-cmpl.el ends here
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index e6ef340cad..3614ad2eca 100644
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -573,5 +573,4 @@ in the minibuffer:
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 1e9c5a95-f1bd-45f8-ad36-55aac706e787
 ;;; em-dirs.el ends here
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index c687d35e7f..8ee2bfe489 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -998,5 +998,4 @@ If N is negative, search backwards for the -Nth previous match."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 1a847333-f864-4b96-9acd-b549d620b6c6
 ;;; em-hist.el ends here
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index d7adaac903..4d29413b42 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -177,5 +177,4 @@ If this takes us past the end of the current line, don't skip at all."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 01c1574b-ce70-4e89-bc38-e6619f61e208
 ;;; em-prompt.el ends here
diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index 8d32688928..2807f9acb4 100644
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -246,5 +246,4 @@ input."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 76d84f12-cc56-4d67-9b7d-c6b44ad20530
 ;;; em-rebind.el ends here
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index a6fa3ee580..dac8d66dce 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -142,5 +142,4 @@ environment, binding ARGS to $1, $2, etc.")
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: a346439d-5ba8-4faf-ac2b-3aacfeaa4647
 ;;; em-script.el ends here
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index 46a98b97da..4baeb85f99 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -327,5 +327,4 @@ and the end of the buffer are still visible."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 8c0112c7-379c-4d54-9a1c-204d68786a4b
 ;;; em-smart.el ends here
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index 97a5ac4741..18fc8240b2 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -267,5 +267,4 @@ allowed."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: ab7c8fe4-3101-4257-925b-1354c6b2fe9d
 ;;; em-term.el ends here
diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index e36d3b9aa5..1b61b7cdb9 100644
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -123,5 +123,4 @@ naturally accessible within Emacs."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: f944cfda-a118-470c-a0d6-b41a3a5c99c7
 ;;; em-xtra.el ends here
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 0485c4f5b9..51265ce121 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -391,5 +391,4 @@ special character that is not itself a backslash."
 		   (char-to-string (char-after)))))
 	 (goto-char end)))))))
 
-;; arch-tag: 7f593a2b-8fc1-4def-8f84-8f51ed0198d6
 ;;; esh-arg.el ends here
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 53d142537b..20101f7199 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1434,5 +1434,4 @@ messages, and errors."
 
 (provide 'esh-cmd)
 
-;; arch-tag: 8e4f3867-a0c5-441f-96ba-ddd142d94366
 ;;; esh-cmd.el ends here
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 239a265b52..5705103a00 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -306,5 +306,4 @@ line of the form #!<interp>."
 			    (cdr interp)))))
 	  (or interp (list fullname)))))))
 
-;; arch-tag: 178d4064-7e60-4745-b81f-bab5d8d7c40f
 ;;; esh-ext.el ends here
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index f6d635b3b3..d35e1ed659 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -516,5 +516,4 @@ Returns what was actually sent, or nil if nothing was sent."
 	(eshell-output-object-to-target object (car target))
 	(setq target (cdr target))))))
 
-;; arch-tag: 9ca2080f-d5e0-4b26-aa0b-d59194a905a2
 ;;; esh-io.el ends here
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index d031b71825..a344b4a00d 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -1083,5 +1083,4 @@ This function could be in the list `eshell-output-filter-functions'."
 (custom-add-option 'eshell-output-filter-functions
 		   'eshell-handle-ansi-color)
 
-;; arch-tag: ec65bc2b-da14-4547-81d3-a32af3a4dc57
 ;;; esh-mode.el ends here
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index d56e17211d..bb1c920488 100644
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -100,5 +100,4 @@ customization group.  Example: `eshell-cmpl' for that module."
 	  (unload-feature module)
 	  (message "Unloading %s...done" (symbol-name module))))))
 
-;; arch-tag: 97a3fa16-9d08-40e6-bc2c-36bd70986507
 ;;; esh-module.el ends here
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index 040cba66f3..4cfa53440f 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -527,5 +527,4 @@ See the variable `eshell-kill-processes-on-exit'."
   (eshell-send-input nil nil t)
   (eshell-process-interact 'process-send-eof))
 
-;; arch-tag: ac477a3e-ee4d-4b44-8ec6-212010e607bb
 ;;; esh-proc.el ends here
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index 2d72183fdc..a4782b80c3 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -653,5 +653,4 @@ For example, to retrieve the second element of a user's record in
       (setq pcomplete-stub (substring arg pos))
       (throw 'pcomplete-completions (pcomplete-entries)))))
 
-;; arch-tag: 393654fe-bdad-4f27-9a10-b1472ded14cf
 ;;; esh-var.el ends here
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 9e0c5b7bdb..404c0db110 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -491,5 +491,4 @@ Emacs."
 
 (provide 'eshell)
 
-;; arch-tag: 9d4d5214-0e4e-4e02-b349-39add640d63f
 ;;; eshell.el ends here
diff --git a/lisp/expand.el b/lisp/expand.el
index 25752dd331..447f85d6cf 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -504,5 +504,4 @@ This is used only in conjunction with `expand-add-abbrevs'."
 ;; run load hooks
 (run-hooks 'expand-load-hook)
 
-;; arch-tag: fee53e9e-30e3-4ef3-b191-9785e1f8e885
 ;;; expand.el ends here
diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index 47fca5fbad..2119b7f6aa 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -350,5 +350,4 @@ See `ezimage-expand-image-button-alist' for details."
 
 (provide 'ezimage)
 
-;; arch-tag: d4ea2d93-3c7a-4cb3-b5a6-c1b9178183aa
 ;;; sb-image.el ends here
diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index 3420eea29e..ae4d61f022 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -423,5 +423,4 @@ Besides the choice of face, it is the same as `buffer-face-mode'."
 
 (provide 'face-remap)
 
-;; arch-tag: 5c5f034b-8d58-4967-82bd-d61fd364e686
 ;;; face-remap.el ends here
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 76c555da57..99f17ba355 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -910,5 +910,4 @@ Returns the non-nil value it found, or nil if all were nil."
 
 (provide 'facemenu)
 
-;; arch-tag: 85f6d02b-9085-420e-b651-0678f0e9c7eb
 ;;; facemenu.el ends here
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 842e693a0c..33b2518d19 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1960,5 +1960,4 @@ Of course if you do not like these bindings, just roll your own!")
 
 (provide 'ffap)
 
-;; arch-tag: 9dd3e88a-5dec-4607-bd57-60ae9ede8ebc
 ;;; ffap.el ends here
diff --git a/lisp/files-x.el b/lisp/files-x.el
index 3ad86deaea..769d586b99 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -461,5 +461,4 @@ from the MODE alist ignoring the input argument VALUE."
 
 (provide 'files-x)
 
-;; arch-tag: 949d263c-30a8-4b49-af26-cda97c7c5477
 ;;; files-x.el ends here
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 5eb8c106e0..618a1b98a5 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -2534,5 +2534,4 @@ Set up hooks, load the cache file -- if existing -- and build the menu."
 ;; sentence-end-double-space:t
 ;; End:
 
-;; arch-tag: 2c03f85f-c3df-4cec-b0a3-b46fd5592d70
 ;;; filesets.el ends here
diff --git a/lisp/find-cmd.el b/lisp/find-cmd.el
index b7dc11c121..8beae14101 100644
--- a/lisp/find-cmd.el
+++ b/lisp/find-cmd.el
@@ -240,5 +240,4 @@ them into valid switches.  The result is -and(ed) together."
 
 (provide 'find-cmd)
 
-;; arch-tag: 9687fd9e-4e90-4022-864a-f904526e2046
 ;;; find-cmd.el ends here
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 975493e074..a4a256a967 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -312,5 +312,4 @@ Thus ARG can also contain additional grep options."
 
 (provide 'find-dired)
 
-;; arch-tag: 8edece95-af00-4221-bc74-a4bd2f75f9b0
 ;;; find-dired.el ends here
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 244a9470d5..1cadbb9112 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -968,5 +968,4 @@ That name was previously determined by `ff-which-function-are-we-in'."
 
 (provide 'find-file)
 
-;; arch-tag: 5a2fc49e-3b0a-4708-9acf-fb14e471a97a
 ;;; find-file.el ends here
diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el
index 9c76e8ed26..c912b0d3e2 100644
--- a/lisp/find-lisp.el
+++ b/lisp/find-lisp.el
@@ -356,5 +356,4 @@ It is a function which takes two arguments, the directory and its parent."
 
 (provide 'find-lisp)
 
-;; arch-tag: a711374c-f12a-46f6-aa18-ba7d77b9602a
 ;;; find-lisp.el ends here
diff --git a/lisp/finder.el b/lisp/finder.el
index 4a0277c6e7..6245d7f046 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -428,5 +428,4 @@ Delete the window and kill all Finder-related buffers."
 
 (provide 'finder)
 
-;; arch-tag: ec85ff49-8cb8-41f5-a63f-9131d53ce2c5
 ;;; finder.el ends here
diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index d8e6154c52..243c74f437 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -122,5 +122,4 @@ to get the effect of a C-q."
 
 (provide 'flow-ctrl)
 
-;; arch-tag: 0eb7b19e-0d93-4e0b-9ea2-72b574076a56
 ;;; flow-ctrl.el ends here
diff --git a/lisp/foldout.el b/lisp/foldout.el
index 87941a9333..f1b26aa5e5 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -565,5 +565,4 @@ Valid modifiers are shift, control, meta, alt, hyper and super.")
 
 (provide 'foldout)
 
-;; arch-tag: 19d095a2-1f09-42a7-a5ac-e2a3078cfe95
 ;;; foldout.el ends here
diff --git a/lisp/follow.el b/lisp/follow.el
index 57a8f231b1..57b48bfe43 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -2122,5 +2122,4 @@ This prevents `mouse-drag-region' from messing things up."
 ;; | save it".             -- Douglas Adams, "Last Chance to See"           |
 ;; \------------------------------------------------------------------------/
 
-;; arch-tag: 7b16bb1a-808c-4991-a8cc-66d3822936d0
 ;;; follow.el ends here
diff --git a/lisp/format.el b/lisp/format.el
index 59cb1a2b13..4281a46a1c 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -1087,5 +1087,4 @@ OLD and NEW are the values."
 
 (provide 'format)
 
-;; arch-tag: c387e9c7-a93d-47bf-89bc-8ca67e96755a
 ;;; format.el ends here
diff --git a/lisp/forms-d2.el b/lisp/forms-d2.el
index 00c26d43ec..3487675cbb 100644
--- a/lisp/forms-d2.el
+++ b/lisp/forms-d2.el
@@ -101,5 +101,4 @@ used to fill to the column."
 
 ;; That's all, folks!
 
-;; arch-tag: 8e5d5dac-7abf-4722-ab5e-03eb749beaca
 ;;; forms-d2.el ends here
diff --git a/lisp/forms-pass.el b/lisp/forms-pass.el
index 431dca5878..b635c965cf 100644
--- a/lisp/forms-pass.el
+++ b/lisp/forms-pass.el
@@ -30,5 +30,4 @@
        "Shell: "	7
        "\n"))
 
-;; arch-tag: 74801012-1a2d-4173-b9e4-fcfa241e2305
 ;;; forms-pass.el ends here
diff --git a/lisp/forms.el b/lisp/forms.el
index 1d5cc9f419..c7fd658246 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -2055,5 +2055,4 @@ Usage: (setq forms-number-of-fields
 	  (goto-char (point-max))
 	  (insert ret)))))
 
-;; arch-tag: 4a6695c7-d47a-4a21-809b-5cec7f8ec7a1
 ;;; forms.el ends here
diff --git a/lisp/fringe.el b/lisp/fringe.el
index c42e2f8cf0..8dfe203f39 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -269,5 +269,4 @@ SIDE must be the symbol `left' or `right'."
 
 (provide 'fringe)
 
-;; arch-tag: 6611ef60-0869-47ed-8b93-587ee7d3ff5d
 ;;; fringe.el ends here
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index ee7a75491b..9c503afc30 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1992,5 +1992,4 @@ like an INI file.  You can add this hook to `find-file-hook'."
 
 (provide 'generic-x)
 
-;; arch-tag: cde692a5-9ff6-4506-9999-c67999c2bdb5
 ;;; generic-x.el ends here
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index aef65e8116..6935163739 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -3726,4 +3726,3 @@
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: c2f4e9c8-94fb-4c63-bdfd-4ab680cc9db7
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 933734f8cc..15f326486d 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -18575,4 +18575,3 @@ See ChangeLog.1 for earlier changes.
 ;; coding: iso-2022-7bit
 ;; End:
 
-;; arch-tag: 956fd310-042f-4fca-8dca-a01dbe06acff
diff --git a/lisp/gs.el b/lisp/gs.el
index a890a33db3..362dbf7f3d 100644
--- a/lisp/gs.el
+++ b/lisp/gs.el
@@ -221,5 +221,4 @@ the form \"WINDOW-ID PIXMAP-ID\".  Value is non-nil if successful."
 
 (provide 'gs)
 
-;; arch-tag: 06ab51b8-4932-4cfe-9f60-b924a8edb3f0
 ;;; gs.el ends here
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index c4d1111117..c78815395b 100644
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -350,5 +350,4 @@ different regions.  With numeric argument ARG, behaves like
 
 (provide 'help-at-pt)
 
-;; arch-tag: d0b8b86d-d23f-45d0-a82d-208d6205a583
 ;;; help-at-pt.el ends here
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 30807fcd25..ca6966e4cd 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -202,5 +202,4 @@ and then returns."
 
 (provide 'help-macro)
 
-;; arch-tag: 59fee949-1686-485a-8a05-83418073e257
 ;;; help-macro.el ends here
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index eefc68ab62..9be1f319c8 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -829,5 +829,4 @@ help buffer by other means."
 
 (provide 'help-mode)
 
-;; arch-tag: 850954ae-3725-4cb4-8e91-0bf6d52d6b0b
 ;;; help-mode.el ends here
diff --git a/lisp/hexl.el b/lisp/hexl.el
index bd8c29d3b6..725cb3a612 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -1112,5 +1112,4 @@ This function is assumed to be used as callback function for `hl-line-mode'."
 
 (provide 'hexl)
 
-;; arch-tag: d5a7aa8a-9bce-480b-bcff-6c4c7ca5ea4a
 ;;; hexl.el ends here
diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el
index 75ffe160bc..1add582a90 100644
--- a/lisp/hfy-cmap.el
+++ b/lisp/hfy-cmap.el
@@ -850,5 +850,4 @@ Loads the variable `hfy-rgb-txt-colour-map', which is used by
 ;; generated-autoload-file: "htmlfontify.el"
 ;; End:
 
-;; arch-tag: dff7feea-add4-48ba-937c-e79ac40cec9b
 ;;; hfy-cmap.el ends here
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 31d6272328..5c14140cfb 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -665,5 +665,4 @@ A string is considered new if it had not previously been used in a call to
 
 (provide 'hi-lock)
 
-;; arch-tag: d2e8fd07-4cc9-4c6f-a200-1e729bc54066
 ;;; hi-lock.el ends here
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index ae823bba19..0f6900d800 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -219,5 +219,4 @@ the line including the point by OVERLAY."
 
 (provide 'hl-line)
 
-;; arch-tag: ac806940-0876-4959-8c89-947563ee2833
 ;;; hl-line.el ends here
diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el
index c7b9ace0a8..328a9068d9 100644
--- a/lisp/ibuf-macs.el
+++ b/lisp/ibuf-macs.el
@@ -301,5 +301,4 @@ bound to the current value of the filter.
 
 (provide 'ibuf-macs)
 
-;; arch-tag: 2748edce-82c9-4cd9-9d9d-bd73e43c20c5
 ;;; ibuf-macs.el ends here
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 80927be7c5..3b13adc468 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -3015,5 +3015,4 @@ defaults to one.
 ;; coding: iso-8859-1
 ;; End:
 
-;; arch-tag: 72581688-0603-4954-b8cf-837c700f62e8
 ;;; ibuffer.el ends here
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index d3062f4754..dc0e51625e 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -376,5 +376,4 @@ are exhibited within the square braces.)"
 ;;allout-layout: (-2 :)
 ;;End:
 
-;; arch-tag: 339ec25a-0741-4eb6-be63-997532e89b0f
 ;;; icomplete.el ends here
diff --git a/lisp/ido.el b/lisp/ido.el
index 87f02d2287..7a472c35a4 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -4774,5 +4774,4 @@ DEF, if non-nil, is the default value."
 
 (provide 'ido)
 
-;; arch-tag: b63a3500-1735-41bd-8a01-05373f0864da
 ;;; ido.el ends here
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 5974a55566..65c28663ee 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -560,5 +560,4 @@ Switches to the buffer `*ielm*', or creates it if it does not exist."
 
 (provide 'ielm)
 
-;; arch-tag: ef60e4c0-9c4f-4bdb-8402-271313329790
 ;;; ielm.el ends here
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index ab49582d51..9461f56591 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -2622,5 +2622,4 @@ tags to their respective image file.  Internal function used by
 
 (provide 'image-dired)
 
-;; arch-tag: 9d11411d-331f-4380-8b44-8adfe3a0343e
 ;;; image-dired.el ends here
diff --git a/lisp/image-file.el b/lisp/image-file.el
index b93cdef26e..eeccd5175b 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -202,5 +202,4 @@ Image files are those whose name has an extension in
 
 (provide 'image-file)
 
-;; arch-tag: 04cafe36-f7ba-4c80-9f47-4cb656520ce1
 ;;; image-file.el ends here
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 396264b350..476db9a990 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -628,5 +628,4 @@ indicates a scaling factor. nil indicates scale to 100%. "
 
 (provide 'image-mode)
 
-;; arch-tag: b5b2b7e6-26a7-4b79-96e3-1546b5c4c6cb
 ;;; image-mode.el ends here
diff --git a/lisp/image.el b/lisp/image.el
index 3fbb3e0be3..b098cbc4ac 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -725,5 +725,4 @@ shall be displayed."
 
 (provide 'image)
 
-;; arch-tag: 8e76a07b-eb48-4f3e-a7a0-1a7ba9f096b3
 ;;; image.el ends here
diff --git a/lisp/imenu.el b/lisp/imenu.el
index c44ba44a8f..c890a4cbfe 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -1066,5 +1066,4 @@ for more information."
 
 (provide 'imenu)
 
-;; arch-tag: 98a2f5f5-4b91-4704-b18c-3aacf77d77a7
 ;;; imenu.el ends here
diff --git a/lisp/indent.el b/lisp/indent.el
index 6d0100489d..ea2b816b99 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -595,5 +595,4 @@ Use \\[edit-tab-stops] to edit them interactively."
 (define-key ctl-x-map "\t" 'indent-rigidly)
 (define-key esc-map "i" 'tab-to-tab-stop)
 
-;; arch-tag: f402b2a7-e44f-492f-b5b8-38996020b7c3
 ;;; indent.el ends here
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 065e1beb5f..984d5383e4 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -999,5 +999,4 @@ Return nil if there is nothing appropriate in the buffer near point."
 
 (provide 'info-look)
 
-;; arch-tag: 0f1e3ea3-32a2-4461-bbab-3cff93539a74
 ;;; info-look.el ends here
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 7ab4291058..086ef47476 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -314,5 +314,4 @@ quite a while."
 
 (provide 'info-xref)
 
-;; arch-tag: 69d4d528-69ed-4cc2-8eb4-c666a0c1d5ac
 ;;; info-xref.el ends here
diff --git a/lisp/informat.el b/lisp/informat.el
index 1eb2e94b01..a1028087c3 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -511,5 +511,4 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\""
 
 (provide 'informat)
 
-;; arch-tag: 581c440e-5be1-4f31-b005-2d5824bbf569
 ;;; informat.el ends here
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index c13ddfd621..3346ebd422 100644
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -1559,5 +1559,4 @@ See the documentation of `define-ccl-program' for the detail of CCL program."
 
 (provide 'ccl)
 
-;; arch-tag: 836bcd27-63a1-4a56-b232-1145ecf823fb
 ;;; ccl.el ends here
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index cc53c18773..5ebe14fd01 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1414,5 +1414,4 @@ METHOD must be one of these symbols:
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: 85889c35-9f4d-4912-9bf5-82de31b0d42d
 ;;; characters.el ends here
diff --git a/lisp/international/cp51932.el b/lisp/international/cp51932.el
index a648bfcefc..d4a347d43a 100644
--- a/lisp/international/cp51932.el
+++ b/lisp/international/cp51932.el
@@ -469,4 +469,3 @@
 	map)
   (define-translation-table 'cp51932-encode map))
 
-;; arch-tag: d21c06e5-a548-4dda-8802-c2922ff19da3
diff --git a/lisp/international/eucjp-ms.el b/lisp/international/eucjp-ms.el
index 060692f31a..a16848a0c7 100644
--- a/lisp/international/eucjp-ms.el
+++ b/lisp/international/eucjp-ms.el
@@ -2086,4 +2086,3 @@
 	map)
   (define-translation-table 'eucjp-ms-encode map))
 
-;; arch-tag: c4191096-288a-4f13-9b2a-ee7a1f11eb4a
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 11975ea060..7796fa5eb3 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1152,5 +1152,4 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 ;;
 (provide 'fontset)
 
-;; arch-tag: bb53e629-0234-403c-950e-551e61554849
 ;;; fontset.el ends here
diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index ab61f26a63..a6a92d3d8e 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -141,5 +141,4 @@
 	  (isearch-update)))
     (isearch-process-search-char last-char)))
 
-;; arch-tag: 1a90a6cf-2cb2-477a-814a-9ff895852822
 ;;; isearch-x.el ends here
diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index d2bacf6e90..6fe7022b5a 100644
--- a/lisp/international/iso-ascii.el
+++ b/lisp/international/iso-ascii.el
@@ -171,5 +171,4 @@
 
 (provide 'iso-ascii)
 
-;; arch-tag: 687edf0d-f792-471e-b50e-be805938359a
 ;;; iso-ascii.el ends here
diff --git a/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el
index f9b312dcd6..f829101770 100644
--- a/lisp/international/iso-cvt.el
+++ b/lisp/international/iso-cvt.el
@@ -904,5 +904,4 @@ Optional arg BUFFER is ignored (for use in `format-alist')."
 
 (provide 'iso-cvt)
 
-;; arch-tag: 64ae843f-ed0e-43e1-ba50-ffd581b90840
 ;;; iso-cvt.el ends here
diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index c73dd0fb07..79d0373dac 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -291,5 +291,4 @@ sequence VECTOR.  (VECTOR is normally one character long.)")
 
 (provide 'iso-transl)
 
-;; arch-tag: 034cfedf-7ebd-461d-bcd0-5c79e6dc0b61
 ;;; iso-transl.el ends here
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 9e0bffef36..7e317ea09c 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -545,5 +545,4 @@ To get complete usage, invoke:
 ;; coding: iso-2022-7bit
 ;; End:
 
-;; arch-tag: dec06fb0-8118-45b1-80d7-dc360b6fd3b2
 ;;; ja-dic-cnv.el ends here
diff --git a/lisp/international/ja-dic-utl.el b/lisp/international/ja-dic-utl.el
index 8e276a240f..8400c473af 100644
--- a/lisp/international/ja-dic-utl.el
+++ b/lisp/international/ja-dic-utl.el
@@ -222,5 +222,4 @@ LEIM is available from the same ftp directory as Emacs."))
 ;; coding: iso-2022-7bit
 ;; End:
 
-;; arch-tag: df2218fa-469c-40f6-bace-7f89a053f9c0
 ;;; ja-dic-utl.el ends here
diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el
index 835f991957..b3ba9edc44 100644
--- a/lisp/international/kinsoku.el
+++ b/lisp/international/kinsoku.el
@@ -183,5 +183,4 @@ the context of text formatting."
 	      (aref (char-category-set (preceding-char)) ?<))
 	  (kinsoku-shorter linebeg))))
 
-;; arch-tag: e6b036bc-9e5b-4e9f-a22c-4ed04e37777e
 ;;; kinsoku.el ends here
diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el
index 767c231546..373818f5a0 100644
--- a/lisp/international/kkc.el
+++ b/lisp/international/kkc.el
@@ -658,5 +658,4 @@ and change the current conversion to the last one in the group."
 ;;
 (provide 'kkc)
 
-;; arch-tag: 3cbfd56e-74e6-4f60-bb46-ba7c2d366fbf
 ;;; kkc.el ends here
diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el
index e32624df9f..7f1ce6a737 100644
--- a/lisp/international/latexenc.el
+++ b/lisp/international/latexenc.el
@@ -186,5 +186,4 @@ coding system names is determined from `latex-inputenc-coding-alist'."
 
 (provide 'latexenc)
 
-;; arch-tag: f971bc3e-1fec-4609-8f2f-73dd41ab22e1
 ;;; latexenc.el ends here
diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el
index 243bff78e4..67b1b73d52 100644
--- a/lisp/international/latin1-disp.el
+++ b/lisp/international/latin1-disp.el
@@ -3196,5 +3196,4 @@ isn't changed if the display can render Unicode characters."
 
 (provide 'latin1-disp)
 
-;; arch-tag: 68b2872e-d667-4f48-8e2f-ec2ba2d29406
 ;;; latin1-disp.el ends here
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 0bfbfd9524..73542feeaa 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2979,5 +2979,4 @@ properties are sticky."
 
 (define-key ctl-x-map "8\r" 'ucs-insert)
 
-;; arch-tag: b382c432-4b36-460e-bf4c-05efd0bb18dc
 ;;; mule-cmds.el ends here
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index c0a39321ad..fd444a098e 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1555,5 +1555,4 @@ for decoding and encoding files, process I/O, etc."
 ;; code.
 (provide 'code-pages)
 
-;; arch-tag: 7d5fed55-b6df-42f6-8d3d-0011190551f5
 ;;; mule-conf.el ends here
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 966eb89eb4..b9006b7588 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1169,5 +1169,4 @@ The default is 20.  If LIMIT is negative, do not limit the listing."
 
 (provide 'mule-diag)
 
-;; arch-tag: cd3b607c-2893-45a0-a4fa-a6535754dbee
 ;;; mule-diag.el ends here
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 3992b0f3d3..3762dd5d9a 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -405,5 +405,4 @@ per-character basis, this may not be accurate."
 ;; coding: iso-2022-7bit
 ;; End:
 
-;; arch-tag: 5bdb52b6-a3a5-4529-b7a0-37d01b0e570b
 ;;; mule-util.el ends here
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 54f5de54fe..2f0063540d 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -2444,5 +2444,4 @@ added by processing software."
 ;;;
 (provide 'mule)
 
-;; arch-tag: 9aebaa6e-0e8a-40a9-b857-cb5d04a39e7c
 ;;; mule.el ends here
diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el
index fa8b7c69a0..6fd22ee0e8 100644
--- a/lisp/international/ogonek.el
+++ b/lisp/international/ogonek.el
@@ -500,5 +500,4 @@ followed by a non-Polish character, that is one not listed in the
 
 (provide 'ogonek)
 
-;; arch-tag: 672d7744-28ac-412b-965e-06a27e50d1d7
 ;;; ogonek.el ends here
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 094e86dbad..47f4cadc1b 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -3077,5 +3077,4 @@ call it with one argument STRING."
 ;;
 (provide 'quail)
 
-;; arch-tag: 46d7db54-5467-42c4-a2a9-53ca90a1e886
 ;;; quail.el ends here
diff --git a/lisp/international/robin.el b/lisp/international/robin.el
index d9478611b5..7e98a507f9 100644
--- a/lisp/international/robin.el
+++ b/lisp/international/robin.el
@@ -571,5 +571,4 @@ used."
 ;; coding: utf-8-emacs
 ;; End:
 
-;; arch-tag: ba995140-7436-4a57-b875-747fc340f605
 ;;; robin.el ends here
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 6e6f8ce738..ccaced294b 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -1210,5 +1210,4 @@ to store generated Quail packages."
 ;; coding: iso-2022-7bit
 ;; End:
 
-;; arch-tag: 8ad478b2-a985-4da2-b47f-d8ee5d7c24a3
 ;;; titdic-cnv.el ends here
diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el
index afd6769e65..d6fdcd5798 100644
--- a/lisp/international/ucs-normalize.el
+++ b/lisp/international/ucs-normalize.el
@@ -628,5 +628,4 @@ be decomposed."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: cef65ae7-71ad-4e19-8da8-56ab4d42aaa4
 ;;; ucs-normalize.el ends here
diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 91a95d8e33..709414d5f1 100644
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -127,5 +127,4 @@ ESC and SKIP-CHARS are adjusted for the normal and IMAP versions."
 
 (provide 'utf-7)
 
-;; arch-tag: 975ee403-90a4-4286-97d2-4ed1323f4ef9
 ;;; utf-7.el ends here
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 717f6d46f7..d8efe78d85 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2767,5 +2767,4 @@ CASE-FOLD non-nil means the search was case-insensitive."
   (isearch-search)
   (isearch-update))
 
-;; arch-tag: 74850515-f7d8-43a6-8a2c-ca90a4c1e675
 ;;; isearch.el ends here
diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index e79d6b26c6..194e49094b 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -223,5 +223,4 @@ accessed via isearchb."
 
 (provide 'isearchb)
 
-;; arch-tag: 9277523f-a624-4aa0-ba10-b89eeb7b6e99
 ;;; isearchb.el ends here
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index a6b2521dac..80caa9b1eb 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -1437,5 +1437,4 @@ This mode enables switching between buffers using substrings.  See
 
 (provide 'iswitchb)
 
-;; arch-tag: d74198ae-753f-44f2-b34f-0c515398d90a
 ;;; iswitchb.el ends here
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index f8e99cca68..eab8754bb9 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -591,5 +591,4 @@ will take place when text is fontified stealthily."
 
 (provide 'jit-lock)
 
-;; arch-tag: 56b5de6e-f581-453b-bb97-49c39372ff9e
 ;;; jit-lock.el ends here
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index f5fca85221..43cbba8182 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -365,5 +365,4 @@ Return the new status of auto compression (non-nil means on)."
 
 (provide 'jka-cmpr-hook)
 
-;; arch-tag: 4bd73429-f400-45fe-a065-270a113e31a8
 ;;; jka-cmpr-hook.el ends here
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 739fd3f1dd..f1ad77ae8d 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -704,5 +704,4 @@ by `jka-compr-installed'."
 
 (provide 'jka-compr)
 
-;; arch-tag: 3f15b630-e9a7-46c4-a22a-94afdde86ebc
 ;;; jka-compr.el ends here
diff --git a/lisp/json.el b/lisp/json.el
index e389907414..a82a1d8811 100644
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -526,5 +526,4 @@ Advances point just past JSON object."
 
 (provide 'json)
 
-;; arch-tag: 15f6e4c8-b831-4172-8749-bbc680c50ea1
 ;;; json.el ends here
diff --git a/lisp/kermit.el b/lisp/kermit.el
index c21e9bfa1d..d2a4206163 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -148,5 +148,4 @@ command `kermit | tr -d '\\015''."
 
 (provide 'kermit)
 
-;; arch-tag: 6633215d-6c47-4e66-9f27-16fba02a8dce
 ;;; kermit.el ends here
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index e191228ff9..bcb4f1b270 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -1270,5 +1270,4 @@ To customize possible responses, change the \"bindings\" in `kmacro-step-edit-ma
 
 (provide 'kmacro)
 
-;; arch-tag: d3fe0b24-ae41-47de-a4d6-41a77d5559f0
 ;;; kmacro.el ends here
diff --git a/lisp/language/burmese.el b/lisp/language/burmese.el
index 2742fd315b..9fce058316 100644
--- a/lisp/language/burmese.el
+++ b/lisp/language/burmese.el
@@ -57,4 +57,3 @@
   (set-char-table-range composition-function-table '(#x1000 . #x107F) elt)
   (set-char-table-range composition-function-table '(#xAA60 . #xAA7B) elt))
 
-;; arch-tag: 8ba5f4cd-ef89-4008-b784-397edd0cb32e
diff --git a/lisp/language/cham.el b/lisp/language/cham.el
index 9ea6b0e28c..d1ddfb512a 100644
--- a/lisp/language/cham.el
+++ b/lisp/language/cham.el
@@ -42,4 +42,3 @@
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: a393ea52-445b-4e22-a967-c244afc88cf6
diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el
index edbed8a776..1f09d1f349 100644
--- a/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@ -191,5 +191,4 @@ Return the length of resulting text."
 ;;
 (provide 'china-util)
 
-;; arch-tag: 5a47b084-b9ac-420e-8191-70c5b3a14836
 ;;; china-util.el ends here
diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index c03849e23e..7baa8f4d26 100644
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -287,5 +287,4 @@ converted to CNS)."))
 
 (provide 'chinese)
 
-;; arch-tag: b82fcf7a-84f6-4e0b-b38c-1742dac0e09f
 ;;; chinese.el ends here
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index d57edf0ed6..65c25fcd20 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -192,5 +192,4 @@ If the argument is nil, we return the display table to its standard state."
 ;; coding: iso-2022-7bit
 ;; End:
 
-;; arch-tag: f6d9dd5d-685c-45d6-a5d8-1e2178228b7e
 ;;; cyril-util.el ends here
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 1d728e48ab..891773f57c 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -272,5 +272,4 @@ Support for Russian using koi8-r and the russian-computer input method.")
 
 (provide 'cyrillic)
 
-;; arch-tag: bda71ae0-ba41-4cb6-a6e0-1dff542313d3
 ;;; cyrillic.el ends here
diff --git a/lisp/language/czech.el b/lisp/language/czech.el
index fd7834c224..95afdd0b61 100644
--- a/lisp/language/czech.el
+++ b/lisp/language/czech.el
@@ -45,5 +45,4 @@ and selects the Czech tutorial."))
 
 (provide 'czech)
 
-;; arch-tag: 45ac0d83-ca13-4b5e-9e82-821e44080c24
 ;;; czech.el ends here
diff --git a/lisp/language/english.el b/lisp/language/english.el
index 9dde2d3ff7..915a8db5aa 100644
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -67,5 +67,4 @@ Nothing special is needed to handle English.")
 (set-language-info-alist
  "ASCII" (cdr (assoc "English" language-info-alist)))
 
-;; arch-tag: e440bdb0-91b0-4fb4-ae38-425780f8f745
 ;;; english.el ends here
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index a2577ced1b..7f78808016 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -2073,5 +2073,4 @@ mark."
 
 ;;; ethio-util.el ends here
 
-;; arch-tag: c8feb3d6-39bf-4b0a-b6ef-26f03fbc8140
 ;;; ethio-util.el ends here
diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el
index 07d42278f3..400882fbc4 100644
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -85,5 +85,4 @@
 
 (provide 'ethiopic)
 
-;; arch-tag: e81329d9-1286-43ba-92fd-54ce5c7b213c
 ;;; ethiopic.el ends here
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 46c37945d1..747b77d906 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -639,5 +639,4 @@ method and applying Turkish case rules for the characters i, I, $(D)E(B, $(D*
 
 (provide 'european)
 
-;; arch-tag: 9e018b12-fb02-4120-907b-9adeaf84b5c2
 ;;; european.el ends here
diff --git a/lisp/language/georgian.el b/lisp/language/georgian.el
index 91c09beb20..6138e04f49 100644
--- a/lisp/language/georgian.el
+++ b/lisp/language/georgian.el
@@ -48,5 +48,4 @@
 
 (provide 'georgian)
 
-;; arch-tag: 15499fbb-26d4-4a13-9d78-135eef7d32f5
 ;;; georgian.el ends here
diff --git a/lisp/language/greek.el b/lisp/language/greek.el
index bddc791eeb..e4d239cdf2 100644
--- a/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@ -83,5 +83,4 @@
 
 (provide 'greek)
 
-;; arch-tag: 9ba48d79-84bc-45e1-9318-685dc3921410
 ;;; greek.el ends here
diff --git a/lisp/language/hanja-util.el b/lisp/language/hanja-util.el
index 8de533afab..1fa1b7247f 100644
--- a/lisp/language/hanja-util.el
+++ b/lisp/language/hanja-util.el
@@ -6591,5 +6591,4 @@ The value is a hanja character that is selected interactively."
 
 (provide 'hanja-util)
 
-;; arch-tag: 3358afb4-c63f-472f-989a-5249129924d1
 ;;; hanja-util.el ends here
diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index ad079c2d70..58ffb02982 100644
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -259,5 +259,4 @@ Bidirectional editing is supported.")))
 
 (provide 'hebrew)
 
-;; arch-tag: 3ca04f32-3f1e-498e-af46-8267498ba5d9
 ;;; hebrew.el ends here
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index be3fba4a30..825950807f 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -1213,5 +1213,4 @@ Returns new end position."
 
 (provide 'ind-util)
 
-;; arch-tag: 59aacd71-46c2-4cb3-bb26-e12bbad55545
 ;;; ind-util.el ends here
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index aa0bb5117a..bfe05c3eee 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -389,5 +389,4 @@ South Indian language Malayalam is supported in this language environment."))
 
 (provide 'indian)
 
-;; arch-tag: 83aa8fc7-7ee2-4364-a6e5-498f5e3b8c2f
 ;;; indian.el ends here
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index 5df35643e3..75d33b65b8 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -325,5 +325,4 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading."
 ;;
 (provide 'japan-util)
 
-;; arch-tag: b579595c-c9ad-4b57-9314-98cd8b214f89
 ;;; japan-util.el ends here
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 09800ceb4f..9262d6a17a 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -274,5 +274,4 @@ and the second is a glyph for a variation selector."
 
 (provide 'japanese)
 
-;; arch-tag: 450f5537-9d53-4d5e-b731-4cf116d8cbc9
 ;;; japanese.el ends here
diff --git a/lisp/language/khmer.el b/lisp/language/khmer.el
index 9e1dbf6c4b..d01fa3b33b 100644
--- a/lisp/language/khmer.el
+++ b/lisp/language/khmer.el
@@ -35,5 +35,4 @@
   (set-char-table-range composition-function-table '(#x1780 . #x17FF) val)
   (set-char-table-range composition-function-table '(#x19E0 . #x19FF) val))
 
-;; arch-tag: 032890e4-a936-4584-ad44-79eb5f8bc98e
 ;; khmer.el ends here
diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el
index 43ef614a47..34564edb6b 100644
--- a/lisp/language/korea-util.el
+++ b/lisp/language/korea-util.el
@@ -143,5 +143,4 @@
 ;;
 (provide 'korea-util)
 
-;; arch-tag: b17d0981-05da-4577-99f8-1db87fff8b44
 ;;; korea-util.el ends here
diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index d7967a8e95..dedd7430fc 100644
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -87,5 +87,4 @@ and the following key bindings are available within Korean input methods:
 
 (provide 'korean)
 
-;; arch-tag: ca7c7348-5ca3-4623-887a-7fd33d725d0e
 ;;; korean.el ends here
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index 6c441a1f30..365840efdd 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -516,5 +516,4 @@ syllable.  In that case, FROM and TO are indexes to STR."
 ;;
 (provide 'lao-util)
 
-;; arch-tag: 1f828781-3cb8-4695-88af-8f33222338ce
 ;;; lao-util.el ends here
diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index d60459a1f1..9423ac9c81 100644
--- a/lisp/language/lao.el
+++ b/lisp/language/lao.el
@@ -83,5 +83,4 @@
 
 (provide 'lao)
 
-;; arch-tag: ba540fd9-6352-4449-a9cd-669afd21fa57
 ;;; lao.el ends here
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index e099ea542b..6fa54ff5c8 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -74,5 +74,4 @@ and Italian.")))
 
 (provide 'misc-lang)
 
-;; arch-tag: 6953585c-1a1a-4c09-be82-a2518afb6074
 ;;; misc-lang.el ends here
diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el
index 5319a18b47..8a2aabb42b 100644
--- a/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@ -52,5 +52,4 @@ An environment for generic Latin-10 encoding is also available."))
 
 (provide 'romanian)
 
-;; arch-tag: a0bf93ee-2f02-4678-a477-c08acc35366b
 ;;; romanian.el ends here
diff --git a/lisp/language/sinhala.el b/lisp/language/sinhala.el
index 0b9bf1279f..ea8a6a34cd 100644
--- a/lisp/language/sinhala.el
+++ b/lisp/language/sinhala.el
@@ -45,5 +45,4 @@
 	 "[\u0D80-\u0DFF]")
 	0 'font-shape-gstring)))
 
-;; arch-tag: 87b9ad3b-5090-422f-b942-eb85b9d52e7c
 ;; sinhala.el ends here
diff --git a/lisp/language/slovak.el b/lisp/language/slovak.el
index 458c0327e0..430c5fd1d5 100644
--- a/lisp/language/slovak.el
+++ b/lisp/language/slovak.el
@@ -46,5 +46,4 @@ and selects the Slovak tutorial."))
 
 (provide 'slovak)
 
-;; arch-tag: 1bae098a-33b2-4426-8c29-59e44fe05484
 ;;; slovak.el ends here
diff --git a/lisp/language/tai-viet.el b/lisp/language/tai-viet.el
index a7029c659a..9b36e316e9 100644
--- a/lisp/language/tai-viet.el
+++ b/lisp/language/tai-viet.el
@@ -62,4 +62,3 @@ is available at this web page:
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: db4e3377-2ba7-47a0-b173-e44420d540c3
diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el
index b15197be29..ebc7423b3f 100644
--- a/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@ -282,5 +282,4 @@ The commands affected are \\[forward-word], \\[backward-word], \\[kill-word], \\
 ;;
 (provide 'thai-util)
 
-;; arch-tag: 59425d6a-8cf9-4e06-a6ab-8ab7dc7a7a97
 ;;; thai-util.el ends here
diff --git a/lisp/language/thai-word.el b/lisp/language/thai-word.el
index 55a89f462c..5cb13e08fd 100644
--- a/lisp/language/thai-word.el
+++ b/lisp/language/thai-word.el
@@ -11077,4 +11077,3 @@ With argument, do this that many times."
 
 ;; end of thai-word.el
 
-;; arch-tag: 29927f02-e177-4224-a270-7e67210b038a
diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index b4f3177a23..1a729083d9 100644
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -85,5 +85,4 @@ This is the same as `thai-tis620' with the addition of no-break-space."
 
 (provide 'thai)
 
-;; arch-tag: c7eb0e91-4db0-4619-81f8-8762e7d51e15
 ;;; thai.el ends here
diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index 2f446a1814..f5f2c687b7 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -421,5 +421,4 @@ before writing buffer in Unicode.  See also
 
 (provide 'tibet-util)
 
-;; arch-tag: 7a7333e8-1584-446c-b39c-a02b9def265d
 ;;; tibet-util.el ends here
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index 7ece195b1e..e30a4ef812 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -611,5 +611,4 @@ This also matches some punctuation characters which need conversion.")
 
 (provide 'tibetan)
 
-;; arch-tag: 8d37c8d7-f95d-450f-9ec2-819e61fc79a7
 ;;; tibetan.el ends here
diff --git a/lisp/language/tv-util.el b/lisp/language/tv-util.el
index 15eb51a3c5..400856d1aa 100644
--- a/lisp/language/tv-util.el
+++ b/lisp/language/tv-util.el
@@ -139,4 +139,3 @@
 ;;
 (provide 'tai-viet-util)
 
-;; arch-tag: a45ac3fc-07d0-44d5-8841-2ebea7e11f5b
diff --git a/lisp/language/utf-8-lang.el b/lisp/language/utf-8-lang.el
index 0eef348e18..53bdea21b5 100644
--- a/lisp/language/utf-8-lang.el
+++ b/lisp/language/utf-8-lang.el
@@ -52,5 +52,4 @@ encoded in UTF-8."))
 
 (provide 'utf-8-lang)
 
-;; arch-tag: dfa339e1-296f-4b1e-9fe8-2b65279ec813
 ;;; utf-8-lang.el ends here
diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el
index 9c651e0553..3c7c66b8bf 100644
--- a/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@ -296,5 +296,4 @@ positions (integers or markers) specifying the stretch of the region."
 ;;;
 (provide 'viet-util)
 
-;; arch-tag: 082a4d3b-168f-45b4-b3e1-82bfa1b5a194
 ;;; viet-util.el ends here
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index 65933c7658..8f00b44f38 100644
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -110,5 +110,4 @@ Telex, VIQR is the default setting.")))
 
 (provide 'vietnamese)
 
-;; arch-tag: 5bd4f1aa-2d4e-4f33-b7d8-0679c6a19ee6
 ;;; vietnamese.el ends here
diff --git a/lisp/ledit.el b/lisp/ledit.el
index 034f61317f..a4fb4bca18 100644
--- a/lisp/ledit.el
+++ b/lisp/ledit.el
@@ -154,5 +154,4 @@ do (setq lisp-mode-hook 'ledit-from-lisp-mode)"
 
 (provide 'ledit)
 
-;; arch-tag: f0f1ca13-8d31-478c-ae1b-b448c55a8faf
 ;;; ledit.el ends here
diff --git a/lisp/linum.el b/lisp/linum.el
index 5859c48fc3..2dfc6b7020 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -202,5 +202,4 @@ and you have to scroll or press \\[recenter-top-bottom] to update the numbers."
 
 (provide 'linum)
 
-;; arch-tag: dea45631-ed3c-4867-8b49-1c41c80aec6a
 ;;; linum.el ends here
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 17f4035bf2..763d8c38eb 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -267,5 +267,4 @@ something strange, such as redefining an Emacs function."
 
 (provide 'loadhist)
 
-;; arch-tag: 70bb846a-c413-4f01-bf88-78dba4ac0798
 ;;; loadhist.el ends here
diff --git a/lisp/longlines.el b/lisp/longlines.el
index e00e666b24..964398edea 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -503,5 +503,4 @@ This is called by `window-configuration-change-hook'."
 
 (provide 'longlines)
 
-;; arch-tag: 3489d225-5506-47b9-8659-d8807b77c624
 ;;; longlines.el ends here
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 561aa05f37..234c60b542 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -337,5 +337,4 @@ The characters tab, linefeed, space, return and formfeed are not affected."
 
 (provide 'lpr)
 
-;; arch-tag: 21c3f821-ebec-4ca9-ac67-a81e4b75c62a
 ;;; lpr.el ends here
diff --git a/lisp/macros.el b/lisp/macros.el
index 4ac740d4fc..b55edb2fa4 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -283,5 +283,4 @@ and then select the region of un-tablified names and use
 
 (provide 'macros)
 
-;; arch-tag: 346ed1a5-1220-4bc8-b533-961ee704361f
 ;;; macros.el ends here
diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el
index 4737f86a6a..297bf86d5c 100644
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -66,5 +66,4 @@
 (write-region (point-min) (point-max) "blessmail")
 (kill-emacs)
 
-;; arch-tag: c3329fe2-f945-41a9-8b00-b4b038ff182f
 ;;; blessmail.el ends here
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 5c6da623fe..597344fb88 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -2662,5 +2662,4 @@ been weeded out."
 
 (provide 'feedmail)
 
-;; arch-tag: ec27b380-11c0-4dfd-8436-f636cf2bb992
 ;;; feedmail.el ends here
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index 82928642f3..f6bf1127f5 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -797,5 +797,4 @@ started, play around with the following keys:
 
 (provide 'footnote)
 
-;; arch-tag: 9bcfb6d7-2161-4caf-8793-700f62400398
 ;;; footnote.el ends here
diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el
index afaf6949ca..6a008ab857 100644
--- a/lisp/mail/mail-hist.el
+++ b/lisp/mail/mail-hist.el
@@ -293,5 +293,4 @@ received mail."
 
 (provide 'mail-hist)
 
-;; arch-tag: 9ff9a07c-9dca-482d-ba87-54f42778559d
 ;;; mail-hist.el ends here
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 0ec8f6dee2..a9ce8247a6 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -609,5 +609,4 @@ In other respects, this behaves like `end-of-buffer', which see."
 
 (provide 'mailabbrev)
 
-;; arch-tag: 5aa2d901-73f8-4ad7-b73c-4802282ad2ff
 ;;; mailabbrev.el ends here
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index b1da0458d8..3c23abaf4e 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -174,5 +174,4 @@ The mail client is taken to be the handler of mailto URLs."
 
 (provide 'mailclient)
 
-;; arch-tag: 35d10fc8-a1bc-4f29-a4e6-c288e53578ef
 ;;; mailclient.el ends here
diff --git a/lisp/mail/mailpost.el b/lisp/mail/mailpost.el
index 0790375388..7c4bea830d 100644
--- a/lisp/mail/mailpost.el
+++ b/lisp/mail/mailpost.el
@@ -102,5 +102,4 @@ site-init."
 
 (provide 'mailpost)
 
-;; arch-tag: 1f8ca085-60a6-4eac-8efb-69ffec2fa124
 ;;; mailpost.el ends here
diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index 2b900485b1..63f366d55a 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -200,5 +200,4 @@ redisplayed as output is inserted."
 
 (provide 'metamail)
 
-;; arch-tag: 52c0cb6f-d800-4776-9789-f0275cb5490e
 ;;; metamail.el ends here
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index ba5c8e337c..280be615c1 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -407,5 +407,4 @@ mail-sending package is used for editing and sending the message."
 
 (provide 'reporter)
 
-;; arch-tag: 33612ff4-fbbc-4be2-b183-560ce9e0199b
 ;;; reporter.el ends here
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index ddaf762598..1fefef7e27 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -324,5 +324,4 @@
 
 (provide 'rfc822)
 
-;; arch-tag: 5d388a24-e173-40fb-9b8e-85269de44b37
 ;;; rfc822.el ends here
diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index a5d8e59a3c..aeb4de531a 100644
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -555,5 +555,4 @@ checks to see if the old format is used, and updates it if necessary."
 
 (provide 'rmail-spam-filter)
 
-;; arch-tag: 03e1d45d-b72f-4dd7-8f04-e7fd78249746
 ;;; rmail-spam-fitler ends here
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index 3c1b1935d8..2d5659a420 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -399,5 +399,4 @@ HEADER-DIFF should be a return value from `rmail-edit-diff-headers'."
 ;; generated-autoload-file: "rmail.el"
 ;; End:
 
-;; arch-tag: 9524f335-12cc-4e95-9e9b-3208dc30550b
 ;;; rmailedit.el ends here
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 4551454cd0..b9b69231b8 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -194,5 +194,4 @@ With prefix argument N moves forward N messages with these labels."
 ;; generated-autoload-file: "rmail.el"
 ;; End:
 
-;; arch-tag: 1149979c-8e47-4333-9629-cf3dc887a6a7
 ;;; rmailkwd.el ends here
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 2b42f81131..1b0e446209 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1385,5 +1385,4 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
 ;; generated-autoload-file: "rmail.el"
 ;; End:
 
-;; arch-tag: 3f2c5e5d-1aef-4512-bc20-fd737c9d5dd9
 ;;; rmailmm.el ends here
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index 919f52a888..884a6b96d9 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -59,5 +59,4 @@ This applies only to the current session."
 ;; generated-autoload-file: "rmail.el"
 ;; End:
 
-;; arch-tag: 94614a62-2a0a-4e25-bac9-06f461ed4c60
 ;;; rmailmsc.el ends here
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 969bce938b..f630b92d52 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -603,5 +603,4 @@ than appending to it.  Deletes the message after writing if
   (if rmail-delete-after-output
       (rmail-delete-forward)))
 
-;; arch-tag: 4059abf0-f249-4be4-8e0d-602d370d01d1
 ;;; rmailout.el ends here
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index 44204a4b91..38e24295e8 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -255,5 +255,4 @@ Numeric keys are sorted numerically, all others as strings."
 ;; generated-autoload-file: "rmail.el"
 ;; End:
 
-;; arch-tag: 665da245-f6a7-4115-ad8c-ba19216988d5
 ;;; rmailsort.el ends here
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 73e009ea69..3c45c4d791 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -1847,5 +1847,4 @@ the summary is only showing a subset of messages."
 ;; generated-autoload-file: "rmail.el"
 ;; End:
 
-;; arch-tag: 80b0a27a-a50d-4f37-9466-83d32d1e0ca8
 ;;; rmailsum.el ends here
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index e37c7a0149..e73897e61c 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -1997,5 +1997,4 @@ version at point."
 (provide 'supercite)
 (run-hooks 'sc-load-hook)
 
-;; arch-tag: a5d5bfa6-3bd5-4414-8c65-0afc83e45cd3
 ;;; supercite.el ends here
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index e71dd9cea2..d322ccaaf8 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -375,5 +375,4 @@ You might need to set `uce-mail-reader' before using this."
 
 (provide 'uce)
 
-;; arch-tag: 44b68c87-9b29-47bd-822c-3feee3883221
 ;;; uce.el ends here
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 0403c4afc6..3818b6aa45 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -329,5 +329,4 @@ following the containing message."
 ;; generated-autoload-file: "rmail.el"
 ;; End:
 
-;; arch-tag: 3a28b9fb-c1f5-43ef-9278-285f3e4b874d
 ;;; undigest.el ends here
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 4aa727f9f5..f358968a26 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -245,5 +245,4 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
 
 (provide 'unrmail)
 
-;; arch-tag: 14c6290d-60b2-456f-8909-5c2387de6acb
 ;;; unrmail.el ends here
diff --git a/lisp/man.el b/lisp/man.el
index eb21cb2e83..d22ea9cebb 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1721,5 +1721,4 @@ Uses `Man-name-local-regexp'."
 
 (provide 'man)
 
-;; arch-tag: 587cda76-8e23-4594-b1f3-89b6b09a0d47
 ;;; man.el ends here
diff --git a/lisp/master.el b/lisp/master.el
index 7b5ed66f74..edd24d1d92 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -159,5 +159,4 @@ See `recenter'."
 
 (provide 'master)
 
-;; arch-tag: dca08daa-8127-45ae-b77e-b135160dce98
 ;;; master.el ends here
diff --git a/lisp/mb-depth.el b/lisp/mb-depth.el
index 80847609d0..19b92daff8 100644
--- a/lisp/mb-depth.el
+++ b/lisp/mb-depth.el
@@ -72,5 +72,4 @@ Returns non-nil if the new state is enabled."
 
 (provide 'mb-depth)
 
-;; arch-tag: 50224089-5bf5-46f8-803d-18f018c5eacf
 ;;; mb-depth.el ends here
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index b6e4dad2c7..e4250cbb79 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -3297,4 +3297,3 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-;;; arch-tag: 87324964-69b6-4925-a3c2-9c1df53d7d51
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index a53ae4a3ed..d66cd4846c 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -327,5 +327,4 @@ MH-E functions."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: b383b49a-494f-4ed0-a30a-cb6d5d2da4ff
 ;;; mh-acros.el ends here
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index d0917386f1..e141d865bf 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -670,5 +670,4 @@ show buffer, the message in the show buffer doesn't match."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 49879e46-5aa3-4569-bece-e5a58731d690
 ;;; mh-alias.el ends here
diff --git a/lisp/mh-e/mh-buffers.el b/lisp/mh-e/mh-buffers.el
index d8666f6f8c..ca06cc9f51 100644
--- a/lisp/mh-e/mh-buffers.el
+++ b/lisp/mh-e/mh-buffers.el
@@ -83,5 +83,4 @@ The function returns the size of the final size of the log buffer."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 812e9f29-78b8-4e73-ada9-aa61dc1ceecb
 ;;; mh-buffers.el ends here
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index c4cfe5ca91..234493c9c5 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -1113,5 +1113,4 @@ doesn't exist there."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 62865511-e610-4923-b0b5-f45a8ab70a34
 ;;; mh-comp.el ends here
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index 0ecd9ac671..303a5c7c9d 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -315,5 +315,4 @@ XEmacs."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 577b0eab-a5cd-45e1-8d9f-c1a426f4d73c
 ;;; mh-compat.el ends here
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 0054cd2205..0bf73dc0a5 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -3727,5 +3727,4 @@ The background and foreground are used in the image."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: cce884de-bd37-4104-9963-e4439d5ed22b
 ;;; mh-e.el ends here
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index b225474a03..01b442fc8f 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -1974,5 +1974,4 @@ If MSG is nil then act on the message at point"
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: aa97b758-d4f6-4c86-bc5a-1950921da1e7
 ;;; mh-folder.el ends here
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index 188ac2d86d..4f471dfe21 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -372,5 +372,4 @@ See `mh-store-msg' for a description of DIRECTORY."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 1936c4f1-4843-438e-bc4b-a63bb75a7762
 ;;; mh-funcs.el ends here
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 23c2b038b4..ee72ba8bac 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -177,5 +177,4 @@ PROMPT overrides the default one used to ask user for a file name."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 1e3638af-cad3-4c69-8427-bc8eb6e5e4fa
 ;;; mh-gnus.el ends here
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index 1590feaabf..98683d9d2e 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -304,5 +304,4 @@ the header."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 07d66ef6-8726-4ac6-9ecf-e566cd5bfb45
 ;;; mh-identity.el ends here
diff --git a/lisp/mh-e/mh-inc.el b/lisp/mh-e/mh-inc.el
index 6e3cff212e..f1f54ed018 100644
--- a/lisp/mh-e/mh-inc.el
+++ b/lisp/mh-e/mh-inc.el
@@ -90,5 +90,4 @@
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 3713cf2a-6082-4cb4-8ce2-99d9acaba835
 ;;; mh-inc.el ends here
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index deb1c339a1..8b62160b96 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -467,5 +467,4 @@ See `mh-spamprobe-blacklist' for more information."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 603335f1-77ff-4306-8828-5d3dad51abe1
 ;;; mh-junk.el ends here
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 74635663b6..babcae8ff8 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -960,5 +960,4 @@ Otherwise, simply insert MH-INS-STRING before each line."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 0548632c-aadb-4e3b-bb80-bbd62ff90bf3
 ;;; mh-letter.el ends here
diff --git a/lisp/mh-e/mh-limit.el b/lisp/mh-e/mh-limit.el
index 62606211bf..c196d3d3fe 100644
--- a/lisp/mh-e/mh-limit.el
+++ b/lisp/mh-e/mh-limit.el
@@ -334,5 +334,4 @@ The MH command pick is used to do the match."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: b0d24378-1234-4c42-aa3f-7abad25b40a1
 ;;; mh-limit.el ends here
diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el
index bc73c32e0f..583a1e50f9 100644
--- a/lisp/mh-e/mh-print.el
+++ b/lisp/mh-e/mh-print.el
@@ -248,5 +248,4 @@ Consider using \\[mh-ps-print-msg] instead."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 8d84d50b-2a49-4d0d-b51e-ba9c9b6fc679
 ;;; mh-print.el ends here
diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el
index 8f9bcd53cd..31017fc61e 100644
--- a/lisp/mh-e/mh-scan.el
+++ b/lisp/mh-e/mh-scan.el
@@ -485,5 +485,4 @@ comes after that."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 5ab35d46-101e-443b-a2b6-5a908cf97528
 ;;; mh-scan.el ends here
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index 1c60a1a41e..49a48304b8 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1931,5 +1931,4 @@ folder buffer."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 607762ad-0dff-4fe1-a27e-6c0dde0dcc47
 ;;; mh-search ends here
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index 1c2d7850d4..7e123a84cb 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -917,5 +917,4 @@ See also `mh-folder-mode'.
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 8607a80a-9b5c-43a7-a25d-d7e4a848c25b
 ;;; mh-show.el ends here
diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el
index 8782671c95..334b4111dd 100644
--- a/lisp/mh-e/mh-speed.el
+++ b/lisp/mh-e/mh-speed.el
@@ -581,5 +581,4 @@ The function invalidates the latest ancestor that is present."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: d38ddcd4-3c00-4e37-99bf-8b89dda7b32c
 ;;; mh-speed.el ends here
diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el
index f172d45013..13a64a9ff4 100644
--- a/lisp/mh-e/mh-thread.el
+++ b/lisp/mh-e/mh-thread.el
@@ -880,5 +880,4 @@ This function can only be used the folder is threaded."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: b10e62f5-f028-4e04-873e-89d0e069b3d5
 ;;; mh-thread.el ends here
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index f51c97e4e6..8b78cbc8b1 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -465,5 +465,4 @@ This button runs `mh-widen'"))
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 28c2436d-bb8d-486a-a8d7-5a4d9cae3513
 ;;; mh-tool-bar.el ends here
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 2ac6d2faad..01780bed18 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -1013,5 +1013,4 @@ If the current line is too long truncate a part of it as well."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 1af39fdf-f66f-4b06-9b48-18a7656c8e36
 ;;; mh-utils.el ends here
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index 5229f95f5d..3d4557642e 100644
--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@@ -471,5 +471,4 @@ The argument CHANGE is ignored."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: a79dd33f-d0e5-4b19-a53a-be690f90229a
 ;;; mh-xface.el ends here
diff --git a/lisp/midnight.el b/lisp/midnight.el
index b4b0528677..f5d7c5b446 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -234,5 +234,4 @@ first argument to `run-at-time'."
 
 (provide 'midnight)
 
-;; arch-tag: a5979be9-2890-46a3-ba84-791f0a4a6e80
 ;;; midnight.el ends here
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 50e90c1e06..115a861050 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -156,5 +156,4 @@ Returns non-nil if the new state is enabled."
 
 (provide 'minibuf-eldef)
 
-;; arch-tag: 7e421fae-c275-4729-b0da-7836af377d3d
 ;;; minibuf-eldef.el ends here
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 284cbdc218..a1e20257b2 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2320,5 +2320,4 @@ filter out additional entries (because TABLE migth not obey PRED)."
 
 (provide 'minibuffer)
 
-;; arch-tag: ef8a0a15-1080-4790-a754-04017c02f08f
 ;;; minibuffer.el ends here
diff --git a/lisp/misearch.el b/lisp/misearch.el
index 5d4d3ef49c..7800f5f64b 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -378,5 +378,4 @@ whose file names match the specified wildcard."
 
 (provide 'multi-isearch)
 
-;; arch-tag: a6d38ffa-4d14-4e39-8ac6-46af9d6a6773
 ;;; misearch.el ends here
diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el
index f600a849ce..2b3b23904c 100644
--- a/lisp/mouse-copy.el
+++ b/lisp/mouse-copy.el
@@ -222,5 +222,4 @@ by johnh@ficus.cs.ucla.edu."
 
 (provide 'mouse-copy)
 
-;; arch-tag: 3d50293b-c089-4273-b412-4fc96a5f26ff
 ;;; mouse-copy.el ends here
diff --git a/lisp/mpc.el b/lisp/mpc.el
index c5dcd33ccf..56b6fed871 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -2611,5 +2611,4 @@ This is used so that they can be compared with `eq', which is needed for
 
 (provide 'mpc)
 
-;; arch-tag: 4794b2f5-59e6-4f26-b695-650b3e002f37
 ;;; mpc.el ends here
diff --git a/lisp/msb.el b/lisp/msb.el
index 0e7a20fd33..55d15e4d8b 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -1154,5 +1154,4 @@ different buffer menu using the function `msb'."
 (provide 'msb)
 (eval-after-load "msb" '(run-hooks 'msb-after-load-hook 'msb-after-load-hooks))
 
-;; arch-tag: 403f9e82-b92e-4e7a-a797-5d6d9b76da36
 ;;; msb.el ends here
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index d16c20cd58..1be3b2ee53 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -285,5 +285,4 @@ Return non-nil if the new state is enabled."
 
 (provide 'mwheel)
 
-;; arch-tag: 50ed00e7-3686-4b7a-8037-fb31aa5c237f
 ;;; mwheel.el ends here
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index 0f6aae3961..70fae8864f 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -366,5 +366,4 @@ display a button."
   "Display a button for the JPEG DATA."
   (eudc-bob-display-jpeg data nil))
 
-;; arch-tag: 8f1853df-c9b6-4c5a-bdb1-d94dbd651fb3
 ;;; eudc-bob.el ends here
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index f5d4311fce..49afea8f41 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -220,5 +220,4 @@ This function can only be called from a directory query result buffer."
        (overlay-get (car (overlays-at (point))) 'eudc-record)
        (eudc-insert-record-at-point-into-bbdb)))
 
-;; arch-tag: 8cbda7dc-3163-47e6-921c-6ec5083df2d7
 ;;; eudc-export.el ends here
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 7cfb7a159e..b37fb174a7 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -194,5 +194,4 @@ These are the special commands of this mode:
     ""
     eudc-hotlist-menu))
 
-;; arch-tag: 9b633ab3-6a6e-4b46-b12e-d96739a7e0e8
 ;;; eudc-hotlist.el ends here
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index 54c7ae074c..1322dc1c46 100644
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -406,5 +406,4 @@ Otherwise records must match queries exactly."
 
 (provide 'eudc-vars)
 
-;; arch-tag: 80050575-b838-4246-8ebc-b2d7c5a2e482
 ;;; eudc-vars.el ends here
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index 0b50f51617..cdfd02b3f6 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -243,5 +243,4 @@ RETURN-ATTRS is a list of attributes to return, defaulting to
 
 (provide 'eudcb-bbdb)
 
-;; arch-tag: 38276208-75de-4dbc-ba6f-8db684c32e0a
 ;;; eudcb-bbdb.el ends here
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index 192f0f4600..8e2af6ba6b 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -208,5 +208,4 @@ attribute names are returned. Default to `person'"
 
 (provide 'eudcb-ldap)
 
-;; arch-tag: 0f254dc0-7378-4fd4-ae26-18666184e96b
 ;;; eudcb-ldap.el ends here
diff --git a/lisp/net/eudcb-mab.el b/lisp/net/eudcb-mab.el
index 4d34bfde9d..9163aac13f 100644
--- a/lisp/net/eudcb-mab.el
+++ b/lisp/net/eudcb-mab.el
@@ -130,5 +130,4 @@ RETURN-ATTRS is a list of attributes to return, defaulting to
 
 (provide 'eudcb-mab)
 
-;; arch-tag: 4bef8e65-f109-47c7-91b9-8a6ea3ed7bb1
 ;;; eudcb-mab.el ends here
diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el
index 794fcdfb5f..4a6cbef92f 100644
--- a/lisp/net/eudcb-ph.el
+++ b/lisp/net/eudcb-ph.el
@@ -241,5 +241,4 @@ depending on RETURN-RESPONSE."
 
 (provide 'eudcb-ph)
 
-;; arch-tag: 4365bbf5-af20-453e-b5b6-2e7118ebfcdb
 ;;; eudcb-ph.el ends here
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 3bcf985052..96df47f2fe 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -302,5 +302,4 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and
 
 (provide 'goto-addr)
 
-;; arch-tag: ca47c505-5661-425d-a471-62bc6e75cf0a
 ;;; goto-addr.el ends here
diff --git a/lisp/net/imap-hash.el b/lisp/net/imap-hash.el
index ebc90632ca..3460389dc1 100644
--- a/lisp/net/imap-hash.el
+++ b/lisp/net/imap-hash.el
@@ -371,4 +371,3 @@ Get only the headers if HEADERS-ONLY is not nil."
 ;;; (imap-hash-fetch iht nil 1 2 3)
 ;;; (imap-hash-fetch iht t 1 2 3)
 
-;; arch-tag: 071410ac-91dc-4e36-b892-18e057d639c5
diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el
index 2655c4feb7..e145bd2274 100644
--- a/lisp/net/mairix.el
+++ b/lisp/net/mairix.el
@@ -946,4 +946,3 @@ Use cursor keys or C-n,C-p to select next/previous search.\n\n")
 
 ;;; mairix.el ends here
 
-;; arch-tag: 787ab678-fcd5-4c50-9295-01c2ee5124a6
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 95e87e8c68..79bede155a 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -2353,5 +2353,4 @@ This function is suited for adding it to `newsticker-new-item-functions'."
 
 (provide 'newst-backend)
 
-;; arch-tag: 0e37b658-56e9-49ab-90f9-f2df57e1a659
 ;;; newst-backend.el ends here
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index 987c9f0413..d37d38f955 100644
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -1800,5 +1800,4 @@ Take care: end of item is at the end of its last line!"
 
 (provide 'newst-plainview)
 
-;; arch-tag: 4e48b683-d48b-48dd-a13e-fe45baf41184
 ;;; newst-plainview.el ends here
diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el
index 92766cb0a4..7f5c36aa83 100644
--- a/lisp/net/newst-reader.el
+++ b/lisp/net/newst-reader.el
@@ -1181,5 +1181,4 @@ static char * visit_xpm[] = {
 
 (provide 'newst-reader)
 
-;; arch-tag: c604b701-bdf1-4fc1-8d05-5fabd1939533
 ;;; newst-reader.el ends here
diff --git a/lisp/net/newst-ticker.el b/lisp/net/newst-ticker.el
index 6a9e12b8e5..1a5aff876c 100644
--- a/lisp/net/newst-ticker.el
+++ b/lisp/net/newst-ticker.el
@@ -290,5 +290,4 @@ running already."
 
 (provide 'newst-ticker)
 
-;; arch-tag: faee3ebb-749b-4935-9835-7f36d4b700f0
 ;;; newst-ticker.el ends here
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 3552107a37..955ed78c1d 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -2076,5 +2076,4 @@ POS gives the position where EVENT occurred."
 
 (provide 'newst-treeview)
 
-;; arch-tag: 5dbaff48-1f3e-4fc6-8ebd-e966fc90d2d4
 ;;; newst-treeview.el ends here
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index c8ad9a3227..0e807cca30 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -409,5 +409,4 @@
 
 (provide 'newsticker)
 
-;; arch-tag: ab761dfa-67bc-4207-bc64-4307271dc381
 ;;; newsticker.el ends here
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 964f9c44cc..6481f627d9 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2852,5 +2852,4 @@ Passwords are stored in `rcirc-authinfo' (which see)."
 
 (provide 'rcirc)
 
-;; arch-tag: b471b7e8-6b5a-4399-b2c6-a3c78dfc8ffb
 ;;; rcirc.el ends here
diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el
index bd98ab6dd3..21e8650a69 100644
--- a/lisp/net/rcompile.el
+++ b/lisp/net/rcompile.el
@@ -178,5 +178,4 @@ See \\[compile]."
 	      remote-compile-host
 	      ""))))))
 
-;; arch-tag: 2866a132-ece4-4ce9-9f91-ec147f803f73
 ;;; rcompile.el ends here
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index 42b671fac6..12f7367705 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -318,5 +318,4 @@ Delete ARG characters forward, or send a C-d to process if at end of buffer."
 
 (provide 'rlogin)
 
-;; arch-tag: 6e20eabf-feda-40fa-ab40-0d156db447e4
 ;;; rlogin.el ends here
diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el
index 111fb4ea2f..3229aa74f9 100644
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -694,5 +694,4 @@ controls whether case is significant."
 
 (provide 'snmp-mode)
 
-;; arch-tag: eb6cc0f9-1e47-4023-8625-bc9aae6c3527
 ;;; snmp-mode.el ends here
diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index 420d9d1977..df4ffb7324 100644
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -646,5 +646,4 @@ version.")
 
 (provide 'socks)
 
-;; arch-tag: 67aef0d9-f4f7-4056-89c3-b4c9bf93ce7f
 ;;; socks.el ends here
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index 5403e3b335..bc3621c199 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -263,5 +263,4 @@ Normally input is edited in Emacs and sent a line at a time."
 
 (provide 'telnet)
 
-;; arch-tag: 98218821-d04a-48b6-9058-57d0d4677a56
 ;;; telnet.el ends here
diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el
index 89947ae761..b4af01cec4 100644
--- a/lisp/net/tramp-uu.el
+++ b/lisp/net/tramp-uu.el
@@ -94,7 +94,6 @@
 
 (provide 'tramp-uu)
 
-;; arch-tag: 7153f2c6-8be5-4cd2-8c06-0fbcf5190ef6
 ;;; tramp-uu.el ends here
 
 ;; Local Variables:
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index 51c2a682d2..c34d70d489 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -480,5 +480,4 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
 
 (provide 'webjump)
 
-;; arch-tag: f1d20156-0a6f-488b-bd91-f69ee8b6d5cc
 ;;; webjump.el ends here
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el
index 234a89393a..a078284f02 100644
--- a/lisp/net/xesam.el
+++ b/lisp/net/xesam.el
@@ -918,5 +918,4 @@ Example:
 ;;     yahoo, ebay, ...
 ;;   - Construct complex queries via widgets, like in mairix.el.
 
-;; arch-tag: 7fb9fc6c-c2ff-4bc7-bb42-bacb80cce2b2
 ;;; xesam.el ends here
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el
index 40ceb5b149..b36330342f 100644
--- a/lisp/net/zeroconf.el
+++ b/lisp/net/zeroconf.el
@@ -686,5 +686,4 @@ For the description of arguments, see `zeroconf-resolved-services-hash'."
 
 (provide 'zeroconf)
 
-;; arch-tag: ea578165-7fa8-44f4-90f0-de3940aec69f
 ;;; zeroconf.el ends here
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 6e2955c660..7511c682f7 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -1390,5 +1390,4 @@ unless optional argument SOFT is non-nil."
 
 (provide 'newcomment)
 
-;; arch-tag: 01e3320a-00c8-44ea-a696-8f8e7354c858
 ;;; newcomment.el ends here
diff --git a/lisp/nxml/nxml-enc.el b/lisp/nxml/nxml-enc.el
index 0a0d70f31b..96af778eed 100644
--- a/lisp/nxml/nxml-enc.el
+++ b/lisp/nxml/nxml-enc.el
@@ -146,5 +146,4 @@ Applied to any files that `auto-mode-alist' says should be handled by
 
 (provide 'nxml-enc)
 
-;; arch-tag: c2436247-78f3-418c-8069-85dc5335d083
 ;;; nxml-enc.el ends here
diff --git a/lisp/nxml/nxml-glyph.el b/lisp/nxml/nxml-glyph.el
index 9d7e5136e4..bfd4c3565d 100644
--- a/lisp/nxml/nxml-glyph.el
+++ b/lisp/nxml/nxml-glyph.el
@@ -415,5 +415,4 @@ Return nil if the face cannot display a glyph for N."
 
 (provide 'nxml-glyph)
 
-;; arch-tag: 50985104-27c6-4241-8625-b11aa5685633
 ;;; nxml-glyph.el ends here
diff --git a/lisp/nxml/nxml-ns.el b/lisp/nxml/nxml-ns.el
index 4bb68a5504..c6e8456a89 100644
--- a/lisp/nxml/nxml-ns.el
+++ b/lisp/nxml/nxml-ns.el
@@ -145,5 +145,4 @@ NS is a symbol or nil."
 
 (provide 'nxml-ns)
 
-;; arch-tag: 5968e4b7-fb37-46ce-8621-c65db9793028
 ;;; nxml-ns.el ends here
diff --git a/lisp/nxml/nxml-parse.el b/lisp/nxml/nxml-parse.el
index 3566331284..72e053c5cb 100644
--- a/lisp/nxml/nxml-parse.el
+++ b/lisp/nxml/nxml-parse.el
@@ -315,5 +315,4 @@ same way as well-formedness error."
 
 (provide 'nxml-parse)
 
-;; arch-tag: fc19639b-1bff-4673-9992-f539da89ba1e
 ;;; nxml-parse.el ends here
diff --git a/lisp/nxml/nxml-rap.el b/lisp/nxml/nxml-rap.el
index 5816b5a398..b7b05ab43f 100644
--- a/lisp/nxml/nxml-rap.el
+++ b/lisp/nxml/nxml-rap.el
@@ -482,5 +482,4 @@ expected `%s'"
 
 (provide 'nxml-rap)
 
-;; arch-tag: cba241ec-4c59-4ef3-aa51-2cf92b3dd24f
 ;;; nxml-rap.el ends here
diff --git a/lisp/nxml/nxml-uchnm.el b/lisp/nxml/nxml-uchnm.el
index 418ff917a4..530a71dc95 100644
--- a/lisp/nxml/nxml-uchnm.el
+++ b/lisp/nxml/nxml-uchnm.el
@@ -248,5 +248,4 @@ the variable `nxml-enabled-unicode-blocks'."
 
 (provide 'nxml-uchnm)
 
-;; arch-tag: 440248c3-b604-467c-8b50-e83662c659a3
 ;;; nxml-uchnm.el ends here
diff --git a/lisp/nxml/nxml-util.el b/lisp/nxml/nxml-util.el
index e764d59fad..770f09a603 100644
--- a/lisp/nxml/nxml-util.el
+++ b/lisp/nxml/nxml-util.el
@@ -132,5 +132,4 @@ modifications to the buffer."
 
 (provide 'nxml-util)
 
-;; arch-tag: 7d3b3af4-de2b-4410-bf67-94d64824324b
 ;;; nxml-util.el ends here
diff --git a/lisp/nxml/rng-cmpct.el b/lisp/nxml/rng-cmpct.el
index 36db724d7f..65ab323df2 100644
--- a/lisp/nxml/rng-cmpct.el
+++ b/lisp/nxml/rng-cmpct.el
@@ -938,4 +938,3 @@ Current token after parse is token following ]."
 
 ;;; rng-cmpct.el
 
-;; arch-tag: 90395eb1-283b-4146-bbc1-6d6ef1704e57
diff --git a/lisp/nxml/rng-dt.el b/lisp/nxml/rng-dt.el
index 35f55b5d9d..25abeb0048 100644
--- a/lisp/nxml/rng-dt.el
+++ b/lisp/nxml/rng-dt.el
@@ -61,5 +61,4 @@ a datatype library.")
 
 (provide 'rng-dt)
 
-;; arch-tag: 1dca90f1-8dae-4dd4-b61f-fade4452c014
 ;;; rng-dt.el ends here
diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el
index 5226868836..7a6f3377f6 100644
--- a/lisp/nxml/rng-maint.el
+++ b/lisp/nxml/rng-maint.el
@@ -275,5 +275,4 @@
   (while (rng-do-some-validation
 	  (lambda () t))))
 
-;; arch-tag: 4b8c6143-daac-4888-9c61-9bea6f935f17
 ;;; rng-maint.el ends here
diff --git a/lisp/nxml/rng-match.el b/lisp/nxml/rng-match.el
index b49acdfb7b..b47ac09969 100644
--- a/lisp/nxml/rng-match.el
+++ b/lisp/nxml/rng-match.el
@@ -1736,5 +1736,4 @@ be exhaustive."
 
 (provide 'rng-match)
 
-;; arch-tag: c8c50733-edcf-49fb-85e2-0aac8749b7f8
 ;;; rng-match.el ends here
diff --git a/lisp/nxml/rng-parse.el b/lisp/nxml/rng-parse.el
index 7e3a8cdefe..83f0ee39c3 100644
--- a/lisp/nxml/rng-parse.el
+++ b/lisp/nxml/rng-parse.el
@@ -100,5 +100,4 @@ be signaled in the same way as when it is not well-formed."
 
 (provide 'rng-parse)
 
-;; arch-tag: 8f14f533-b687-4dc0-9cd7-617ead856981
 ;;; rng-parse.el ends here
diff --git a/lisp/nxml/rng-pttrn.el b/lisp/nxml/rng-pttrn.el
index 8e7139df32..6a9db71ebc 100644
--- a/lisp/nxml/rng-pttrn.el
+++ b/lisp/nxml/rng-pttrn.el
@@ -186,5 +186,4 @@
 
 (provide 'rng-pttrn)
 
-;; arch-tag: 9418e269-ddd4-4037-861f-ff903f48f008
 ;;; rng-pttrn.el ends here
diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el
index b4cbd9a066..73d8f3b373 100644
--- a/lisp/nxml/rng-uri.el
+++ b/lisp/nxml/rng-uri.el
@@ -352,5 +352,4 @@ Both FULL and BASE must be absolute URIs."
 
 (provide 'rng-uri)
 
-;; arch-tag: c7b7b8b8-61d1-48ec-82bc-7001c70b2e9d
 ;;; rng-uri.el ends here
diff --git a/lisp/nxml/rng-util.el b/lisp/nxml/rng-util.el
index 0c4fb818a5..cca6f28f22 100644
--- a/lisp/nxml/rng-util.el
+++ b/lisp/nxml/rng-util.el
@@ -167,5 +167,4 @@ HIST, if non-nil, specifies a history list as with `completing-read'."
 
 (provide 'rng-util)
 
-;; arch-tag: 2dc233e0-5e7a-488f-bfc4-5909512dbaf0
 ;;; rng-util.el ends here
diff --git a/lisp/nxml/rng-xsd.el b/lisp/nxml/rng-xsd.el
index e729b30671..c4f28b746c 100644
--- a/lisp/nxml/rng-xsd.el
+++ b/lisp/nxml/rng-xsd.el
@@ -856,5 +856,4 @@ MONTHS must be an integer >= 0."
 
 (provide 'rng-xsd)
 
-;; arch-tag: 6b05510e-a5bb-4b99-8618-4660d00d0abb
 ;;; rng-xsd.el ends here
diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el
index da8f356f9c..831f5de325 100644
--- a/lisp/nxml/xmltok.el
+++ b/lisp/nxml/xmltok.el
@@ -1920,5 +1920,4 @@ and `xmltok-namespace-attributes'."
 
 (provide 'xmltok)
 
-;; arch-tag: 747e5f3a-6fc3-4f8d-bd96-89f05aa99f5e
 ;;; xmltok.el ends here
diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el
index 80b818e930..4d470de973 100644
--- a/lisp/nxml/xsd-regexp.el
+++ b/lisp/nxml/xsd-regexp.el
@@ -2117,5 +2117,4 @@ Code is inserted into the current buffer."
 
 (provide 'xsd-regexp)
 
-;; arch-tag: bf990d61-a26c-4fd3-b578-56a5640729da
 ;;; xsd-regexp.el ends here
diff --git a/lisp/obsolete/awk-mode.el b/lisp/obsolete/awk-mode.el
index a629b3ec67..4556bda5ed 100644
--- a/lisp/obsolete/awk-mode.el
+++ b/lisp/obsolete/awk-mode.el
@@ -122,5 +122,4 @@ Turning on AWK mode runs `awk-mode-hook'."
 
 (provide 'awk-mode)
 
-;; arch-tag: 14ebc02a-b3c5-4e76-8034-6ca9ac0af0e6
 ;;; awk-mode.el ends here
diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el
index faf8d8336e..e0cd171753 100644
--- a/lisp/obsolete/complete.el
+++ b/lisp/obsolete/complete.el
@@ -1120,5 +1120,4 @@ This is only used by "
 
 (provide 'complete)
 
-;; arch-tag: fc7e2768-ff44-4e22-b579-4d825b968458
 ;;; complete.el ends here
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 353f39273b..ffd6a930c0 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -855,5 +855,4 @@ See `fast-lock-get-face-properties'."
 
 (provide 'fast-lock)
 
-;; arch-tag: 638c431e-8cae-4538-80a1-963ff97d233e
 ;;; fast-lock.el ends here
diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el
index a237b17dee..28d73649dd 100644
--- a/lisp/obsolete/iso-acc.el
+++ b/lisp/obsolete/iso-acc.el
@@ -487,5 +487,4 @@ Noninteractively, this operates on text from START to END."
 
 (add-hook 'minibuffer-setup-hook 'iso-acc-minibuf-setup)
 
-;; arch-tag: 149ff409-7c3e-4574-9b5d-ac038939c0a6
 ;;; iso-acc.el ends here
diff --git a/lisp/obsolete/iso-insert.el b/lisp/obsolete/iso-insert.el
index 785e372f01..c1d65d85c6 100644
--- a/lisp/obsolete/iso-insert.el
+++ b/lisp/obsolete/iso-insert.el
@@ -629,5 +629,4 @@
 
 (provide 'iso-insert)
 
-;; arch-tag: eb5f97bd-a034-4851-92ff-ab1f1bf92814
 ;;; iso-insert.el ends here
diff --git a/lisp/obsolete/iso-swed.el b/lisp/obsolete/iso-swed.el
index c3620711eb..b8c1556a61 100644
--- a/lisp/obsolete/iso-swed.el
+++ b/lisp/obsolete/iso-swed.el
@@ -149,5 +149,4 @@
 
 (provide 'iso-swed)
 
-;; arch-tag: 6b3dc269-660c-44b6-a25f-680b921eaf2c
 ;;; iso-swed.el ends here
diff --git a/lisp/obsolete/keyswap.el b/lisp/obsolete/keyswap.el
index cb04a5858d..053e8f7efa 100644
--- a/lisp/obsolete/keyswap.el
+++ b/lisp/obsolete/keyswap.el
@@ -39,5 +39,4 @@
   (aset the-table ?\^h ?\177)
   (setq keyboard-translate-table the-table))
 
-;; arch-tag: 67cf7009-e23e-421c-9648-078e7277297c
 ;;; keyswap.el ends here
diff --git a/lisp/obsolete/levents.el b/lisp/obsolete/levents.el
index 126b5a1f9b..753484c39f 100644
--- a/lisp/obsolete/levents.el
+++ b/lisp/obsolete/levents.el
@@ -290,5 +290,4 @@ GNU Emacs 19 does not currently generate process-output events."
 
 (provide 'levents)
 
-;; arch-tag: a80c21da-69d7-46de-9cdb-5f68577b5525
 ;;; levents.el ends here
diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el
index e230fa55b0..a69e353cbf 100644
--- a/lisp/obsolete/old-whitespace.el
+++ b/lisp/obsolete/old-whitespace.el
@@ -809,5 +809,4 @@ This is meant to be added buffer-locally to `write-file-functions'."
 
 (provide 'whitespace)
 
-;; arch-tag: 4ff44e87-b63c-402d-95a6-15e51e58bd0c
 ;;; whitespace.el ends here
diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el
index 5bb5dbb84b..57bdba9940 100644
--- a/lisp/obsolete/options.el
+++ b/lisp/obsolete/options.el
@@ -147,5 +147,4 @@ For convenience, the characters \\[backward-paragraph] and \\[forward-paragraph]
 
 (provide 'options)
 
-;; arch-tag: d18211a1-f3fb-48c9-a449-d5acde406a3c
 ;;; options.el ends here
diff --git a/lisp/obsolete/resume.el b/lisp/obsolete/resume.el
index 64031533da..54c7ddf889 100644
--- a/lisp/obsolete/resume.el
+++ b/lisp/obsolete/resume.el
@@ -124,5 +124,4 @@
 
 (provide 'resume)
 
-;; arch-tag: c90b2761-4803-4e58-a0ae-c4721368b628
 ;;; resume.el ends here
diff --git a/lisp/obsolete/s-region.el b/lisp/obsolete/s-region.el
index 2b8c4a38bf..225ce8f949 100644
--- a/lisp/obsolete/s-region.el
+++ b/lisp/obsolete/s-region.el
@@ -121,5 +121,4 @@ to global keymap."
 
 (provide 's-region)
 
-;; arch-tag: a471e912-18d7-4247-a29b-2100bca180ff
 ;;; s-region.el ends here
diff --git a/lisp/obsolete/scribe.el b/lisp/obsolete/scribe.el
index 8820aff3ef..bf56c9fd56 100644
--- a/lisp/obsolete/scribe.el
+++ b/lisp/obsolete/scribe.el
@@ -326,5 +326,4 @@ preceding text is of the form @Command."
 
 (provide 'scribe)
 
-;; arch-tag: 64f454c4-7544-4ea2-9d14-f0b668f2cdc6
 ;;; scribe.el ends here
diff --git a/lisp/obsolete/sregex.el b/lisp/obsolete/sregex.el
index e6bebc861a..5f5b79379b 100644
--- a/lisp/obsolete/sregex.el
+++ b/lisp/obsolete/sregex.el
@@ -605,5 +605,4 @@ has one of the following forms:
 
 (provide 'sregex)
 
-;; arch-tag: 460c1f5a-eb6e-42ec-a451-ffac78bdf492
 ;;; sregex.el ends here
diff --git a/lisp/obsolete/swedish.el b/lisp/obsolete/swedish.el
index e753e93b11..ec572c7858 100644
--- a/lisp/obsolete/swedish.el
+++ b/lisp/obsolete/swedish.el
@@ -159,5 +159,4 @@ Leaves point just after the word that looks Swedish."
 
 (provide 'swedish)
 
-;; arch-tag: a117019d-acac-4ac4-8eac-0dbd49a41d32
 ;;; swedish.el ends here
diff --git a/lisp/obsolete/sym-comp.el b/lisp/obsolete/sym-comp.el
index fc2da0ff69..bc6e72420d 100644
--- a/lisp/obsolete/sym-comp.el
+++ b/lisp/obsolete/sym-comp.el
@@ -227,5 +227,4 @@ completion:
 
 (provide 'sym-comp)
 
-;; arch-tag: 6fcce616-f3c4-4751-94b4-710e83144124
 ;;; sym-comp.el ends here
diff --git a/lisp/obsolete/vc-mcvs.el b/lisp/obsolete/vc-mcvs.el
index 064458a705..2d791a5934 100644
--- a/lisp/obsolete/vc-mcvs.el
+++ b/lisp/obsolete/vc-mcvs.el
@@ -585,5 +585,4 @@ and that it passes `vc-mcvs-global-switches' to it before FLAGS."
 ;;
 ;; ********** READ THIS! **********
 
-;; arch-tag: a39c7c1c-5247-429d-88df-dd7187d2e704
 ;;; vc-mcvs.el ends here
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 0075346763..25d08a96bc 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -12900,4 +12900,3 @@
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;; arch-tag: a9bdcf06-7c2d-4b5a-bf7a-c5e7b706f67c
diff --git a/lisp/org/ob-C.el b/lisp/org/ob-C.el
index dc1c61943a..1b6ef7caea 100644
--- a/lisp/org/ob-C.el
+++ b/lisp/org/ob-C.el
@@ -189,6 +189,5 @@ of the same value."
 
 (provide 'ob-C)
 
-;; arch-tag: 8f49e462-54e3-417b-9a8d-423864893b37
 
 ;;; ob-C.el ends here
diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el
index 8486275323..8aabe537bc 100644
--- a/lisp/org/ob-R.el
+++ b/lisp/org/ob-R.el
@@ -298,6 +298,5 @@ Insert hline if column names in output have been requested."
 
 (provide 'ob-R)
 
-;; arch-tag: cd4c7298-503b-450f-a3c2-f3e74b630237
 
 ;;; ob-R.el ends here
diff --git a/lisp/org/ob-asymptote.el b/lisp/org/ob-asymptote.el
index 8164713976..92cc8a7075 100644
--- a/lisp/org/ob-asymptote.el
+++ b/lisp/org/ob-asymptote.el
@@ -159,6 +159,5 @@ of int, where every cell must be of int type."
 
 (provide 'ob-asymptote)
 
-;; arch-tag: f2f5bd0d-78e8-412b-8e6c-6dadc94cc06b
 
 ;;; ob-asymptote.el ends here
diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el
index 8af1c5a2f6..d6fbf3f92e 100644
--- a/lisp/org/ob-calc.el
+++ b/lisp/org/ob-calc.el
@@ -92,6 +92,5 @@
 
 (provide 'ob-calc)
 
-;; arch-tag: 5c57a3b7-5818-4c6c-acda-7a94831a6449
 
 ;;; ob-calc.el ends here
diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el
index a4e2308f1e..9ec8a5782b 100644
--- a/lisp/org/ob-clojure.el
+++ b/lisp/org/ob-clojure.el
@@ -83,6 +83,5 @@
 
 (provide 'ob-clojure)
 
-;; arch-tag: a43b33f2-653e-46b1-ac56-2805cf05b7d1
 
 ;;; ob-clojure.el ends here
diff --git a/lisp/org/ob-comint.el b/lisp/org/ob-comint.el
index 4d134550a0..9d1cfed1d2 100644
--- a/lisp/org/ob-comint.el
+++ b/lisp/org/ob-comint.el
@@ -158,6 +158,5 @@ FILE exists at end of evaluation."
 
 (provide 'ob-comint)
 
-;; arch-tag: 9adddce6-0864-4be3-b0b5-6c5157dc7889
 
 ;;; ob-comint.el ends here
diff --git a/lisp/org/ob-css.el b/lisp/org/ob-css.el
index 49f0fd846d..1c3aad5d0c 100644
--- a/lisp/org/ob-css.el
+++ b/lisp/org/ob-css.el
@@ -44,6 +44,5 @@ CSS does not support sessions."
 
 (provide 'ob-css)
 
-;; arch-tag: f4447e8c-50ab-41f9-b322-b7b9574d9fbe
 
 ;;; ob-css.el ends here
diff --git a/lisp/org/ob-ditaa.el b/lisp/org/ob-ditaa.el
index 60e28b7a24..4d00b16127 100644
--- a/lisp/org/ob-ditaa.el
+++ b/lisp/org/ob-ditaa.el
@@ -69,6 +69,5 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-ditaa)
 
-;; arch-tag: 492cd006-07d9-4fac-bef6-5bb60b48842e
 
 ;;; ob-ditaa.el ends here
diff --git a/lisp/org/ob-dot.el b/lisp/org/ob-dot.el
index ff75cc43c3..845d527a70 100644
--- a/lisp/org/ob-dot.el
+++ b/lisp/org/ob-dot.el
@@ -85,6 +85,5 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-dot)
 
-;; arch-tag: 817d0516-7b47-4f77-a8b2-2aadd8e4d0e2
 
 ;;; ob-dot.el ends here
diff --git a/lisp/org/ob-emacs-lisp.el b/lisp/org/ob-emacs-lisp.el
index 5dad0ba123..3fd694eeda 100644
--- a/lisp/org/ob-emacs-lisp.el
+++ b/lisp/org/ob-emacs-lisp.el
@@ -66,6 +66,5 @@
 
 (provide 'ob-emacs-lisp)
 
-;; arch-tag: e9a3acca-dc84-472a-9f5a-23c35befbcd6
 
 ;;; ob-emacs-lisp.el ends here
diff --git a/lisp/org/ob-eval.el b/lisp/org/ob-eval.el
index fb6bfc138d..7685eff14f 100644
--- a/lisp/org/ob-eval.el
+++ b/lisp/org/ob-eval.el
@@ -257,6 +257,5 @@ This buffer is named by `org-babel-error-buffer-name'."
 
 (provide 'ob-eval)
 
-;; arch-tag: 5328b17f-957d-42d9-94da-a2952682d04d
 
 ;;; ob-eval.el ends here
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index b571bb9641..ef3ec9fdfa 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -323,6 +323,5 @@ inhibit insertion of results into the buffer."
 
 (provide 'ob-exp)
 
-;; arch-tag: 523abf4c-76d1-44ed-9f27-e3bddf34bf0f
 
 ;;; ob-exp.el ends here
diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 0bb4759d1e..fa6473d784 100644
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/ob-gnuplot.el
@@ -230,6 +230,5 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
 
 (provide 'ob-gnuplot)
 
-;; arch-tag: 50490ace-a9e1-4b29-a6e5-0db9f16c610b
 
 ;;; ob-gnuplot.el ends here
diff --git a/lisp/org/ob-haskell.el b/lisp/org/ob-haskell.el
index 547f056b88..e03b81e47e 100644
--- a/lisp/org/ob-haskell.el
+++ b/lisp/org/ob-haskell.el
@@ -212,6 +212,5 @@ constructs (header arguments, no-web syntax etc...) are ignored."
 
 (provide 'ob-haskell)
 
-;; arch-tag: b53f75f3-ba1a-4b05-82d9-a2a0d4e70804
 
 ;;; ob-haskell.el ends here
diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el
index 132bd5d873..d2d739cc94 100644
--- a/lisp/org/ob-js.el
+++ b/lisp/org/ob-js.el
@@ -160,6 +160,5 @@ then create.  Return the initialized session."
 
 (provide 'ob-js)
 
-;; arch-tag: 84401fb3-b8d9-4bb6-9a90-cbe2d103d494
 
 ;;; ob-js.el ends here
diff --git a/lisp/org/ob-keys.el b/lisp/org/ob-keys.el
index 7aa26a0e55..f12ee7ebd6 100644
--- a/lisp/org/ob-keys.el
+++ b/lisp/org/ob-keys.el
@@ -93,6 +93,5 @@ a-list placed behind the generic `org-babel-key-prefix'.")
 
 (provide 'ob-keys)
 
-;; arch-tag: 01e348ee-4906-46fa-839a-6b7b6f989048
 
 ;;; ob-keys.el ends here
diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el
index d8e2d474dd..ed8cdcc4d8 100644
--- a/lisp/org/ob-latex.el
+++ b/lisp/org/ob-latex.el
@@ -175,6 +175,5 @@ Extracted from `org-export-as-pdf' in org-latex.el."
 
 (provide 'ob-latex)
 
-;; arch-tag: 1f13f7e2-26de-4c24-9274-9f331d4c6ff3
 
 ;;; ob-latex.el ends here
diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el
index 13f378de98..875044e8f0 100644
--- a/lisp/org/ob-ledger.el
+++ b/lisp/org/ob-ledger.el
@@ -67,6 +67,5 @@ called by `org-babel-execute-src-block'."
 
 (provide 'ob-ledger)
 
-;; arch-tag: 7bbb529e-95a1-4236-9d29-b0000b918c7c
 
 ;;; ob-ledger.el ends here
diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el
index f0062c0f86..1cf23adba4 100644
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -108,6 +108,5 @@ then create.  Return the initialized session."
 
 (provide 'ob-lisp)
 
-;; arch-tag: 18086168-009f-4947-bbb5-3532375d851d
 
 ;;; ob-lisp.el ends here
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el
index c448b4b8ca..0df45a312e 100644
--- a/lisp/org/ob-lob.el
+++ b/lisp/org/ob-lob.el
@@ -119,6 +119,5 @@ if so then run the appropriate source block from the Library."
 
 (provide 'ob-lob)
 
-;; arch-tag: ce0712c9-2147-4019-ba3f-42341b8b474b
 
 ;;; ob-lob.el ends here
diff --git a/lisp/org/ob-matlab.el b/lisp/org/ob-matlab.el
index ff4397d620..08edb7dcb7 100644
--- a/lisp/org/ob-matlab.el
+++ b/lisp/org/ob-matlab.el
@@ -43,6 +43,5 @@
 
 (provide 'ob-matlab)
 
-;; arch-tag: 6b234299-c1f7-4eb1-ace8-7b93344065ac
 
 ;;; ob-matlab.el ends here
diff --git a/lisp/org/ob-mscgen.el b/lisp/org/ob-mscgen.el
index d681ef21e9..df7a8f11b3 100644
--- a/lisp/org/ob-mscgen.el
+++ b/lisp/org/ob-mscgen.el
@@ -81,6 +81,5 @@ ERROR: no output file specified. Add \":file name.png\" to the src header"))
 
 (provide 'ob-mscgen)
 
-;; arch-tag: 74695b1e-715f-4b5a-a3a9-d78ee39ba5c8
 
 ;;; ob-msc.el ends here
diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el
index c63e89c58c..5a3c362562 100644
--- a/lisp/org/ob-ocaml.el
+++ b/lisp/org/ob-ocaml.el
@@ -152,6 +152,5 @@ Emacs-lisp table, otherwise return the results as a string."
 
 (provide 'ob-ocaml)
 
-;; arch-tag: 2e815f4d-365e-4d69-b1df-dd17fdd7b7b7
 
 ;;; ob-ocaml.el ends here
diff --git a/lisp/org/ob-octave.el b/lisp/org/ob-octave.el
index c5ede3cfc3..4181de05b2 100644
--- a/lisp/org/ob-octave.el
+++ b/lisp/org/ob-octave.el
@@ -259,6 +259,5 @@ This removes initial blank and comment lines and then calls
 
 (provide 'ob-octave)
 
-;; arch-tag: d8e5f68b-ba13-440a-a495-b653e989e704
 
 ;;; ob-octave.el ends here
diff --git a/lisp/org/ob-org.el b/lisp/org/ob-org.el
index 7df5acf6e2..2b22c899bb 100644
--- a/lisp/org/ob-org.el
+++ b/lisp/org/ob-org.el
@@ -57,6 +57,5 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-org)
 
-;; arch-tag: 130af5fe-cc56-46bd-9508-fa0ebd94cb1f
 
 ;;; ob-org.el ends here
diff --git a/lisp/org/ob-perl.el b/lisp/org/ob-perl.el
index 3b22872332..159333f5a0 100644
--- a/lisp/org/ob-perl.el
+++ b/lisp/org/ob-perl.el
@@ -112,6 +112,5 @@ return the value of the last statement in BODY, as elisp."
 
 (provide 'ob-perl)
 
-;; arch-tag: 88ef9396-d857-4dc3-8946-5a72bdfa2337
 
 ;;; ob-perl.el ends here
diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el
index 01232a90e6..83fa415014 100644
--- a/lisp/org/ob-plantuml.el
+++ b/lisp/org/ob-plantuml.el
@@ -78,6 +78,5 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-plantuml)
 
-;; arch-tag: 451f50c5-e779-407e-ad64-70e0e8f161d1
 
 ;;; ob-plantuml.el ends here
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el
index 26ebedc36c..3bf7ce6ec5 100644
--- a/lisp/org/ob-python.el
+++ b/lisp/org/ob-python.el
@@ -277,6 +277,5 @@ last statement in BODY, as elisp."
 
 (provide 'ob-python)
 
-;; arch-tag: f19b6c3d-dfcb-4a1a-9ce0-45ade1ebc212
 
 ;;; ob-python.el ends here
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index 54a8efbfd5..597f0dcce8 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -224,6 +224,5 @@ Supported reference types are tables and source blocks."
 
 (provide 'ob-ref)
 
-;; arch-tag: ace4a4f4-ea38-4dac-8fe6-6f52fcc43b6d
 
 ;;; ob-ref.el ends here
diff --git a/lisp/org/ob-ruby.el b/lisp/org/ob-ruby.el
index 76a28863e9..b9c122c86c 100644
--- a/lisp/org/ob-ruby.el
+++ b/lisp/org/ob-ruby.el
@@ -234,6 +234,5 @@ return the value of the last statement in BODY, as elisp."
 
 (provide 'ob-ruby)
 
-;; arch-tag: 3e9726db-4520-49e2-b263-e8f571ac88f5
 
 ;;; ob-ruby.el ends here
diff --git a/lisp/org/ob-sass.el b/lisp/org/ob-sass.el
index 847e524723..5300682c15 100644
--- a/lisp/org/ob-sass.el
+++ b/lisp/org/ob-sass.el
@@ -64,6 +64,5 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-sass)
 
-;; arch-tag: 2954b169-eef4-45ce-a8e5-3e619f0f07ac
 
 ;;; ob-sass.el ends here
diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el
index 1f9ee3cef3..1581f8a622 100644
--- a/lisp/org/ob-scheme.el
+++ b/lisp/org/ob-scheme.el
@@ -134,6 +134,5 @@ then create.  Return the initialized session."
 
 (provide 'ob-scheme)
 
-;; arch-tag: 6b2fe76f-4b25-4e87-ad1c-225b2f282a71
 
 ;;; ob-scheme.el ends here
diff --git a/lisp/org/ob-screen.el b/lisp/org/ob-screen.el
index 6b57ea198f..2325d434de 100644
--- a/lisp/org/ob-screen.el
+++ b/lisp/org/ob-screen.el
@@ -142,6 +142,5 @@ The terminal should shortly flicker."
 
 (provide 'ob-screen)
 
-;; arch-tag: 908e5afe-89a0-4f27-b982-23f1f2e3bac9
 
 ;;; ob-screen.el ends here
diff --git a/lisp/org/ob-sh.el b/lisp/org/ob-sh.el
index 0272272b63..0d52fd3eed 100644
--- a/lisp/org/ob-sh.el
+++ b/lisp/org/ob-sh.el
@@ -166,6 +166,5 @@ return the value of the last statement in BODY."
 
 (provide 'ob-sh)
 
-;; arch-tag: 416dd531-c230-4b0a-a5bf-8d948f990f2d
 
 ;;; ob-sh.el ends here
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 9cab52caa3..1d2d4faed7 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -121,6 +121,5 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-sql)
 
-;; arch-tag: a43ff944-6de1-4566-a83c-626814e3dad2
 
 ;;; ob-sql.el ends here
diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el
index e4281e4d8d..4157dca40b 100644
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -144,6 +144,5 @@ Prepare SESSION according to the header arguments specified in PARAMS."
 
 (provide 'ob-sqlite)
 
-;; arch-tag: 5c03d7f2-0f72-48b8-bbd1-35aafea248ac
 
 ;;; ob-sqlite.el ends here
diff --git a/lisp/org/ob-table.el b/lisp/org/ob-table.el
index 4b0860b3ee..090646685d 100644
--- a/lisp/org/ob-table.el
+++ b/lisp/org/ob-table.el
@@ -120,6 +120,5 @@ example above."
 
 (provide 'ob-table)
 
-;; arch-tag: 4234cc7c-4fc8-4e92-abb0-2892de1a493b
 
 ;;; ob-table.el ends here
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index adac5b833c..c6e549cddb 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -449,6 +449,5 @@ which enable the original code blocks to be found."
 
 (provide 'ob-tangle)
 
-;; arch-tag: 413ced93-48f5-4216-86e4-3fc5df8c8f24
 
 ;;; ob-tangle.el ends here
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 3164057cb1..82859b0a03 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -1963,6 +1963,5 @@ of `org-babel-temporary-directory'."
 
 (provide 'ob)
 
-;; arch-tag: 01a7ebee-06c5-4ee4-a709-e660d28c0af1
 
 ;;; ob.el ends here
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index bb9f4be096..1cabb74b04 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -8058,6 +8058,5 @@ belonging to the \"Work\" category."
 
 (provide 'org-agenda)
 
-;; arch-tag: 77f7565d-7c4b-44af-a2df-9f6f7070cff1
 
 ;;; org-agenda.el ends here
diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index ae52df65bd..506c87e986 100644
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -466,6 +466,5 @@ This command is set with the variable `org-archive-default-command'."
 
 (provide 'org-archive)
 
-;; arch-tag: 0837f601-9699-43c3-8b90-631572ae6c85
 
 ;;; org-archive.el ends here
diff --git a/lisp/org/org-ascii.el b/lisp/org/org-ascii.el
index 7de895eb93..8b21ebabaa 100644
--- a/lisp/org/org-ascii.el
+++ b/lisp/org/org-ascii.el
@@ -719,5 +719,4 @@ publishing directory."
 
 (provide 'org-ascii)
 
-;; arch-tag: aa96f882-f477-4e13-86f5-70d43e7adf3c
 ;;; org-ascii.el ends here
diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el
index 7f0f32b08b..8f4260bb91 100644
--- a/lisp/org/org-attach.el
+++ b/lisp/org/org-attach.el
@@ -418,5 +418,4 @@ prefix."
 
 (provide 'org-attach)
 
-;; arch-tag: fce93c2e-fe07-4fa3-a905-e10dcc7a6248
 ;;; org-attach.el ends here
diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index 2d3e9298c2..4d56c29fc6 100644
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -381,6 +381,5 @@ END:VEVENT\n"
 
 (provide 'org-bbdb)
 
-;; arch-tag: 9e4f275d-d080-48c1-b040-62247f66b5c2
 
 ;;; org-bbdb.el ends here
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el
index 5ce6818a93..cccbcb2782 100644
--- a/lisp/org/org-beamer.el
+++ b/lisp/org/org-beamer.el
@@ -631,6 +631,5 @@ include square brackets."
 
 (provide 'org-beamer)
 
-;; arch-tag: 68bac91a-a946-43a3-8173-a9269306f67c
 
 ;;; org-beamer.el ends here
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index 4ecde0c47c..21a9779aa5 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -200,6 +200,5 @@
 
 (provide 'org-bibtex)
 
-;; arch-tag: 83987d5a-01b8-41c7-85bc-77700f1285f5
 
 ;;; org-bibtex.el ends here
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 2ca9845214..29ca9e0ba8 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -1385,6 +1385,5 @@ The template may still contain \"%?\" for cursor positioning."
 
 (provide 'org-capture)
 
-;; arch-tag: 986bf41b-8ada-4e28-bf20-e8388a7205a0
 
 ;;; org-capture.el ends here
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index d2f8317a07..f29d9a1676 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -2493,7 +2493,6 @@ The details of what will be saved are regulated by the variable
 
 (provide 'org-clock)
 
-;; arch-tag: 7b42c5d4-9b36-48be-97c0-66a869daed4c
 
 ;;; org-clock.el ends here
 
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index 955dd7cd45..d5a3e98bf1 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -1537,6 +1537,5 @@ The string should be two numbers joined with a \"-\"."
 
 (provide 'org-colview)
 
-;; arch-tag: 61f5128d-747c-4983-9479-e3871fa3d73c
 
 ;;; org-colview.el ends here
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index b739d6d1b1..ec76b5cb39 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -426,6 +426,5 @@ With two arguments, return floor and remainder of their quotient."
 
 (provide 'org-compat)
 
-;; arch-tag: a0a0579f-e68c-4bdf-9e55-93768b846bbe
 
 ;;; org-compat.el ends here
diff --git a/lisp/org/org-complete.el b/lisp/org/org-complete.el
index 4f83f26b56..1487c4f364 100644
--- a/lisp/org/org-complete.el
+++ b/lisp/org/org-complete.el
@@ -274,6 +274,5 @@ Complete a language in the first field, the header arguments and switches."
 
 (provide 'org-complete)
 
-;; arch-tag: 
 
 ;;; org-complete.el ends here
diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el
index 4d35cdcf71..59e44ac00a 100644
--- a/lisp/org/org-crypt.el
+++ b/lisp/org/org-crypt.el
@@ -182,6 +182,5 @@ This setting can also be overridden in the CRYPTKEY property."
 
 (provide 'org-crypt)
 
-;; arch-tag: 8202ed2c-221e-4001-9e4b-54674a7e846e
 
 ;;; org-crypt.el ends here
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index a3b748f448..5d3902a999 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -537,5 +537,4 @@ a new topic."
 
 (provide 'org-ctags)
 
-;; arch-tag: 4b1ddd5a-8529-4b17-bcde-96a922d26343
 ;;; org-ctags.el ends here
diff --git a/lisp/org/org-datetree.el b/lisp/org/org-datetree.el
index 7746109d45..3cf62ad380 100644
--- a/lisp/org/org-datetree.el
+++ b/lisp/org/org-datetree.el
@@ -195,6 +195,5 @@ before running this command, even though the command tries to be smart."
 
 (provide 'org-datetree)
 
-;; arch-tag: 1daea962-fd08-448b-9f98-6e8b511b3601
 
 ;;; org-datetree.el ends here
diff --git a/lisp/org/org-docbook.el b/lisp/org/org-docbook.el
index ca82d8ffcb..df50e49c3b 100644
--- a/lisp/org/org-docbook.el
+++ b/lisp/org/org-docbook.el
@@ -1440,5 +1440,4 @@ that need to be preserved in later phase of DocBook exporting."
 
 (provide 'org-docbook)
 
-;; arch-tag: a24a127c-d365-4c2a-9e9b-f7dcb0ebfdc3
 ;;; org-docbook.el ends here
diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el
index 6e8c69e10a..ee37d5eefd 100644
--- a/lisp/org/org-docview.el
+++ b/lisp/org/org-docview.el
@@ -88,6 +88,5 @@ and append it."
 
 (provide 'org-docview)
 
-;; arch-tag: dd147a78-cce1-481b-b40a-15869417debe
 
 ;;; org-docview.el ends here
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el
index 0f6585cbd3..02edff2888 100644
--- a/lisp/org/org-entities.el
+++ b/lisp/org/org-entities.el
@@ -568,6 +568,5 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: e6bd163f-7419-4009-9c93-a74623016424
 
 ;;; org-entities.el ends here
diff --git a/lisp/org/org-exp-blocks.el b/lisp/org/org-exp-blocks.el
index 3723c1d2d2..6f1898d84a 100644
--- a/lisp/org/org-exp-blocks.el
+++ b/lisp/org/org-exp-blocks.el
@@ -352,5 +352,4 @@ other backends, it converts the comment into an EXAMPLE segment."
 
 (provide 'org-exp-blocks)
 
-;; arch-tag: 1c365fe9-8808-4f72-bb15-0b00f36d8024
 ;;; org-exp-blocks.el ends here
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index a334c45a7f..a94a5dcfb1 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -2962,7 +2962,6 @@ The depends on the variable `org-export-copy-to-kill'."
 
 (provide 'org-exp)
 
-;; arch-tag: 65985fe9-095c-49c7-a7b6-cb4ee15c0a95
 
 ;;; org-exp.el ends here
 
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index d4f458232c..0dbd767873 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -716,6 +716,5 @@ level org-n-level-faces"
 
 (provide 'org-faces)
 
-;; arch-tag: 9dab5f91-c4b9-4d6f-bac3-1f6211ad0a04
 
 ;;; org-faces.el ends here
diff --git a/lisp/org/org-feed.el b/lisp/org/org-feed.el
index 27a96f7be2..5b3da305d0 100644
--- a/lisp/org/org-feed.el
+++ b/lisp/org/org-feed.el
@@ -674,5 +674,4 @@ formatted as a string, not the original XML data."
 
 (provide 'org-feed)
 
-;; arch-tag: 0929b557-9bc4-47f4-9633-30a12dbb5ae2
 ;;; org-feed.el ends here
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 24ec581e75..18f1bb76ff 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -585,6 +585,5 @@ and all references of a footnote label."
 
 (provide 'org-footnote)
 
-;; arch-tag: 1b5954df-fb5d-4da5-8709-78d944dbfc37
 
 ;;; org-footnote.el ends here
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index 8027eb505e..7022b41f4f 100644
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -1237,7 +1237,6 @@ PATH should be a list of steps, where each step has the form
 
 (provide 'org-freemind)
 
-;; arch-tag: e7b0d776-94fd-404a-b35e-0f855fae3627
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; org-freemind.el ends here
diff --git a/lisp/org/org-gnus.el b/lisp/org/org-gnus.el
index 7a449c793f..7e20e541a1 100644
--- a/lisp/org/org-gnus.el
+++ b/lisp/org/org-gnus.el
@@ -258,6 +258,5 @@ If `org-store-link' was called with a prefix arg the meaning of
 
 (provide 'org-gnus)
 
-;; arch-tag: 512e0840-58fa-45b3-b456-71e10fa2376d
 
 ;;; org-gnus.el ends here
diff --git a/lisp/org/org-habit.el b/lisp/org/org-habit.el
index ec58b746d6..4812bea927 100644
--- a/lisp/org/org-habit.el
+++ b/lisp/org/org-habit.el
@@ -350,6 +350,5 @@ current time."
 
 (provide 'org-habit)
 
-;; arch-tag: 64e070d9-bd09-4917-bd44-44465f5ed348
 
 ;;; org-habit.el ends here
diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index 8be5709e1d..fe2b888c07 100644
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -2415,5 +2415,4 @@ Replaces invalid characters with \"_\" and then prepends a prefix."
 
 (provide 'org-html)
 
-;; arch-tag: 8109d84d-eb8f-460b-b1a8-f45f3a6c7ea1
 ;;; org-html.el ends here
diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el
index 346e049653..8665a3be8c 100644
--- a/lisp/org/org-icalendar.el
+++ b/lisp/org/org-icalendar.el
@@ -651,5 +651,4 @@ a time), or the day by one (if it does not contain a time)."
 
 (provide 'org-icalendar)
 
-;; arch-tag: 2dee2b6e-9211-4aee-8a47-a3c7e5bc30cf
 ;;; org-icalendar.el ends here
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index 9c5ac9ec62..5e704fa872 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -642,6 +642,5 @@ optional argument MARKERP, return the position as a new marker."
 
 ;;; org-id.el ends here
 
-;; arch-tag: e5abaca4-e16f-4b25-832a-540cfb63a712
 
 
diff --git a/lisp/org/org-indent.el b/lisp/org/org-indent.el
index 43c7a2bb1c..b77b63a4f2 100644
--- a/lisp/org/org-indent.el
+++ b/lisp/org/org-indent.el
@@ -322,5 +322,4 @@ Point is assumed to be at the beginning of a headline."
 
 (provide 'org-indent)
 
-;; arch-tag: b76736bc-9f4a-43cd-977c-ecfd6689846a
 ;;; org-indent.el ends here
diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index f3a4bddbc4..8b5a542c64 100644
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -78,6 +78,5 @@
 
 (provide 'org-info)
 
-;; arch-tag: 1e289f54-7176-487f-b575-dd4854bab15e
 
 ;;; org-info.el ends here
diff --git a/lisp/org/org-install.el b/lisp/org/org-install.el
index 3bd9d9356f..65c131f180 100644
--- a/lisp/org/org-install.el
+++ b/lisp/org/org-install.el
@@ -35,5 +35,4 @@
 
 (provide 'org-install)
 
-;; arch-tag: 0614acb4-47a3-4e7b-918a-aa3149792bcc
 ;;; org-install.el ends here
diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el
index f5a6e8168a..7bd530d872 100644
--- a/lisp/org/org-irc.el
+++ b/lisp/org/org-irc.el
@@ -251,6 +251,5 @@ default."
 
 (provide 'org-irc)
 
-;; arch-tag: 018d7dda-53b8-4a35-ba92-6670939e525a
 
 ;;; org-irc.el ends here
diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el
index edd13be2b9..770b0cd363 100644
--- a/lisp/org/org-jsinfo.el
+++ b/lisp/org/org-jsinfo.el
@@ -205,6 +205,5 @@ Option settings will replace the %MANAGER-OPTIONS cookie."
 (provide 'org-infojs)
 (provide 'org-jsinfo)
 
-;; arch-tag: c71d1d85-3337-4817-a066-725e74ac9eac
 
 ;;; org-jsinfo.el ends here
diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el
index 7f07052ee5..b1650fd948 100644
--- a/lisp/org/org-latex.el
+++ b/lisp/org/org-latex.el
@@ -2573,6 +2573,5 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 (provide 'org-export-latex)
 (provide 'org-latex)
 
-;; arch-tag: 23c2b87d-da04-4c2d-ad2d-1eb6487bc3ad
 
 ;;; org-latex.el ends here
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 0bbc7f33c5..11491dfe69 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -2288,5 +2288,4 @@ with overruling parameters for `org-list-to-generic'."
 
 (provide 'org-list)
 
-;; arch-tag: 73cf50c1-200f-4d1d-8a53-4e842a5b11c8
 ;;; org-list.el ends here
diff --git a/lisp/org/org-mac-message.el b/lisp/org/org-mac-message.el
index 6190fe7938..908473b513 100644
--- a/lisp/org/org-mac-message.el
+++ b/lisp/org/org-mac-message.el
@@ -214,6 +214,5 @@ list of message:// links to flagged mail after heading."
 
 (provide 'org-mac-message)
 
-;; arch-tag: 3806d0c1-abe1-4db6-9c31-f3ed7d4a9b32
 
 ;;; org-mac-message.el ends here
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 2af2deb61b..b1f3d81a18 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -344,6 +344,5 @@ The number of levels is controlled by `org-inlinetask-min-level'"
 
 (provide 'org-macs)
 
-;; arch-tag: 7e6a73ce-aac9-4fc0-9b30-ce6f89dc6668
 
 ;;; org-macs.el ends here
diff --git a/lisp/org/org-mew.el b/lisp/org/org-mew.el
index d1800093d0..3a1efa15d2 100644
--- a/lisp/org/org-mew.el
+++ b/lisp/org/org-mew.el
@@ -135,6 +135,5 @@
 
 (provide 'org-mew)
 
-;; arch-tag: 07ccdca7-6020-4941-a593-588a1e51b870
 
 ;;; org-mew.el ends here
diff --git a/lisp/org/org-mhe.el b/lisp/org/org-mhe.el
index d3314ce3f5..f6df2fc58d 100644
--- a/lisp/org/org-mhe.el
+++ b/lisp/org/org-mhe.el
@@ -225,6 +225,5 @@ folders."
 
 (provide 'org-mhe)
 
-;; arch-tag: dcb05484-8627-491d-a8c1-01dbd2bde4ae
 
 ;;; org-mhe.el ends here
diff --git a/lisp/org/org-mks.el b/lisp/org/org-mks.el
index d2f92019ec..8acf7ce094 100644
--- a/lisp/org/org-mks.el
+++ b/lisp/org/org-mks.el
@@ -132,6 +132,5 @@ only the bare key is returned."
 
 (provide 'org-mks)
 
-;; arch-tag: 4ea90d0e-c6e4-4684-bd61-baf878712f9f
 
 ;;; org-mks.el ends here
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index 86c2e34639..833b672c49 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -1083,7 +1083,6 @@ A and B must be strings or nil."
 
 (provide 'org-mobile)
 
-;; arch-tag: ace0e26c-58f2-4309-8a61-05ec1535f658
 
 ;;; org-mobile.el ends here
 
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index b26fcc7db6..26db67fd4f 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -1143,6 +1143,5 @@ This means, between the beginning of line and the point."
 
 (provide 'org-mouse)
 
-;; arch-tag: ff1ae557-3529-41a3-95c6-baaebdcc280f
 
 ;;; org-mouse.el ends here
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index eea05716c3..bb3e77abce 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -350,5 +350,4 @@ line directly before or after the table."
 
 (provide 'org-plot)
 
-;; arch-tag: 5763f7c6-0c75-416d-b070-398ee4ec0eca
 ;;; org-plot.el ends here
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 889303717c..c6791386b6 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -704,5 +704,4 @@ project-plist is the CDR of an element in `org-publish-project-alist', reuse
 
 (provide 'org-protocol)
 
-;; arch-tag: b5c5c2ac-77cf-4a94-a649-2163dff95846
 ;;; org-protocol.el ends here
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index 46d9d9e1a3..f6026a6065 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -1076,6 +1076,5 @@ Returns value on success, else nil."
 
 (provide 'org-publish)
 
-;; arch-tag: 72807f3c-8af0-4a6b-8dca-c3376eb25adb
 
 ;;; org-publish.el ends here
diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index 20227d42d6..c3b5109798 100644
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -1148,7 +1148,6 @@ See also the variable `org-reverse-note-order'."
 
 (provide 'org-remember)
 
-;; arch-tag: 497f30d0-4bc3-4097-8622-2d27ac5f2698
 
 ;;; org-remember.el ends here
 
diff --git a/lisp/org/org-rmail.el b/lisp/org/org-rmail.el
index c3b7d4532c..0410841862 100644
--- a/lisp/org/org-rmail.el
+++ b/lisp/org/org-rmail.el
@@ -115,6 +115,5 @@
 
 (provide 'org-rmail)
 
-;; arch-tag: c6cf4a8b-6639-4b7f-821f-bdf10746b173
 
 ;;; org-rmail.el ends here
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 16760461e8..105245d6e6 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -807,5 +807,4 @@ LANG is a string, and the returned major mode is a symbol."
 
 (provide 'org-src)
 
-;; arch-tag: 6a1fc84f-dec7-47be-a416-64be56bea5d8
 ;;; org-src.el ends here
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index b8f781e90a..905fbda2c1 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -4393,6 +4393,5 @@ list of the fields in the rectangle ."
 
 (provide 'org-table)
 
-;; arch-tag: 4d21cfdd-0268-440a-84b0-09237a0fe0ef
 
 ;;; org-table.el ends here
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index ccac0790af..a999522023 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -394,6 +394,5 @@ replace any running timer."
 
 (provide 'org-timer)
 
-;; arch-tag: 97538f8c-3871-4509-8f23-1e7b3ff3d107
 
 ;;; org-timer.el ends here
diff --git a/lisp/org/org-vm.el b/lisp/org/org-vm.el
index f1fbca7aaa..4f13823652 100644
--- a/lisp/org/org-vm.el
+++ b/lisp/org/org-vm.el
@@ -138,6 +138,5 @@
 
 (provide 'org-vm)
 
-;; arch-tag: cbc3047b-935e-4d2a-96e7-c5b0117aaa6d
 
 ;;; org-vm.el ends here
diff --git a/lisp/org/org-w3m.el b/lisp/org/org-w3m.el
index 759f6eefd6..fe7a8ef97f 100644
--- a/lisp/org/org-w3m.el
+++ b/lisp/org/org-w3m.el
@@ -168,6 +168,5 @@ Return t if there is no previous link; otherwise, return nil."
 
 (provide 'org-w3m)
 
-;; arch-tag: 851d7447-488d-49f0-a14d-46c092e84352
 
 ;;; org-w3m.el ends here
diff --git a/lisp/org/org-wl.el b/lisp/org/org-wl.el
index 3b1c895f2b..7094536a61 100644
--- a/lisp/org/org-wl.el
+++ b/lisp/org/org-wl.el
@@ -310,6 +310,5 @@ for namazu index."
 
 (provide 'org-wl)
 
-;; arch-tag: 29b75a0f-ef2e-430b-8abc-acff75bde54a
 
 ;;; org-wl.el ends here
diff --git a/lisp/org/org-xoxo.el b/lisp/org/org-xoxo.el
index f1ce87a2fb..4236765a3b 100644
--- a/lisp/org/org-xoxo.el
+++ b/lisp/org/org-xoxo.el
@@ -124,5 +124,4 @@ The XOXO buffer is named *xoxo-<source buffer name>*"
 
 (provide 'org-xoxo)
 
-;; arch-tag: 16e6a31f-f4f5-46f1-af18-48dc89faa702
 ;;; org-xoxo.el ends here
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 33d01e4896..9640dbbe01 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -19642,6 +19642,5 @@ Still experimental, may disappear in the future."
 
 (run-hooks 'org-load-hook)
 
-;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
 
 ;;; org.el ends here
diff --git a/lisp/outline.el b/lisp/outline.el
index 4729f3665d..c270f582f6 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -1118,5 +1118,4 @@ convenient way to make a table of contents of the buffer."
 (provide 'outline)
 (provide 'noutline)
 
-;; arch-tag: 1724410e-7d4d-4f46-b801-49e18171e874
 ;;; outline.el ends here
diff --git a/lisp/patcomp.el b/lisp/patcomp.el
index b542dc27f4..c1965a763c 100644
--- a/lisp/patcomp.el
+++ b/lisp/patcomp.el
@@ -19,5 +19,4 @@ It uses the command line arguments to specify the files to compile."
   (let ((load-path (list (expand-file-name "lisp"))))
     (batch-byte-compile)))
 
-;; arch-tag: cb299b78-1d6c-4c02-945b-12fa2e856d6f
 ;;; patcomp.el ends here
diff --git a/lisp/paths.el b/lisp/paths.el
index f18bba90a1..b7d476a763 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -186,5 +186,4 @@ If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\"))
 You may set this variable to nil in your `.emacs' file if you do not wish
 the terminal-initialization file to be loaded.")
 
-;; arch-tag: bae27ffb-9944-4c87-b569-30d4635a99e1
 ;;; paths.el ends here
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index b960ec215e..b12c7170eb 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -185,5 +185,4 @@ operation character applies, as displayed by 'cvs -n update'."
     (setq pcomplete-stub nondir)
     (pcomplete-uniqify-list entries)))
 
-;; arch-tag: d2aeac43-4bf5-4509-a496-74b863c6642b
 ;;; pcmpl-cvs.el ends here
diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index 196be69abd..60e2e6aa2d 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -307,5 +307,4 @@
 ;;;###autoload
 (defalias 'pcomplete/gdb 'pcomplete/xargs)
 
-;; arch-tag: 06d2b429-dcb1-4a57-84e1-f70d87781183
 ;;; pcmpl-gnu.el ends here
diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index 38e7270482..85731a83a8 100644
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -99,5 +99,4 @@
        (pcomplete-uniqify-list points)
        (cons "swap" (pcmpl-linux-mounted-directories))))))
 
-;; arch-tag: bb0961a6-a623-463d-92c6-497c317293b1
 ;;; pcmpl-linux.el ends here
diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index cf6158da3f..4cf2a3055e 100644
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -322,5 +322,4 @@
 
 (provide 'pcmpl-rpm)
 
-;; arch-tag: 4e64b490-fecf-430e-b2b9-70a8ad64b8c1
 ;;; pcmpl-rpm.el ends here
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index b4c79831a5..9b3857842f 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -171,5 +171,4 @@ Includes files as well as host names followed by a colon."
 
 (provide 'pcmpl-unix)
 
-;; arch-tag: 3f9eb5af-7e0e-449d-b586-381cbbf8fc5c
 ;;; pcmpl-unix.el ends here
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 369285a565..d51fb22e53 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -1391,5 +1391,4 @@ Returns the resultant list."
 
 (provide 'pcomplete)
 
-;; arch-tag: ae32ef2d-dbed-4244-8b0f-cf5a2a3b07a4
 ;;; pcomplete.el ends here
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index b921f86a65..34b9f4b38a 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -512,5 +512,4 @@ in progress because it is an animated attempt."
 
 (provide '5x5)
 
-;; arch-tag: ec4dabd5-572d-41ea-b48c-ec5ce0d68fa9
 ;;; 5x5.el ends here
diff --git a/lisp/play/animate.el b/lisp/play/animate.el
index 505468b363..48e1bc4fde 100644
--- a/lisp/play/animate.el
+++ b/lisp/play/animate.el
@@ -191,5 +191,4 @@ You can specify the one's name by NAME; the default value is \"Sarah\"."
 
 (provide 'animate)
 
-;; arch-tag: 275289a3-6ac4-41da-b527-a1147045392f
 ;;; animate.el ends here
diff --git a/lisp/play/blackbox.el b/lisp/play/blackbox.el
index b197060a75..db901576af 100644
--- a/lisp/play/blackbox.el
+++ b/lisp/play/blackbox.el
@@ -434,5 +434,4 @@ a reflection."
 
 (provide 'blackbox)
 
-;; arch-tag: 6c474c62-5617-4b10-9b44-ac430168c0e2
 ;;; blackbox.el ends here
diff --git a/lisp/play/bruce.el b/lisp/play/bruce.el
index 22772f4e3d..4a9d61a3f9 100644
--- a/lisp/play/bruce.el
+++ b/lisp/play/bruce.el
@@ -146,5 +146,4 @@
 
 (provide 'bruce)
 
-;; arch-tag: b83ded51-4ccb-41ef-8bd6-3b521e81dd9b
 ;;; bruce.el ends here
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index eb624ca959..5cf813fa95 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -1460,5 +1460,4 @@ Return t if new char is non-empty."
 
 (provide 'bubbles)
 
-;; arch-tag: 2cd7237a-b0ad-400d-a7fd-75f676dceb70
 ;;; bubbles.el ends here
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index dc984d1094..8073758c91 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -164,5 +164,4 @@ Optional fifth arg REQUIRE-MATCH non-nil forces a matching cookie."
 
 (provide 'cookie1)
 
-;; arch-tag: 4a8a8712-df6a-4f34-b030-108a1b47f9f2
 ;;; cookie1.el ends here
diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el
index 17ec375035..dacaf6e7b6 100644
--- a/lisp/play/dissociate.el
+++ b/lisp/play/dissociate.el
@@ -99,5 +99,4 @@ Default is 2."
 
 (provide 'dissociate)
 
-;; arch-tag: 90d197d1-409b-45c5-a0b5-fbfb2e06334f
 ;;; dissociate.el ends here
diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el
index 2d59d205f3..c93260c69f 100644
--- a/lisp/play/dunnet.el
+++ b/lisp/play/dunnet.el
@@ -3357,5 +3357,4 @@ File not found")))
 
 (provide 'dunnet)
 
-;; arch-tag: 4cc8e47c-d9e1-4ef4-936b-578e7f529558
 ;;; dunnet.el ends here
diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el
index 82be2bfbca..10c2c45c17 100644
--- a/lisp/play/gamegrid.el
+++ b/lisp/play/gamegrid.el
@@ -597,5 +597,4 @@ FILE is created there."
 
 (provide 'gamegrid)
 
-;; arch-tag: a96c2ff4-1c12-427e-bd3d-faeaf174cd46
 ;;; gamegrid.el ends here
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index 21e3d912fe..a055ecaa7d 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -1323,5 +1323,4 @@ end
 (provide 'handwrite)
 
 
-;; arch-tag: f2285ae9-e41b-4c96-8343-87dce41e44b7
 ;;; handwrite.el ends here
diff --git a/lisp/play/hanoi.el b/lisp/play/hanoi.el
index 5185b81091..767792babb 100644
--- a/lisp/play/hanoi.el
+++ b/lisp/play/hanoi.el
@@ -447,5 +447,4 @@ BITS must be of length nrings.  Start at START-TIME."
 
 (provide 'hanoi)
 
-;; arch-tag: 7a901659-4346-495c-8883-14cbf540610c
 ;;; hanoi.el ends here
diff --git a/lisp/play/meese.el b/lisp/play/meese.el
index 115befa6c3..d811dacb9b 100644
--- a/lisp/play/meese.el
+++ b/lisp/play/meese.el
@@ -34,5 +34,4 @@
 (add-hook 'find-file-hook 'protect-innocence-hook)
 (provide 'meese)
 
-;; arch-tag: 47af12d2-6a7d-4e2e-a1ea-eae75a77e3f0
 ;;; meese.el ends here
diff --git a/lisp/play/morse.el b/lisp/play/morse.el
index 75fe4a9552..8ae8b0366a 100644
--- a/lisp/play/morse.el
+++ b/lisp/play/morse.el
@@ -139,5 +139,4 @@
 
 (provide 'morse)
 
-;; arch-tag: 3331e6c1-9a9e-453f-abfd-163a9c3f93a6
 ;;; morse.el ends here
diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el
index bb7cac1bce..fd4951f7b4 100644
--- a/lisp/play/mpuz.el
+++ b/lisp/play/mpuz.el
@@ -519,5 +519,4 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
 
 (provide 'mpuz)
 
-;; arch-tag: 2781d6ba-89e7-43b5-85c7-5d3a2e73feb1
 ;;; mpuz.el ends here
diff --git a/lisp/play/pong.el b/lisp/play/pong.el
index a697e27ae7..2e17ebff36 100644
--- a/lisp/play/pong.el
+++ b/lisp/play/pong.el
@@ -458,5 +458,4 @@ pong-mode keybindings:\\<pong-mode-map>
 
 (provide 'pong)
 
-;; arch-tag: 1fdf0fc5-13e2-4de4-aae4-09bdd5af99f3
 ;;; pong.el ends here
diff --git a/lisp/play/snake.el b/lisp/play/snake.el
index 7716ab6bb7..810b38454d 100644
--- a/lisp/play/snake.el
+++ b/lisp/play/snake.el
@@ -412,5 +412,4 @@ Snake mode keybindings:
 
 (provide 'snake)
 
-;; arch-tag: 512ffc92-cfac-4287-9a4e-92890701a5c8
 ;;; snake.el ends here
diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el
index 51d32740ca..a0da99ef42 100644
--- a/lisp/play/solitaire.el
+++ b/lisp/play/solitaire.el
@@ -447,5 +447,4 @@ Seen in info on text lines."
 
 (provide 'solitaire)
 
-;; arch-tag: 1b18ee1c-1e79-4a5b-8658-9560b82e63dd
 ;;; solitaire.el ends here
diff --git a/lisp/play/spook.el b/lisp/play/spook.el
index d96e6159cb..fc9d671d43 100644
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -76,5 +76,4 @@
 
 (provide 'spook)
 
-;; arch-tag: c682b61f-92b6-4492-9c0d-2367e562449c
 ;;; spook.el ends here
diff --git a/lisp/play/studly.el b/lisp/play/studly.el
index b9bd173d5f..d28304df1e 100644
--- a/lisp/play/studly.el
+++ b/lisp/play/studly.el
@@ -68,5 +68,4 @@
 
 (provide 'studly)
 
-;; arch-tag: 0dbf5a60-d2e6-48c2-86ae-77fc8575ac67
 ;;; studly.el ends here
diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el
index 9d8ae7026d..b6613f7a54 100644
--- a/lisp/play/tetris.el
+++ b/lisp/play/tetris.el
@@ -641,5 +641,4 @@ tetris-mode keybindings:
 
 (provide 'tetris)
 
-;; arch-tag: fb780d53-3ff0-49f0-8e19-f7f13cf2d49e
 ;;; tetris.el ends here
diff --git a/lisp/play/yow.el b/lisp/play/yow.el
index 6d5be50cbf..3ec594f884 100644
--- a/lisp/play/yow.el
+++ b/lisp/play/yow.el
@@ -128,5 +128,4 @@ If called interactively, display a list of matches."
 
 (provide 'yow)
 
-;; arch-tag: d13db89b-84f1-4141-a5ce-261d1733a65c
 ;;; yow.el ends here
diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index 71a2f86d30..a1782377af 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -684,5 +684,4 @@ If nil, `zone-pgm-random-life' chooses a value from 0-3 (inclusive).")
 ;;;;;;;;;;;;;;;
 (provide 'zone)
 
-;; arch-tag: 7092503d-74a9-4325-a55c-a026ede58cea
 ;;; zone.el ends here
diff --git a/lisp/proced.el b/lisp/proced.el
index 8ed30a7968..c6c7dfd89e 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -1880,5 +1880,4 @@ Killed processes cannot be recovered by Emacs."))
 
 (provide 'proced)
 
-;; arch-tag: a6e312ad-9032-45aa-972d-31a8cfc545af
 ;;; proced.el ends here
diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el
index d6d6f0c064..e35925e15d 100644
--- a/lisp/progmodes/ada-stmt.el
+++ b/lisp/progmodes/ada-stmt.el
@@ -484,5 +484,4 @@ Invoke right after `ada-function-spec' or `ada-procedure-spec'."
 
 (provide 'ada-stmt)
 
-;; arch-tag: 94f51555-cc0e-44e5-8865-8788aae8ecd3
 ;;; ada-stmt.el ends here
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index f704eec2c0..d9b036b67b 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -2667,5 +2667,4 @@ Used in `antlr-mode'.  Also a useful function in `java-mode-hook'."
 
 ;;; Local IspellPersDict: .ispell_antlr
 
-;; arch-tag: 5de2be79-3d13-4560-8fbc-f7d0234dcb5c
 ;;; antlr-mode.el ends here
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index 15126c4b32..b38dd169d0 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -243,5 +243,4 @@ repeatedly until you are satisfied with the kind of comment."
 
 (provide 'asm-mode)
 
-;; arch-tag: 210e695f-f338-4376-8913-a4c5c72ac848
 ;;; asm-mode.el ends here
diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el
index 7e94692c6e..1922d09d0c 100644
--- a/lisp/progmodes/autoconf.el
+++ b/lisp/progmodes/autoconf.el
@@ -99,5 +99,4 @@ searching backwards at another AC_... command."
 (provide 'autoconf-mode)
 (provide 'autoconf)
 
-;; arch-tag: 4f44778f-2ab3-49a1-a103-f0acb9df2de4
 ;;; autoconf.el ends here
diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el
index c82e3ddfd8..3adb068867 100644
--- a/lisp/progmodes/bug-reference.el
+++ b/lisp/progmodes/bug-reference.el
@@ -151,5 +151,4 @@ so that it is considered safe, see `enable-local-variables'.")
       (widen)
       (bug-reference-unfontify (point-min) (point-max)))))
 
-;; arch-tag: b138abce-e5c3-475e-bd58-7afba40387ea
 ;;; bug-reference.el ends here
diff --git a/lisp/progmodes/cap-words.el b/lisp/progmodes/cap-words.el
index 48b1d19e01..4a6e0c3761 100644
--- a/lisp/progmodes/cap-words.el
+++ b/lisp/progmodes/cap-words.el
@@ -92,5 +92,4 @@ Obsoletes `c-forward-into-nomenclature'."
 
 (provide 'cap-words)
 
-;; arch-tag: 46513b64-fe5a-4c0b-902c-ed235c22975f
 ;;; cap-words.el ends here
diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index a51380ee80..b08c13248d 100644
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -1333,5 +1333,4 @@ For other semicolon contexts, no determination is made."
 
 (cc-provide 'cc-align)
 
-;; arch-tag: 4d71ed28-bf51-4509-a148-f39669669a2e
 ;;; cc-align.el ends here
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 53edd81b68..d166d13b81 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -1096,5 +1096,4 @@ comment at the start of cc-engine.el for more info."
 
 (cc-provide 'cc-awk)			; Changed from 'awk-mode, ACM 2002/5/21
 
-;; arch-tag: c4836289-3aa4-4a59-9934-9ccc2bacccf3
 ;;; awk-mode.el ends here
diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index 126e53e3bc..1e6d9606df 100644
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -434,5 +434,4 @@ exclude any functions that have been bound during compilation with
 
 (provide 'cc-bytecomp)
 
-;; arch-tag: 2d71b3ad-57b0-4b13-abd3-ab836e08f975
 ;;; cc-bytecomp.el ends here
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 84b4ed0231..2bab7c16bd 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -4574,5 +4574,4 @@ normally bound to C-o.  See `c-context-line-break' for the details."
 
 (cc-provide 'cc-cmds)
 
-;; arch-tag: bf0611dc-d1f4-449e-9e45-4ec7c6936677
 ;;; cc-cmds.el ends here
diff --git a/lisp/progmodes/cc-compat.el b/lisp/progmodes/cc-compat.el
index e88ceed03d..a863d3da99 100644
--- a/lisp/progmodes/cc-compat.el
+++ b/lisp/progmodes/cc-compat.el
@@ -163,5 +163,4 @@ This is in addition to c-continued-statement-offset.")
 
 (cc-provide 'cc-compat)
 
-;; arch-tag: 564dab2f-e6ad-499c-a4a3-fedec3ecc192
 ;;; cc-compat.el ends here
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index f0d9bee159..8b12aa91ce 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -2259,5 +2259,4 @@ quoted."
 
 (cc-provide 'cc-defs)
 
-;; arch-tag: 3bb2629d-dd84-4ff0-ad39-584be0fe3cda
 ;;; cc-defs.el ends here
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 4f9e9e4e33..19ffc21a4f 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -10337,5 +10337,4 @@ Cannot combine absolute offsets %S and %S in `add' method"
 
 (cc-provide 'cc-engine)
 
-;; arch-tag: 149add18-4673-4da5-ac47-6805e4eae089
 ;;; cc-engine.el ends here
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 44f590b332..ae5a8012e0 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -2460,5 +2460,4 @@ need for `pike-font-lock-extra-types'.")
 ;; 2006-07-10:  awk-font-lock-keywords has been moved back to cc-awk.el.
 (cc-provide 'cc-fonts)
 
-;; arch-tag: 2f65f405-735f-4da5-8d4b-b957844c5203
 ;;; cc-fonts.el ends here
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index fb0e4462d9..4fe209d97a 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -3137,5 +3137,4 @@ evaluated and should not be quoted."
 
 (cc-provide 'cc-langs)
 
-;; arch-tag: 1ab57482-cfc2-4c5b-b628-3539c3098822
 ;;; cc-langs.el ends here
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index cd14661fbc..15e85bccff 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -442,5 +442,4 @@ Example:
 
 (cc-provide 'cc-menus)
 
-;; arch-tag: f6b60933-91f0-4145-ab44-70ca6d1b919b
 ;;; cc-menus.el ends here
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index b201a40752..7e359cebcd 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1685,5 +1685,4 @@ Key bindings:
 
 (cc-provide 'cc-mode)
 
-;; arch-tag: 7825e5c4-fd09-439f-a04d-4c13208ba3d7
 ;;; cc-mode.el ends here
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index 212f0a50b0..b25061d2eb 100644
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -656,5 +656,4 @@ any reason to call this function directly."
 
 (cc-provide 'cc-styles)
 
-;; arch-tag: c764f61a-96ba-484a-a68f-101c0e9d5d2c
 ;;; cc-styles.el ends here
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 215c0073e9..f39fa52ca6 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -1712,5 +1712,4 @@ It treats escaped EOLs as whitespace.")
 
 (cc-provide 'cc-vars)
 
-;; arch-tag: d62e9a55-c9fe-409b-b5b6-050b6aa202c9
 ;;; cc-vars.el ends here
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index f380a93bef..f0140a39e8 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -250,5 +250,4 @@ to the action header."
 
 (provide 'cfengine)
 
-;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4
 ;;; cfengine.el ends here
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 4f74e40709..2a1821d559 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -403,5 +403,4 @@ Optional arg DISPLAY non-nil means show messages in the echo area."
       ;; Cleanup.
       (kill-buffer outbuf))))
 
-;; arch-tag: 4f20253c-71ef-4e6d-a774-19087060910e
 ;;; cmacexp.el ends here
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3b4dba31cd..2542980129 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -2431,5 +2431,4 @@ The file-structure looks like this:
 
 (provide 'compile)
 
-;; arch-tag: 12465727-7382-4f72-b234-79855a00dd8c
 ;;; compile.el ends here
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index c33df2d527..d47635107e 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -826,5 +826,4 @@ BRANCH should be either nil (false branch), t (true branch) or 'both."
 
 (provide 'cpp)
 
-;; arch-tag: fb7d433d-745d-495a-96f0-86908ab63f74
 ;;; cpp.el ends here
diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index c22f03f231..920fd3a7db 100644
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -381,5 +381,4 @@ The mode is turned if some feature is enabled for the current
 
 ;;}}}
 
-;; arch-tag: 225fb5e2-0838-4eb1-88ce-3811c5e4d738
 ;;; cwarn.el ends here
diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index 9613cce7c4..68fd802629 100644
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -2047,5 +2047,4 @@ no args, if that value is non-nil."
 
   (run-mode-hooks 'delphi-mode-hook))
 
-;; arch-tag: 410e192d-e9b5-4397-ad62-12340fc3fa41
 ;;; delphi.el ends here
diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el
index 88f430ad93..1151bebae6 100644
--- a/lisp/progmodes/ebnf-abn.el
+++ b/lisp/progmodes/ebnf-abn.el
@@ -664,5 +664,4 @@ See documentation for variable `ebnf-abn-lex'."
 
 (provide 'ebnf-abn)
 
-;; arch-tag: 8d1b3c4d-4226-4393-b9ae-b7ccf07cf779
 ;;; ebnf-abn.el ends here
diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el
index e7d3dcc0c9..059031f8eb 100644
--- a/lisp/progmodes/ebnf-bnf.el
+++ b/lisp/progmodes/ebnf-bnf.el
@@ -605,5 +605,4 @@ See documentation for variable `ebnf-bnf-lex'."
 (provide 'ebnf-bnf)
 
 
-;; arch-tag: 3b1834d3-8367-475b-80d5-8e0bbd00ce50
 ;;; ebnf-bnf.el ends here
diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el
index 7d86b72989..2689f1c362 100644
--- a/lisp/progmodes/ebnf-dtd.el
+++ b/lisp/progmodes/ebnf-dtd.el
@@ -1350,5 +1350,4 @@ See documentation for variable `ebnf-dtd-lex'."
 
 (provide 'ebnf-dtd)
 
-;; arch-tag: c21bb640-135f-4afa-8712-fa11d86301c4
 ;;; ebnf-dtd.el ends here
diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el
index 723343c47e..88b7be0ba2 100644
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@@ -669,5 +669,4 @@ See documentation for variable `ebnf-ebx-lex'."
 
 (provide 'ebnf-ebx)
 
-;; arch-tag: bfe2f95b-66bc-4dc6-8b7e-b7831e68f5fb
 ;;; ebnf-ebx.el ends here
diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el
index 36048c737a..e606f1767d 100644
--- a/lisp/progmodes/ebnf-iso.el
+++ b/lisp/progmodes/ebnf-iso.el
@@ -612,5 +612,4 @@ See documentation for variable `ebnf-iso-lex'."
 (provide 'ebnf-iso)
 
 
-;; arch-tag: 03315eef-8f64-404a-bf9d-256d42442ee3
 ;;; ebnf-iso.el ends here
diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el
index af602eafac..169ea128e8 100644
--- a/lisp/progmodes/ebnf-otz.el
+++ b/lisp/progmodes/ebnf-otz.el
@@ -697,5 +697,4 @@
 (provide 'ebnf-otz)
 
 
-;; arch-tag: 7ef2249d-9e8b-4bc1-999f-95d784690636
 ;;; ebnf-otz.el ends here
diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el
index 5dde3758e4..d1341a391a 100644
--- a/lisp/progmodes/ebnf-yac.el
+++ b/lisp/progmodes/ebnf-yac.el
@@ -513,5 +513,4 @@ See documentation for variable `ebnf-yac-lex'."
 (provide 'ebnf-yac)
 
 
-;; arch-tag: 8a96989c-0b1d-42ba-a020-b2901f9a2a4d
 ;;; ebnf-yac.el ends here
diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index 61d0c5ec5c..c200d99eb8 100644
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -276,5 +276,4 @@ file modes."
 
 (provide 'executable)
 
-;; arch-tag: 58458d1c-d9db-45ec-942b-8bbb1d5e319d
 ;;; executable.el ends here
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index d8c7cd3e7d..111c12754e 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -2214,5 +2214,4 @@ escape character."
 
 (provide 'f90)
 
-;; arch-tag: fceac97c-c147-44bd-aec0-172d4b560ef8
 ;;; f90.el ends here
diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el
index a95d1a5c00..aaa37280b0 100644
--- a/lisp/progmodes/glasses.el
+++ b/lisp/progmodes/glasses.el
@@ -329,5 +329,4 @@ at places they belong to."
 (provide 'glasses)
 
 
-;; arch-tag: a3515167-c89e-484f-90a1-d85143e52b12
 ;;; glasses.el ends here
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index b327cf6b87..b709c6b94c 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1049,5 +1049,4 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'."
 
 (provide 'grep)
 
-;; arch-tag: 5a5b9169-a79d-4f38-9c38-f69615f39c4d
 ;;; grep.el ends here
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 7d5a219e86..dc97b0913d 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3471,5 +3471,4 @@ so they have been disabled."))
 
 (provide 'gud)
 
-;; arch-tag: 6d990948-df65-461a-be39-1c7fb83ac4c4
 ;;; gud.el ends here
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index a3bf7e5d17..114d7fbed6 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -965,5 +965,4 @@ Key bindings:
 
 (provide 'hideshow)
 
-;; arch-tag: 378b6852-e82a-466a-aee8-d9c73859a65e
 ;;; hideshow.el ends here
diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el
index e325a01777..b4183065e4 100644
--- a/lisp/progmodes/idlw-toolbar.el
+++ b/lisp/progmodes/idlw-toolbar.el
@@ -969,5 +969,4 @@ static char * file[] = {
 (provide 'idlw-toolbar)
 (provide 'idlwave-toolbar)
 
-;; arch-tag: ec9a3717-c44c-4716-9bda-cdacbe5ddb62
 ;;; idlw-toolbar.el ends here
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 21a701e7d5..dd3f6a1262 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -653,5 +653,4 @@ See variable `lisp-describe-sym-command'."
 
 (provide 'inf-lisp)
 
-;; arch-tag: 5b74abc3-a085-4b91-8ab8-8da6899d3b92
 ;;; inf-lisp.el ends here
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index 4db90261fa..111ca7783d 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -167,5 +167,4 @@
 
 (provide 'ld-script)
 
-;; arch-tag: 83280b6b-e6fc-4d00-a630-922d7aec5593
 ;;; ld-script.el ends here
diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el
index a1ae99b1b6..dd570ffb22 100644
--- a/lisp/progmodes/m4-mode.el
+++ b/lisp/progmodes/m4-mode.el
@@ -172,5 +172,4 @@
 ;;;		  "m4_syscmd" "m4_sysval" "m4_traceoff" "m4_traceon" "m4_translit"
 ;;;		  "m4_m4_undefine" "m4_undivert"))
 
-;; arch-tag: 87811d86-94c1-474b-9666-587f6da74af1
 ;;; m4-mode.el ends here
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 0ce797c46d..bc9ad25195 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1839,5 +1839,4 @@ If it isn't in one, return nil."
 
 (provide 'make-mode)
 
-;; arch-tag: bd23545a-de91-44fb-b1b2-feafbb2635a0
 ;;; make-mode.el ends here
diff --git a/lisp/progmodes/mantemp.el b/lisp/progmodes/mantemp.el
index ea4492053c..31966727e0 100644
--- a/lisp/progmodes/mantemp.el
+++ b/lisp/progmodes/mantemp.el
@@ -202,5 +202,4 @@ but operates on the region."
 
 (provide 'mantemp)
 
-;; arch-tag: 49794712-3b1b-4baa-9785-39556cb52c94
 ;;; mantemp.el ends here
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 8df4bde335..fa2c256abe 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -1120,5 +1120,4 @@ Assumes that file has been compiled with debugging support."
 
 (provide 'mixal-mode)
 
-;; arch-tag: be7c128a-bf61-4951-a90e-9398267ce3f3
 ;;; mixal-mode.el ends here
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index 2fc3bc59d8..f0b8f7cbca 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -613,5 +613,4 @@ followed by the first character of the construct.
 
 (provide 'modula2)
 
-;; arch-tag: a21df1cb-5ece-4709-9219-1e7cd2d85d90
 ;;; modula2.el ends here
diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index efb1682688..37eff607a7 100644
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -391,5 +391,4 @@ directory and makes this the current buffer's default directory."
 
 (provide 'octave-inf)
 
-;; arch-tag: bdce0395-24d1-4bb4-bfba-6fb1eeb1a660
 ;;; octave-inf.el ends here
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index b3fe1c918e..689f93736d 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -1167,5 +1167,4 @@ Use line numbers if `ps-run-error-line-numbers' is not nil"
 
 (provide 'ps-mode)
 
-;; arch-tag: dce13d2d-69fb-4ec4-9d5d-6dd29c3f0e6e
 ;;; ps-mode.el ends here
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index 23274b4e39..fb135d717e 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -580,5 +580,4 @@ that variable's value is a string."
 
 (provide 'scheme)
 
-;; arch-tag: a8f06bc1-ad11-42d2-9e36-ce651df37a90
 ;;; scheme.el ends here
diff --git a/lisp/progmodes/subword.el b/lisp/progmodes/subword.el
index 5e3462327c..b66b477e4e 100644
--- a/lisp/progmodes/subword.el
+++ b/lisp/progmodes/subword.el
@@ -277,5 +277,4 @@ Optional argument ARG is the same as for `capitalize-word'."
 
 (provide 'subword)
 
-;; arch-tag: b8a01202-8a52-4a71-ae0a-d753fafd67ef
 ;;; subword.el ends here
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 9138ce1d01..b7fe9ef71f 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -332,5 +332,4 @@ If no function name is found, return nil."
 
 (provide 'which-func)
 
-;; arch-tag: fa8a55c7-bfe3-4ffc-95ab-01bf21796827
 ;;; which-func.el ends here
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 3d8b1ffbe3..b24f184e70 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -448,5 +448,4 @@ BITMAP-STRING is a string representing bits by hexadecimal digits."
 
 (provide 'ps-bdf)
 
-;; arch-tag: 9b875ba8-565a-4ecf-acaa-30cee732c898
 ;;; ps-bdf.el ends here
diff --git a/lisp/ps-def.el b/lisp/ps-def.el
index 3be01d9eab..0a7a6e0157 100644
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -402,5 +402,4 @@
 
 (provide 'ps-def)
 
-;; arch-tag: 4edde45b-af10-4685-b8ee-7cd0f951095a
 ;;; ps-def.el ends here
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index c24779c6f3..c8de53b667 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -1211,5 +1211,4 @@ V%s 0 /%s-latin1 /%s Latin1Encoding put\n"
 ;; generated-autoload-file: "ps-print.el"
 ;; End:
 
-;; arch-tag: bca017b2-66a7-4e59-8584-103e749eadbe
 ;;; ps-mule.el ends here
diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el
index 53bfdb9558..e85b0f4e8d 100644
--- a/lisp/ps-samp.el
+++ b/lisp/ps-samp.el
@@ -309,5 +309,4 @@
 
 (provide 'ps-samp)
 
-;; arch-tag: 99c415d3-be39-43c6-aa32-7ee33ba19600
 ;;; ps-samp.el ends here
diff --git a/lisp/recentf.el b/lisp/recentf.el
index b54a355c8f..7df2dd0539 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -1367,5 +1367,4 @@ that were operated on recently."
 
 (run-hooks 'recentf-load-hook)
 
-;; arch-tag: 78f1eec9-0d16-4d19-a4eb-2e4529edb62a
 ;;; recentf.el ends here
diff --git a/lisp/rect.el b/lisp/rect.el
index 8a3cf47673..1adb95257e 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -412,5 +412,4 @@ with a prefix argument, prompt for START-AT and FORMAT."
 
 (provide 'rect)
 
-;; arch-tag: 178847b3-1f50-4b03-83de-a6e911cc1d16
 ;;; rect.el ends here
diff --git a/lisp/register.el b/lisp/register.el
index 48762342c4..622a1561f9 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -353,5 +353,4 @@ START and END are buffer positions giving two corners of rectangle."
 		  (extract-rectangle start end))))
 
 (provide 'register)
-;; arch-tag: ce14dd68-8265-475f-9341-5d4ec5a53035
 ;;; register.el ends here
diff --git a/lisp/repeat.el b/lisp/repeat.el
index 455fb05ea9..06efd7071f 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -392,5 +392,4 @@ recently executed command not bound to an input event\"."
 
 (provide 'repeat)
 
-;; arch-tag: cd569600-a1ad-4fa7-9062-bb91dfeaf1db
 ;;; repeat.el ends here
diff --git a/lisp/replace.el b/lisp/replace.el
index 6946987070..a8496c4765 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2047,5 +2047,4 @@ make, or the user didn't cancel the call."
     (lazy-highlight-cleanup lazy-highlight-cleanup)
     (setq isearch-lazy-highlight-last-string nil)))
 
-;; arch-tag: 16b4cd61-fd40-497b-b86f-b667c4cf88e4
 ;;; replace.el ends here
diff --git a/lisp/reveal.el b/lisp/reveal.el
index fd775c7d01..db519d54e2 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -225,5 +225,4 @@ With zero or negative ARG turn mode off."
 
 (provide 'reveal)
 
-;; arch-tag: 96ba0242-2274-4ed7-8e10-26bc0707b4d8
 ;;; reveal.el ends here
diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el
index 97f23a9dc1..ea35c488dd 100644
--- a/lisp/rfn-eshadow.el
+++ b/lisp/rfn-eshadow.el
@@ -240,5 +240,4 @@ Returns non-nil if the new state is enabled."
 
 (provide 'rfn-eshadow)
 
-;; arch-tag: dcf70a52-0115-4ec2-b1e3-4f8d3541a888
 ;;; rfn-eshadow.el ends here
diff --git a/lisp/rot13.el b/lisp/rot13.el
index 88a380775d..7afc0c892d 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -109,5 +109,4 @@ See also `toggle-rot13-mode'."
 
 (provide 'rot13)
 
-;; arch-tag: ad5b9ca8-946c-4414-996f-e9b1bf9ec79f
 ;;; rot13.el ends here
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 13e3fdffa6..533a42838b 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -776,5 +776,4 @@ Optional argument PROPS specifies other text properties to apply."
 ;; coding: iso-latin-1
 ;; End:
 
-;; arch-tag: b2f24546-5605-44c4-b67b-c9a4eeba3ee8
 ;;; ruler-mode.el ends here
diff --git a/lisp/savehist.el b/lisp/savehist.el
index dc233e26dd..19dd1a0e68 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -389,6 +389,5 @@ trimming of history lists to `history-length' items."
 
 (provide 'savehist)
 
-;; arch-tag: b3ce47f4-c5ad-4ebc-ad02-73aba705cf9f
 
 ;;; savehist.el ends here
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index ee1107e339..a72d3c4345 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -307,5 +307,4 @@ may have changed\) back to `save-place-alist'."
 
 (provide 'saveplace) ; why not...
 
-;; arch-tag: 3c2ef47b-0a22-4558-b116-118c9ef454a0
 ;;; saveplace.el ends here
diff --git a/lisp/sb-image.el b/lisp/sb-image.el
index e4af3c0d7e..4e91199b5e 100644
--- a/lisp/sb-image.el
+++ b/lisp/sb-image.el
@@ -105,5 +105,4 @@ See `speedbar-expand-image-button-alist' for details."
 
 (provide 'sb-image)
 
-;; arch-tag: 6b05accd-e8b8-4290-8379-f063f3dacabb
 ;;; sb-image.el ends here
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index b152970825..96dd72b895 100644
--- a/lisp/scroll-all.el
+++ b/lisp/scroll-all.el
@@ -116,5 +116,4 @@ apply to all visible windows in the same frame."
 
 (provide 'scroll-all)
 
-;; arch-tag: db20089a-b157-45df-b5d4-2430e60acdd8
 ;;; scroll-all.el ends here
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 2d299b3c9a..4f2df6e0e0 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -351,5 +351,4 @@ EVENT should be a scroll bar click."
 
 (provide 'scroll-bar)
 
-;; arch-tag: 6f1d01d0-0b1e-4bf8-86db-d491e0f399f3
 ;;; scroll-bar.el ends here
diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el
index f8af384ba0..0375ed32d4 100644
--- a/lisp/scroll-lock.el
+++ b/lisp/scroll-lock.el
@@ -123,5 +123,4 @@ during scrolling."
 
 (provide 'scroll-lock)
 
-;; arch-tag: 148fc8e8-67e0-4638-bb34-3291595ab7e1
 ;;; scroll-lock.el ends here
diff --git a/lisp/ses.el b/lisp/ses.el
index 36a7b8ded0..8704f611cc 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -3017,5 +3017,4 @@ current column and continues until the next nonblank column."
 
 (provide 'ses)
 
-;; arch-tag: 88c1ccf0-4293-4824-8c5d-0757b52217f3
 ;;; ses.el ends here
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index 20d793619c..9bd2e26b2a 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -832,5 +832,4 @@ look for files that have been changed and need to be copied to other systems."
 
 (provide 'shadowfile)
 
-;; arch-tag: e2f4cdd7-2bab-4def-9130-9e69b412b79e
 ;;; shadowfile.el ends here
diff --git a/lisp/soundex.el b/lisp/soundex.el
index e2b969f6b7..aafb2eae62 100644
--- a/lisp/soundex.el
+++ b/lisp/soundex.el
@@ -72,5 +72,4 @@ and Searching\", Addison-Wesley (1973), pp. 391-392."
 
 (provide 'soundex)
 
-;; arch-tag: b2615a98-feb7-430e-a717-171086738953
 ;;; soundex.el ends here
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 4742954b20..2aba825159 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -1749,5 +1749,4 @@ Store XPM in buffer BUFNAME if supplied \(default is ` *strokes-xpm*'\)"
 (run-hooks 'strokes-load-hook)
 (provide 'strokes)
 
-;; arch-tag: 8377f60e-43fb-467a-bbcd-2774f91f833e
 ;;; strokes.el ends here
diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el
index bd9bccb4dc..63a0d2bdaf 100644
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -84,5 +84,4 @@ It relies on the `gpm' daemon being activated."
 
 (provide 't-mouse)
 
-;; arch-tag: a63163b3-bfbe-4eb2-ab4f-201cd164b05d
 ;;; t-mouse.el ends here
diff --git a/lisp/tabify.el b/lisp/tabify.el
index 0c5ca8413e..10672675c1 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -90,5 +90,4 @@ The variable `tab-width' controls the spacing of tab stops."
 
 (provide 'tabify)
 
-;; arch-tag: c83893b1-e0cc-4e57-8a09-73fd03466416
 ;;; tabify.el ends here
diff --git a/lisp/talk.el b/lisp/talk.el
index 0999b21db4..27b7caff4f 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -120,5 +120,4 @@ Select the first of these windows, displaying the first of the buffers."
 
 (provide 'talk)
 
-;; arch-tag: 7ab0ad88-1788-4886-a44c-ae685e6f8a1a
 ;;; talk.el ends here
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 8d19e320c8..0049c8aab3 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -1247,5 +1247,4 @@ Leaves the region wide."
 
 (provide 'tar-mode)
 
-;; arch-tag: 8a585a4a-340e-42c2-89e7-d3b1013a4b78
 ;;; tar-mode.el ends here
diff --git a/lisp/tempo.el b/lisp/tempo.el
index dca6ac14d2..905c9af174 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -763,5 +763,4 @@ space bar, and looks something like this:
 
 (provide 'tempo)
 
-;; arch-tag: b3c0ee36-db3b-47bc-875f-091b4e27a063
 ;;; tempo.el ends here
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index 90725a781f..5894bed598 100644
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -57,5 +57,4 @@
     (define-key local-function-key-map [ALT] [27])
     ))
 
-;; arch-tag: abec1b03-582f-49f8-b8cb-e2fd52ea4bd7
 ;;; AT386.el ends here
diff --git a/lisp/term/apollo.el b/lisp/term/apollo.el
index fc75a3e559..c570a20112 100644
--- a/lisp/term/apollo.el
+++ b/lisp/term/apollo.el
@@ -3,5 +3,4 @@
   "Terminal initialization function for apollo."
   (tty-run-terminal-initialization (selected-frame) "vt100"))
 
-;; arch-tag: c72f446f-e6b7-4749-90a4-bd68632adacf
 ;;; apollo.el ends here
diff --git a/lisp/term/bobcat.el b/lisp/term/bobcat.el
index e7723b0706..d9ab1a5fb1 100644
--- a/lisp/term/bobcat.el
+++ b/lisp/term/bobcat.el
@@ -6,5 +6,4 @@
   (keyboard-translate ?\177 ?\^h)
   (keyboard-translate ?\^h ?\177))
 
-;; arch-tag: 754e4520-0a3e-4e6e-8ca5-9481b1f85cf7
 ;;; bobcat.el ends here
diff --git a/lisp/term/cygwin.el b/lisp/term/cygwin.el
index df857ba662..cfce07035c 100644
--- a/lisp/term/cygwin.el
+++ b/lisp/term/cygwin.el
@@ -6,5 +6,4 @@
   "Terminal initialization function for cygwin."
   (tty-no-underline))
 
-;; arch-tag: ca81ce67-3c41-4883-a29b-4c3d64a21191
 ;;; cygwin.el ends here
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index ab4c5ec39d..a190c84f99 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -604,5 +604,4 @@ list.  You can (and should) also run it if and when the value of
     (run-hooks 'dos-codepage-setup-hook)
     ))
 
-;; arch-tag: eea04c06-7311-4b5a-b531-3c1be1b070af
 ;;; internal.el ends here
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index 82da165e0f..f5d88c9447 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -328,5 +328,4 @@
     (set-keymap-parent m (keymap-parent input-decode-map))
     (set-keymap-parent input-decode-map m)))
 
-;; arch-tag: b1d0e73a-bb7d-47be-9fb2-6fb126469a1b
 ;;; iris-ansi.el ends here
diff --git a/lisp/term/linux.el b/lisp/term/linux.el
index 5ac369721a..76115e7d58 100644
--- a/lisp/term/linux.el
+++ b/lisp/term/linux.el
@@ -18,5 +18,4 @@
   ;; The arg only matters in that it is not t or nil.
   (set-input-meta-mode 'iso-latin-1))
 
-;; arch-tag: 5d0c4f63-739b-4862-abf3-041fe42adb8f
 ;;; linux.el ends here
diff --git a/lisp/term/lk201.el b/lisp/term/lk201.el
index 7bcbd8d754..23f4d0dbd2 100644
--- a/lisp/term/lk201.el
+++ b/lisp/term/lk201.el
@@ -79,5 +79,4 @@
     (set-keymap-parent m (keymap-parent input-decode-map))
     (set-keymap-parent input-decode-map m)))
 
-;; arch-tag: 7ffb4444-6a23-43e1-b457-43cf4f673c0d
 ;;; lk201.el ends here
diff --git a/lisp/term/news.el b/lisp/term/news.el
index 8918bee3b8..4f9d39b3d1 100644
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -69,5 +69,4 @@
     (define-key news-fkey-prefix "x" [kp-8])
     ))
 
-;; arch-tag: bfe141a0-623b-4b42-b753-5d9353776c5e
 ;;; news.el ends here
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index 18ceff62de..6e9f57571c 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -310,5 +310,4 @@ for the currently selected frame."
 	     (* (apply '+ (car (cddr (nth 15 rxvt-standard-colors)))) 0.6))
 	  (set-terminal-parameter nil 'background-mode 'dark)))))
 
-;; arch-tag: 20cf2fb6-6318-4bab-9dbf-1d15048f2257
 ;;; rxvt.el ends here
diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index 705d67a213..210f694f35 100644
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -155,5 +155,4 @@
 	(eval (car hooks))
 	(setq hooks (cdr hooks))))))
 
-;; arch-tag: db761d47-fd7d-42b4-aae1-04fa116b6ba6
 ;;; sun.el ends here
diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el
index 84b4a8d270..5bce08ed7b 100644
--- a/lisp/term/sup-mouse.el
+++ b/lisp/term/sup-mouse.el
@@ -195,5 +195,4 @@ X and Y are 0-based character positions on the frame."
   (get-window-with-predicate (lambda (w)
 			       (coordinates-in-window-p (cons x y) w))))
 
-;; arch-tag: ec644ed4-cac4-43b8-b3db-cfe83e9098d7
 ;;; sup-mouse.el ends here
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index 48e2464ebf..914825b8e2 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -117,5 +117,4 @@ With a negative argument, select numeric keypad mode."
   (send-string-to-terminal
    (if (terminal-parameter nil 'tvi970-keypad-numeric) "\e=" "\e>")))
 
-;; arch-tag: c1334cf0-1462-41c3-a963-c077d175f8f0
 ;;; tvi970.el ends here
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index cc861e6386..d3b800e3f8 100644
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -49,5 +49,4 @@ With negative argument, switch to 80-column mode."
   (send-string-to-terminal (if vt100-wide-mode "\e[?3h" "\e[?3l"))
   (set-frame-width terminal-frame (if vt100-wide-mode 132 80)))
 
-;; arch-tag: 9ff41f24-a7c9-4dee-9cf2-fbaa951eb840
 ;;; vt100.el ends here
diff --git a/lisp/term/vt102.el b/lisp/term/vt102.el
index 1f9bb00efa..0f2e3805f5 100644
--- a/lisp/term/vt102.el
+++ b/lisp/term/vt102.el
@@ -4,5 +4,4 @@
   "Terminal initialization function for vt102."
   (tty-run-terminal-initialization (selected-frame) "vt100"))
 
-;; arch-tag: 6e839cfc-125a-4574-82f1-c23a51f7c50f
 ;;; vt102.el ends here
diff --git a/lisp/term/vt125.el b/lisp/term/vt125.el
index b5a31e8a0f..029f762ef3 100644
--- a/lisp/term/vt125.el
+++ b/lisp/term/vt125.el
@@ -4,5 +4,4 @@
   "Terminal initialization function for vt125."
   (tty-run-terminal-initialization (selected-frame) "vt100"))
 
-;; arch-tag: 1d92d70f-dd55-4a1d-9088-e215a4883801
 ;;; vt125.el ends here
diff --git a/lisp/term/vt200.el b/lisp/term/vt200.el
index 78c65c084c..09ad64d01f 100644
--- a/lisp/term/vt200.el
+++ b/lisp/term/vt200.el
@@ -8,5 +8,4 @@
   (define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
   (define-key local-function-key-map [f11] [?\e]))
 
-;; arch-tag: 0f78f583-9f32-4237-b106-28bcfff21d89
 ;;; vt200.el ends here
diff --git a/lisp/term/vt201.el b/lisp/term/vt201.el
index 987aee09f3..cbeba00b65 100644
--- a/lisp/term/vt201.el
+++ b/lisp/term/vt201.el
@@ -8,5 +8,4 @@
   (define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
   (define-key local-function-key-map [f11] [?\e]))
 
-;; arch-tag: a6abb38f-60ea-449e-a9e9-3fb8572c52ae
 ;;; vt201.el ends here
diff --git a/lisp/term/vt220.el b/lisp/term/vt220.el
index f9439e0eff..647b79ea35 100644
--- a/lisp/term/vt220.el
+++ b/lisp/term/vt220.el
@@ -8,5 +8,4 @@
   (define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
   (define-key local-function-key-map [f11] [?\e]))
 
-;; arch-tag: 98fc4867-a20d-46a1-a276-d7be31e49871
 ;;; vt220.el ends here
diff --git a/lisp/term/vt240.el b/lisp/term/vt240.el
index 0aea10bf98..2da4e7ed3c 100644
--- a/lisp/term/vt240.el
+++ b/lisp/term/vt240.el
@@ -8,5 +8,4 @@
   (define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
   (define-key local-function-key-map [f11] [?\e]))
 
-;; arch-tag: d9f88e9c-02dc-49ff-871c-a415f08e4eb7
 ;;; vt240.el ends here
diff --git a/lisp/term/vt300.el b/lisp/term/vt300.el
index d19f847588..52198d840a 100644
--- a/lisp/term/vt300.el
+++ b/lisp/term/vt300.el
@@ -6,5 +6,4 @@
   (define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
   (define-key local-function-key-map [f11] [?\e]))
 
-;; arch-tag: 876831c9-a6f2-444a-b033-706e6fbc149f
 ;;; vt300.el ends here
diff --git a/lisp/term/vt320.el b/lisp/term/vt320.el
index 1d36c9d933..9b04a5d6ee 100644
--- a/lisp/term/vt320.el
+++ b/lisp/term/vt320.el
@@ -6,5 +6,4 @@
   (define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
   (define-key local-function-key-map [f11] [?\e]))
 
-;; arch-tag: f9f4c954-0b9e-45f9-b450-a320d32abd9c
 ;;; vt320.el ends here
diff --git a/lisp/term/vt400.el b/lisp/term/vt400.el
index 78af2a3719..4c5870c5ad 100644
--- a/lisp/term/vt400.el
+++ b/lisp/term/vt400.el
@@ -6,5 +6,4 @@
   (define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
   (define-key local-function-key-map [f11] [?\e]))
 
-;; arch-tag: a70809c5-6b21-42cc-ba20-536683e5e7d5
 ;;; vt400.el ends here
diff --git a/lisp/term/vt420.el b/lisp/term/vt420.el
index 69b1b31abd..0476b639c2 100644
--- a/lisp/term/vt420.el
+++ b/lisp/term/vt420.el
@@ -6,5 +6,4 @@
   (define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
   (define-key local-function-key-map [f11] [?\e]))
 
-;; arch-tag: df2f897c-3a12-4b3c-9259-df089f96c160
 ;;; vt420.el ends here
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 813f6be248..dbe4d3ae3b 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -156,5 +156,4 @@ M-r	M-x move-to-window-line, Funct up-arrow or down-arrow are similar"
   ;;                   (nth 1 key-definition)))
   (fset 'enable-arrow-keys nil))
 
-;; arch-tag: b6a05d37-eead-4cf6-b997-0f956c68881c
 ;;; wyse50.el ends here
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index aacee8dd7b..7e5c83d7f1 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -682,5 +682,4 @@ versions of xterm."
     (set-terminal-parameter nil 'background-mode 'dark)
     t))
 
-;; arch-tag: 12e7ebdd-1e6c-4b25-b0f9-35ace25e855a
 ;;; xterm.el ends here
diff --git a/lisp/terminal.el b/lisp/terminal.el
index 26778fcd5a..ad1e1a7b64 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -1335,5 +1335,4 @@ in the directory specified by `te-terminfo-directory'."
 
 (provide 'terminal)
 
-;; arch-tag: 0ae1d7d7-90ef-4566-a531-6e7ff8c79b2f
 ;;; terminal.el ends here
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index ce6b491827..1f7bf636bc 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -5557,5 +5557,4 @@ The event, EV, is the mouse event."
 ;; Don't hesitate to ask me any questions.
 
 
-;; arch-tag: 3e63b881-aaaa-4b83-a072-220d4661a8a3
 ;;; artist.el ends here
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index dcd6baa53b..708e43b37d 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -236,5 +236,4 @@ named by variable `unread-bib-file'."
 
 (provide 'bib-mode)
 
-;; arch-tag: e3a97958-3c2c-487f-9557-fafc3c98452d
 ;;; bib-mode.el ends here
diff --git a/lisp/textmodes/bibtex-style.el b/lisp/textmodes/bibtex-style.el
index 092de4bcbf..5915fae3b5 100644
--- a/lisp/textmodes/bibtex-style.el
+++ b/lisp/textmodes/bibtex-style.el
@@ -151,5 +151,4 @@
 
 
 (provide 'bibtex-style)
-;; arch-tag: b20ad41a-fd36-466e-8fd2-cc6137f9c55c
 ;;; bibtex-style.el ends here
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index ff6d4761ae..530126629e 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -621,5 +621,4 @@ For details see `conf-mode'.  Example:
 
 (provide 'conf-mode)
 
-;; arch-tag: 0a3805b2-0371-4d3a-8498-8897116b2356
 ;;; conf-mode.el ends here
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 20ea2bc7b8..fbdadc2623 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -483,5 +483,4 @@
         (indent-line-to indent)))))
 
 (provide 'css-mode)
-;; arch-tag: b4d8b8e2-b130-4e74-b3aa-cd8f1ab659d0
 ;;; css-mode.el ends here
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index 1e46d9453f..aacfd37e8c 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -502,5 +502,4 @@ the range of text to assign text property SYMBOL with value VALUE."
       (message "Warning: invalid <x-display> parameter %s" param))
     (list start end 'display prop)))
 
-;; arch-tag: 05cae488-3fea-45cd-ac29-5b02cb64e42b
 ;;; enriched.el ends here
diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el
index 5cf1ea9c5f..88b36cfd44 100644
--- a/lisp/textmodes/makeinfo.el
+++ b/lisp/textmodes/makeinfo.el
@@ -289,5 +289,4 @@ line LINE of the window, or centered if LINE is nil."
 ;;; Place `provide' at end of file.
 (provide 'makeinfo)
 
-;; arch-tag: 5f810713-3de2-4e20-8030-4bc3dd0d9604
 ;;; makeinfo.el ends here
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index 420472fc5f..309f42cd6e 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -331,5 +331,4 @@ turns it on if arg is positive, otherwise off."
 
 (provide 'nroff-mode)
 
-;; arch-tag: 6e276340-6c65-4f65-b4e3-0ca431ddfb6c
 ;;; nroff-mode.el ends here
diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index 0229369146..6636780a05 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -164,5 +164,4 @@ thus showing a page other than the one point was originally in."
 ;;; Place `provide' at end of file.
 (provide 'page)
 
-;; arch-tag: e8d7a0bd-8655-4b6e-b852-f2ee25316a1d
 ;;; page.el ends here
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 9433aa90a6..8b12c5f7ba 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -529,5 +529,4 @@ the current sentence with the one containing the mark."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: e727eb1a-527a-4464-b9d7-9d3ec0d1a575
 ;;; paragraphs.el ends here
diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el
index fe3a249458..1f89cd8373 100644
--- a/lisp/textmodes/po.el
+++ b/lisp/textmodes/po.el
@@ -131,5 +131,4 @@ Called through `file-coding-system-alist', before the file is visited for real."
 
 (provide 'po)
 
-;; arch-tag: 56748a57-d64c-4200-8f6b-c3a70496eb8c
 ;;; po.el ends here
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index 611a1de5d0..37649128b2 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -746,5 +746,4 @@ Please send bug reports and suggestions to
 (provide 'refbib)
 (provide 'refer-to-bibtex)
 
-;; arch-tag: 664afee2-6e76-4408-ba56-981d8a179586
 ;;; refbib.el ends here
diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index 50f2353f14..df89753d01 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -396,5 +396,4 @@ found on the last `refer-find-entry' or `refer-find-next-entry'."
         (setq refer-bib-files files))
     files))
 
-;; arch-tag: 151f641b-e79b-462b-9a29-a95c3793f300
 ;;; refer.el ends here
diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el
index 7e4570c399..61a4ce0548 100644
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -258,5 +258,4 @@ refilling if they would cause auto-filling."
 
 (provide 'refill)
 
-;; arch-tag: 2c4ce9e8-1daa-4a3b-b6f8-fd6ac5bf6138
 ;;; refill.el ends here
diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el
index 4f3cc69d58..81016a96f9 100644
--- a/lisp/textmodes/reftex-auc.el
+++ b/lisp/textmodes/reftex-auc.el
@@ -224,5 +224,4 @@ of ENTRY-LIST is a list of cons cells (\"MACRONAME\" . LEVEL).  See
 (defun reftex-notice-new-section ()
   (reftex-notice-new 1 'force))
 
-;; arch-tag: 4a798e68-3405-421c-a09b-0269aac64ab4
 ;;; reftex-auc.el ends here
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 19663f81bd..83a157f4f3 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -1174,5 +1174,4 @@ The sequence in the new file is the same as it was in the old database."
              (length entries))))
 
 
-;; arch-tag: d53d0a5a-ab32-4b52-a846-2a7c3527cd89
 ;;; reftex-cite.el ends here
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index 152698127c..0fd9ae7f6f 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -482,5 +482,4 @@ Calling this function several times find successive citation locations."
       (move-marker reftex-global-search-marker nil)
       (error "All files processed"))))
 
-;; arch-tag: d2f52b56-744e-44ad-830d-1fc193b90eda
 ;;; reftex-dcr.el ends here
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index b679d5ddfa..daab186b76 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -475,5 +475,4 @@ With no argument, this command toggles
 (add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil 
 		'reftex-isearch-minor-mode)
 
-;; arch-tag: 2dbf7633-92c8-4340-8656-7aa019d0f80d
 ;;; reftex-global.el ends here
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 8fc8c72c7d..12bf8b7046 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -1070,5 +1070,4 @@ of master file."
               nrest (- nrest i))))
     string))
 
-;; arch-tag: 6a8168f7-abb9-4576-99dc-fcbc7ba901a3
 ;;; reftex-parse.el ends here
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index e725be7652..53673ef2d5 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -1917,5 +1917,4 @@ construct:  \\bbb [xxx] {aaa}."
 
 (provide 'reftex-vars)
 
-;; arch-tag: 9591ea34-ef39-4431-90b7-c115eaf5e16f
 ;;; reftex-vars.el ends here
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 9b8a19a62a..ab99e56551 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -2582,5 +2582,4 @@ With optional NODE, go directly to that node."
 
 ;;;============================================================================
 
-;; arch-tag: 49e0da4e-bd5e-4cfc-a717-fb444fccb9e6
 ;;; reftex.el ends here
diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el
index 58d2088e3e..44885e0b4f 100644
--- a/lisp/textmodes/spell.el
+++ b/lisp/textmodes/spell.el
@@ -168,5 +168,4 @@ for example, \"word\"."
 
 (provide 'spell)
 
-;; arch-tag: 7eabb848-9c76-431a-bcdb-0e0592d2db04
 ;;; spell.el ends here
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index ca5b5d99e7..77a4309ca0 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2915,5 +2915,4 @@ There might be text before point."
 
 (provide 'tex-mode)
 
-;; arch-tag: c0a680b1-63aa-4547-84b9-4193c29c0080
 ;;; tex-mode.el ends here
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 16b7d21b37..9273173dc9 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -1024,5 +1024,4 @@ You are prompted for the job number (use a number shown by a previous
 
 (provide 'texinfo)
 
-;; arch-tag: 005d7c38-43b9-4b7d-aa1d-aea69bae73e1
 ;;; texinfo.el ends here
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 07e8b8dd2b..bb59bf6382 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -182,5 +182,4 @@ The argument NLINES says how many lines to center."
 	   (setq nlines (1+ nlines))
 	   (forward-line -1)))))
 
-;; arch-tag: a07ccaad-da13-4d7b-9c61-cd04f5926aab
 ;;; text-mode.el ends here
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index 0f5c0a43a5..6e09657f44 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -353,5 +353,4 @@ further questions)."
 ;; coding: iso-latin-2
 ;; End:
 
-;; arch-tag: fc9b05a6-7355-4639-8170-dcf57853ba22
 ;;; tildify.el ends here
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index 0d410f9f3b..fd50ce4d00 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -632,5 +632,4 @@ on, this also realigns the two buffers."
 
 (provide 'two-column)
 
-;; arch-tag: 2021b5ab-d3a4-4a8c-a21c-1936b0f9e6b1
 ;;; two-column.el ends here
diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el
index f7507f6d6a..e2f64edf92 100644
--- a/lisp/textmodes/underline.el
+++ b/lisp/textmodes/underline.el
@@ -61,5 +61,4 @@ which specify the range to operate on."
 
 (provide 'underline)
 
-;; arch-tag: e7b48582-c3ea-4386-987a-87415f3c372a
 ;;; underline.el ends here
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 4389d54e70..548b7220c3 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -472,5 +472,4 @@ Signal an error if the entire string was not used."
   "Return the Lisp list at point, or nil if none is found."
   (form-at-point 'list 'listp))
 
-;; arch-tag: bb65a163-dae2-4055-aedc-fe11f497f698
 ;;; thingatpt.el ends here
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index b312c88121..48018c7090 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -816,5 +816,4 @@ ACTION and ARG should be a valid convert command."
 
 (provide 'thumbs)
 
-;; arch-tag: f9ac1ef8-83fc-42c0-8069-1fae43fd2e5c
 ;;; thumbs.el ends here
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index fb5d4303d7..3404709588 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -706,5 +706,4 @@ around literals."
 
 (provide 'time-stamp)
 
-;; arch-tag: 8a12c5c3-25d6-4a71-adc5-24b0e025a1e7
 ;;; time-stamp.el ends here
diff --git a/lisp/time.el b/lisp/time.el
index 40e612adad..5f2e8752ab 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -576,5 +576,4 @@ For example, the Unix uptime command format is \"%D, %z%2h:%.2m\"."
 
 (provide 'time)
 
-;; arch-tag: b9c1623f-b5cb-48e4-b650-482a4d23c5a6
 ;;; time.el ends here
diff --git a/lisp/timezone.el b/lisp/timezone.el
index 397027d577..2c3b2f4d26 100644
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@@ -403,5 +403,4 @@ The Gregorian date Sunday, December 31, 1 BC is imaginary."
 
 (provide 'timezone)
 
-;; arch-tag: e23d5bc6-f32d-48ba-8996-323e9d654b3f
 ;;; timezone.el ends here
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 0341b5384f..c62a4adeab 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -566,5 +566,4 @@ of `menu-bar-final-items'."
 
 (provide 'tmm)
 
-;; arch-tag: e7ddbdb6-4b95-4da3-afbe-ad6063d112f4
 ;;; tmm.el ends here
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 3e4538a5ea..dcbdb069a7 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -385,5 +385,4 @@ Value is non-nil if this function handled the tip."
 
 (provide 'tooltip)
 
-;; arch-tag: 3d61135e-4618-4a78-af28-183f6df5636f
 ;;; tooltip.el ends here
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 83b1e60a38..9ccc28e859 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -818,5 +818,4 @@ That is, if TREE :args is nil."
 
 (provide 'tree-widget)
 
-;; arch-tag: c3a1ada2-1663-41dc-9d16-2479ed8320e8
 ;;; tree-widget.el ends here
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 9759b6a61f..97646e5a01 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -963,5 +963,4 @@ Currently this feature is only used in `help-with-tutorial'."
 
 (provide 'tutorial)
 
-;; arch-tag: c8e80aef-c3bb-4ffb-8af6-22171bf0c100
 ;;; tutorial.el ends here
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 919afeba01..fb67487f32 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -508,5 +508,4 @@ For use on `kill-buffer-hook'."
 
 (provide 'uniquify)
 
-;; arch-tag: e763faa3-56c9-4903-8eb8-26e1c45a0065
 ;;; uniquify.el ends here
diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index 7f78de18fe..71be17b437 100644
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -99,5 +99,4 @@
 
 (provide 'url-about)
 
-;; arch-tag: 65dd7fca-db3f-4cb1-8026-7dd37d4a460e
 ;;; url-about.el ends here
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index b3f058748f..c82546f08f 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -345,5 +345,4 @@ RATING   a rating between 1 and 10 of the strength of the authentication.
 
 (provide 'url-auth)
 
-;; arch-tag: 04058625-616d-44e4-9dbf-4b46b00b2a91
 ;;; url-auth.el ends here
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index be2931e090..730c248e49 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -211,5 +211,4 @@ If `url-standalone-mode' is non-nil, cached items never expire."
 
 (provide 'url-cache)
 
-;; arch-tag: 95b050a6-8e81-4f23-8e63-191b9d1d657c
 ;;; url-cache.el ends here
diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
index 3d34404763..31eab3f523 100644
--- a/lisp/url/url-cid.el
+++ b/lisp/url/url-cid.el
@@ -59,5 +59,4 @@
    (t
     (message "Unable to handle CID URL: %s" url))))
 
-;; arch-tag: 23d9ab74-fad4-4dba-b1e7-292871e8bda5
 ;;; url-cid.el ends here
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index bd6907df64..99d98d2bd2 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -963,5 +963,4 @@ Returns nil if URL contains no name starting with FILE."
 
 (provide 'url-dav)
 
-;; arch-tag: 2b14b7b3-888a-49b8-a490-17276a40e78e
 ;;; url-dav.el ends here
diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index 17c056fbe5..723183121a 100644
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -55,5 +55,4 @@
 
 (provide 'url-dired)
 
-;; arch-tag: 2694f21a-43e1-4391-b3cb-cf6e5349f15f
 ;;; url-dired.el ends here
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index c420ea930b..9d2e7e9fe5 100644
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -144,5 +144,4 @@ path components followed by `..' are removed, along with the `..' itself."
 
 (provide 'url-expand)
 
-;; arch-tag: 7b5f744b-b721-49da-be47-484631680a5a
 ;;; url-expand.el ends here
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 28917fb08a..c55bc40f42 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -241,5 +241,4 @@ to them."
 
 (provide 'url-file)
 
-;; arch-tag: 010e914a-7313-494b-8a8c-6495a862157d
 ;;; url-file.el ends here
diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el
index fdfaecbf8f..977dc3b239 100644
--- a/lisp/url/url-ftp.el
+++ b/lisp/url/url-ftp.el
@@ -41,5 +41,4 @@
 
 (provide 'url-ftp)
 
-;; arch-tag: 9c3e70c4-350f-4d4a-bb51-a1e9b459e7dc
 ;;; url-ftp.el ends here
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 7d3427743b..49f3481e29 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -276,5 +276,4 @@ Might do a non-blocking connection; use `process-status' to check."
 
 (provide 'url-gw)
 
-;; arch-tag: 1c4c0317-6d03-45b8-b3f3-838bd8f9d838
 ;;; url-gw.el ends here
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 9b77c3c5cd..d54d0d82de 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -325,5 +325,4 @@ They count bytes from the beginning of the body."
 
 (provide 'url-handlers)
 
-;; arch-tag: 7300b99c-cc83-42ff-9147-79b2723c62ac
 ;;; url-handlers.el ends here
diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index 9e933332e3..ca1e6daf4d 100644
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -184,5 +184,4 @@ user for what type to save as."
 
 (provide 'url-history)
 
-;; arch-tag: fbbbaf63-db36-4e88-bc9f-2939aa93afb2
 ;;; url-history.el ends here
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index f1b687cfca..8fe99dc115 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1453,5 +1453,4 @@ p3p
 
 (provide 'url-http)
 
-;; arch-tag: ba7c59ae-c0f4-4a31-9617-d85f221732ee
 ;;; url-http.el ends here
diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index d901bb00c2..e012a7d9c1 100644
--- a/lisp/url/url-imap.el
+++ b/lisp/url/url-imap.el
@@ -76,5 +76,4 @@
 	     )))
     (current-buffer)))
 
-;; arch-tag: 034991ff-5425-48ea-b911-c96c90e6f47d
 ;;; url-imap.el ends here
diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index 5270aab7b4..fdeeee2e3c 100644
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -91,5 +91,4 @@ PASSWORD - What password to use"
 
 (provide 'url-irc)
 
-;; arch-tag: 2e5eecf8-9eb3-436b-9fbd-c26f2fb2bf3e
 ;;; url-irc.el ends here
diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index 0a99f7344d..efe301c8b3 100644
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -237,5 +237,4 @@ URL can be a URL string, or a URL vector of the type returned by
 
 (provide 'url-ldap)
 
-;; arch-tag: 6230e21c-41ae-4174-bd83-82c835676fc8
 ;;; url-ldap.el ends here
diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el
index fec991c3ff..51d00259fb 100644
--- a/lisp/url/url-mailto.el
+++ b/lisp/url/url-mailto.el
@@ -142,5 +142,4 @@
 
 (provide 'url-mailto)
 
-;; arch-tag: 7b7ad52e-8760-497b-9444-75fae14e34c5
 ;;; url-mailto.el ends here
diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index aeb78880a8..e7da5254f8 100644
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -154,5 +154,4 @@ it has not already been loaded."
 
 (provide 'url-methods)
 
-;; arch-tag: 336863f8-5a07-4906-9be5-b3c6bcebbe67
 ;;; url-methods.el ends here
diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index bfcc9db6ba..fb4c6cc998 100644
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -115,5 +115,4 @@
 
 (provide 'url-misc)
 
-;; arch-tag: 8c544e1b-d8bc-40a6-b319-f1f37fef65a0
 ;;; url-misc.el ends here
diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index 7f788119c5..71e77cf3a1 100644
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -130,5 +130,4 @@
 
 (provide 'url-news)
 
-;; arch-tag: 8975be13-04e8-4d38-bfff-47918e3ad311
 ;;; url-news.el ends here
diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index f10b8ce395..6261b6fddb 100644
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -89,5 +89,4 @@ Each can be used any number of times.")
 
 (provide 'url-nfs)
 
-;; arch-tag: cdf9c9ba-b7d2-4c29-8b48-7ae9bbc0d437
 ;;; url-nfs.el ends here
diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el
index b42052aa33..915d354e64 100644
--- a/lisp/url/url-ns.el
+++ b/lisp/url/url-ns.el
@@ -102,5 +102,4 @@
 
 (provide 'url-ns)
 
-;; arch-tag: 69520992-cf97-40b4-9ad1-c866d3cae5bf
 ;;; url-ns.el ends here
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index 2ac7685c6c..0be55e10ab 100644
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -196,5 +196,4 @@ TYPE USER PASSWORD HOST PORTSPEC FILENAME TARGET ATTRIBUTES FULLNESS."
 
 (provide 'url-parse)
 
-;; arch-tag: f338325f-71ab-4bee-93cc-78fb9a03d403
 ;;; url-parse.el ends here
diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index 563ef97418..f15fe97cde 100644
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.el
@@ -75,5 +75,4 @@
 
 (provide 'url-privacy)
 
-;; arch-tag: fdaf95e4-98f0-4680-94c3-f3eadafabe1d
 ;;; url-privacy.el ends here
diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el
index bfea09e831..421c736412 100644
--- a/lisp/url/url-proxy.el
+++ b/lisp/url/url-proxy.el
@@ -76,5 +76,4 @@
   
 (provide 'url-proxy)
 
-;; arch-tag: 4ff8882e-e498-42b7-abc5-acb449cdbc62
 ;;; url-proxy.el ends here
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index cce153bdb6..a5971816b1 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -532,5 +532,4 @@ Creates FILE and its parent directories if they do not exist."
 
 (provide 'url-util)
 
-;; arch-tag: 24352abc-5a5a-412e-90cd-313b26bed5c9
 ;;; url-util.el ends here
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index f64ef38b8d..7046815b50 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -390,5 +390,4 @@ This should be set, e.g. by mail user agents rendering HTML to avoid
 
 (provide 'url-vars)
 
-;; arch-tag: 29205e5f-c5ce-433c-8d5d-38cbaed64b49
 ;;; url-vars.el ends here
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 2529adeb96..4a71aee9d6 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -326,5 +326,4 @@ no further processing).  URL is either a string or a parsed URL."
 
 (provide 'url)
 
-;; arch-tag: bc182f1f-d187-4f10-b961-47af2066579a
 ;;; url.el ends here
diff --git a/lisp/userlock.el b/lisp/userlock.el
index 84b5c47e71..1dd1422723 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -157,5 +157,4 @@ to get the latest version of the file, then make the change again.")
     (with-current-buffer standard-output
       (help-mode))))
 
-;; arch-tag: a61c5b60-e1c8-44fd-894a-c617f4dfc639
 ;;; userlock.el ends here
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index 23b7466f8d..57af8452e0 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -1367,5 +1367,4 @@ old-style time formats for entries are supported."
 
 (provide 'add-log)
 
-;; arch-tag: 81eee6fc-088f-4372-a37f-80ad9620e762
 ;;; add-log.el ends here
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index 5b680ea4f1..a31081253b 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -389,5 +389,4 @@ on third call it again advances points to the next difference and so on."
 
 (provide 'compare-w)
 
-;; arch-tag: 4177aab1-48e6-4a98-b7a1-000ee285de46
 ;;; compare-w.el ends here
diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el
index ffcb3a9d53..11190f03ef 100644
--- a/lisp/vc/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -535,5 +535,4 @@ Optional prefix ARG chooses between two representations."
 
 (provide 'cvs-status)
 
-;; arch-tag: db8b5094-d02a-473e-a476-544e89ff5ad0
 ;;; cvs-status.el ends here
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index e8c79aead6..72d627475e 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1938,5 +1938,4 @@ I.e. like `add-change-log-entry-other-window' but applied to all hunks."
 ;; use `combine-after-change-calls' to minimize the slowdown of font-lock.
 ;;
 
-;; arch-tag: 2571d7ff-bc28-4cf9-8585-42e21890be66
 ;;; diff-mode.el ends here
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index b77f5f2aaf..a1c1ea10a7 100644
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -318,5 +318,4 @@ the value of this variable and the variables `ediff-help-message-*' in
 (provide 'ediff-help)
 
 
-;; arch-tag: 05659813-7fcf-4274-964f-d2f577431a9d
 ;;; ediff-help.el ends here
diff --git a/lisp/vc/ediff-hook.el b/lisp/vc/ediff-hook.el
index 83c807564f..b02fe5fbea 100644
--- a/lisp/vc/ediff-hook.el
+++ b/lisp/vc/ediff-hook.el
@@ -260,5 +260,4 @@
 (provide 'ediff-hook)
 
 
-;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3
 ;;; ediff-hook.el ends here
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 56ccc54035..7fad799bfa 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -1808,5 +1808,4 @@ Unless optional argument INPLACE is non-nil, return a new string."
 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
 ;; End:
 
-;; arch-tag: fa31d384-1e70-4d4b-82a7-3e96307c46f5
 ;;; ediff-init.el ends here
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index b63bd15f4e..247d6caa62 100644
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -394,5 +394,4 @@ Combining is done according to the specifications in variable
 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
 ;; End:
 
-;; arch-tag: 9b798cf9-02ba-487f-a62e-b63aa823dbfb
 ;;; ediff-merg.el ends here
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 58778f4ce9..b8f06f2123 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -2474,5 +2474,4 @@ for operation, or simply indicate which are equal files.  If it is nil, then
 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
 ;; End:
 
-;; arch-tag: c8a76898-f96f-4d9c-be9d-129134017188
 ;;; ediff-mult.el ends here
diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el
index 487c5e8078..bd225cf7c9 100644
--- a/lisp/vc/ediff-vers.el
+++ b/lisp/vc/ediff-vers.el
@@ -236,5 +236,4 @@ comparison or merge operations are being performed."
 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
 ;; End:
 
-;; arch-tag: bbb34f0c-2a90-426a-a77a-c75f479ebbbf
 ;;; ediff-vers.el ends here
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 9866f10107..497994a655 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -1562,5 +1562,4 @@ With optional NODE, goes to that node."
 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
 ;; End:
 
-;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
 ;;; ediff.el ends here
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index 94e70ff2b3..64cfa20609 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -875,5 +875,4 @@ anyway and put back as the first line of MSG."
 
 (provide 'log-edit)
 
-;; arch-tag: 8089b39c-983b-4e83-93cd-ed0a64c7fdcc
 ;;; log-edit.el ends here
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index fbcb88b3f7..03bd966bc7 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -542,5 +542,4 @@ the changes that affected other files than the currently considered file(s)."
 
 (provide 'log-view)
 
-;; arch-tag: 0d64220b-ce7e-4f62-9c2a-6b04c2f81f4f
 ;;; log-view.el ends here
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el
index db153fd29a..9e00a988c1 100644
--- a/lisp/vc/pcvs-defs.el
+++ b/lisp/vc/pcvs-defs.el
@@ -525,5 +525,4 @@ message and replace it with a message telling you to change this variable.")
 ;;
 (provide 'pcvs-defs)
 
-;; arch-tag: c7c701d0-d1d4-4aa9-a302-007bb03aca5e
 ;;; pcvs-defs.el ends here
diff --git a/lisp/vc/pcvs-info.el b/lisp/vc/pcvs-info.el
index 0b570b1085..b3eed726a9 100644
--- a/lisp/vc/pcvs-info.el
+++ b/lisp/vc/pcvs-info.el
@@ -486,5 +486,4 @@ DIR can also be a file."
 
 (provide 'pcvs-info)
 
-;; arch-tag: d85dde07-bdc2-400a-882f-92f398c7b0ba
 ;;; pcvs-info.el ends here
diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el
index a27fe3e61c..65ff45a462 100644
--- a/lisp/vc/pcvs-parse.el
+++ b/lisp/vc/pcvs-parse.el
@@ -535,5 +535,4 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
 
 (provide 'pcvs-parse)
 
-;; arch-tag: 35418375-1a23-40a0-957d-96b0262f91d6
 ;;; pcvs-parse.el ends here
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index ebcd358321..9cf13a0f5c 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -368,5 +368,4 @@ And reset it unless READ-ONLY is non-nil."
 
 (provide 'pcvs-util)
 
-;; arch-tag: 3b2588bb-2ae3-4f1f-bf5b-dea91b1f8a59
 ;;; pcvs-util.el ends here
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index fbc089afc4..c0c8010dab 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -2439,5 +2439,4 @@ The exact behavior is determined also by `cvs-dired-use-hook'."
 
 (provide 'pcvs)
 
-;; arch-tag: 8e3a7494-0453-4389-9ab3-a557ce9fab61
 ;;; pcvs.el ends here
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 4b85a964fd..594796d033 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -1300,5 +1300,4 @@ If no conflict maker is found, turn off `smerge-mode'."
 
 (provide 'smerge-mode)
 
-;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690
 ;;; smerge-mode.el ends here
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index edf632f441..8e626e8c2a 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -676,5 +676,4 @@ The annotations are relative to the current time, unless overridden by OFFSET."
 
 (provide 'vc-annotate)
 
-;; arch-tag: c3454a89-80e5-4ffd-8993-671b59612898
 ;;; vc-annotate.el ends here
diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el
index cbe3a38fcb..846f40fe4e 100644
--- a/lisp/vc/vc-arch.el
+++ b/lisp/vc/vc-arch.el
@@ -638,5 +638,4 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
 
 (provide 'vc-arch)
 
-;; arch-tag: a35c7c1c-5237-429d-88ef-3d718fd2e704
 ;;; vc-arch.el ends here
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 3b5766bda6..1619636cbe 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -1210,5 +1210,4 @@ is non-nil."
 
 (provide 'vc-cvs)
 
-;; arch-tag: 60e1402a-aa53-4607-927a-cf74f144b432
 ;;; vc-cvs.el ends here
diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el
index 571a2ca868..26c6bf2ce9 100644
--- a/lisp/vc/vc-dav.el
+++ b/lisp/vc/vc-dav.el
@@ -186,5 +186,4 @@ It should return a status of either 0 (no differences found), or
 
 (provide 'vc-dav)
 
-;; arch-tag: 0a0fb9fe-8190-4c0a-a179-5c291d3a467e
 ;;; vc-dav.el ends here
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 36e6967722..84349e8624 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -1259,5 +1259,4 @@ These are the commands available for use in the file status buffer:
 
 (provide 'vc-dir)
 
-;; arch-tag: 0274a2e3-e8e9-4b1a-a73c-e8b9129d5d15
 ;;; vc-dir.el ends here
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index cb5bd0a2c2..2760fe2dae 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -692,5 +692,4 @@ the buffer contents as a comment."
 
 (provide 'vc-dispatcher)
 
-;; arch-tag: 7d08b17f-5470-4799-914b-bfb9fcf6a246
 ;;; vc-dispatcher.el ends here
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 6d3a699135..7e051fd8dc 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1036,5 +1036,4 @@ Returns nil if not possible."
 
 (provide 'vc-git)
 
-;; arch-tag: bd10664a-0e5b-48f5-a877-6c17b135be12
 ;;; vc-git.el ends here
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 62deb5b050..d6c6f752e4 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -635,5 +635,4 @@ and that it passes `vc-hg-global-switches' to it before FLAGS."
 
 (provide 'vc-hg)
 
-;; arch-tag: bd094dc5-715a-434f-a331-37b9fb7cd954
 ;;; vc-hg.el ends here
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 38bc121e70..748266efd3 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -1052,5 +1052,4 @@ current, and kill the buffer that visits the link."
 
 (provide 'vc-hooks)
 
-;; arch-tag: 2e5a6fa7-1d30-48e2-8bd0-e3d335f04f32
 ;;; vc-hooks.el ends here
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index 0bf30aca6a..0315392810 100644
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -341,5 +341,4 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 
 (provide 'vc-mtn)
 
-;; arch-tag: 2b89ffbc-cbb8-405a-9080-2eafd4becb70
 ;;; vc-mtn.el ends here
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index ea0fed7bf0..1d88288cf5 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -1467,5 +1467,4 @@ The `:insn' key is a keyword to distinguish it as a vc-rcs.el extension."
 
 (provide 'vc-rcs)
 
-;; arch-tag: 759b4916-5b0d-431d-b647-b185b8c652cf
 ;;; vc-rcs.el ends here
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index f717ed0962..4d43d758e7 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -483,5 +483,4 @@ If NAME is nil or a revision number string it's just passed through."
 
 (provide 'vc-sccs)
 
-;; arch-tag: d751dee3-d7b3-47e1-95e3-7ae98c052041
 ;;; vc-sccs.el ends here
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 635cb14bd8..2a4a79f0ec 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -744,5 +744,4 @@ information about FILENAME and return its status."
 
 (provide 'vc-svn)
 
-;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
 ;;; vc-svn.el ends here
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index d243cb1ce5..2f26c1eb50 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2775,5 +2775,4 @@ Invoke FUNC f ARGS on each VC-managed file f underneath it."
 
 (provide 'vc)
 
-;; arch-tag: ca82c1de-3091-4e26-af92-460abc6213a6
 ;;; vc.el ends here
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 98f1d612fb..a474058f70 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -1144,5 +1144,4 @@ line is treated like ordinary characters."
 
 (provide 'vcursor)
 
-;; arch-tag: cdfe1cdc-2c46-4046-88e4-ed57d20f7aca
 ;;; vcursor.el ends here
diff --git a/lisp/view.el b/lisp/view.el
index 313d798492..77cbf129ed 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -1086,5 +1086,4 @@ If TIMES is negative, search backwards."
 
 (provide 'view)
 
-;; arch-tag: 6d0ace36-1d12-4de3-8de3-1fa3231636d7
 ;;; view.el ends here
diff --git a/lisp/vt-control.el b/lisp/vt-control.el
index 81b734e077..7ad1f65397 100644
--- a/lisp/vt-control.el
+++ b/lisp/vt-control.el
@@ -108,5 +108,4 @@
 
 (provide 'vt-control)
 
-;; arch-tag: d4fed1bf-2524-4ba1-a4fe-86bca3d928a2
 ;;; vt-control.el ends here
diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el
index 350a8f3ab8..b76fc23979 100644
--- a/lisp/vt100-led.el
+++ b/lisp/vt100-led.el
@@ -66,5 +66,4 @@ Element 0 is not used.")
 
 (provide 'vt100-led)
 
-;; arch-tag: 346e6480-5e31-4234-aafe-257cea4a36d1
 ;;; vt100-led.el ends here
diff --git a/lisp/wdired.el b/lisp/wdired.el
index a9189c3920..8f303194a5 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -841,5 +841,4 @@ Like original function but it skips read-only words."
 ;; byte-compile-dynamic: t
 ;; End:
 
-;; arch-tag: bc00902e-526f-4305-bc7f-8862a559184f
 ;;; wdired.el ends here
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 16f9bb451f..c393c7e78c 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -2669,5 +2669,4 @@ It should be added buffer-locally to `write-file-functions'."
 (run-hooks 'whitespace-load-hook)
 
 
-;; arch-tag: 1b1e2500-dbd4-4a26-8f7a-5a5edfd3c97e
 ;;; whitespace.el ends here
diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el
index 569b511ed4..dd4a641b3d 100644
--- a/lisp/wid-browse.el
+++ b/lisp/wid-browse.el
@@ -279,5 +279,4 @@ With arg, turn widget mode on if and only if arg is positive."
 
 (provide 'wid-browse)
 
-;; arch-tag: d5ffb18f-8984-4735-8502-edf70456db21
 ;;; wid-browse.el ends here
diff --git a/lisp/widget.el b/lisp/widget.el
index a05faae6b2..c74bf89a63 100644
--- a/lisp/widget.el
+++ b/lisp/widget.el
@@ -96,5 +96,4 @@ The third argument DOC is a documentation string for the widget."
 
 (provide 'widget)
 
-;; arch-tag: 932c71a3-9aeb-4827-a293-8b88b26d5c58
 ;;; widget.el ends here
diff --git a/lisp/windmove.el b/lisp/windmove.el
index 81367ac5f0..493f2618aa 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -568,5 +568,4 @@ Default MODIFIER is 'shift."
 
 (provide 'windmove)
 
-;; arch-tag: 56267432-bf1a-4296-a9a0-85c6bd9f2375
 ;;; windmove.el ends here
diff --git a/lisp/window.el b/lisp/window.el
index 03cc2732a9..c03b8a1840 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2039,5 +2039,4 @@ Otherwise, consult the value of `truncate-partial-width-windows'
 (define-key ctl-x-map "+" 'balance-windows)
 (define-key ctl-x-4-map "0" 'kill-buffer-and-window)
 
-;; arch-tag: b508dfcc-c353-4c37-89fa-e773fe10cea9
 ;;; window.el ends here
diff --git a/lisp/winner.el b/lisp/winner.el
index f1fcb8ff9d..d29ad3fb04 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -473,5 +473,4 @@ In other words, \"undo\" changes in window configuration."
 	minor-mode-map-alist))
 
 (provide 'winner)
-;; arch-tag: 686d1c1b-010e-42ca-a192-b5685112418f
 ;;; winner.el ends here
diff --git a/lisp/xml.el b/lisp/xml.el
index edcc13d6b8..a33d44dc6c 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -911,5 +911,4 @@ The first line is indented with INDENT-STRING."
 
 (provide 'xml)
 
-;; arch-tag: 5864b283-5a68-4b59-a20d-36a72b353b9b
 ;;; xml.el ends here
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 5a70e6a680..4269a17612 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -265,5 +265,4 @@ down the SHIFT key while pressing the mouse button."
 
 (provide 'xt-mouse)
 
-;; arch-tag: 84962d4e-fae9-4c13-a9d7-ef4925a4ac03
 ;;; xt-mouse.el ends here