diff --git a/src/dungeon.c b/src/dungeon.c
index 3b119284a..474a85a21 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -58,7 +58,6 @@ static const char *FDECL(br_string, (int));
 static char FDECL(chr_u_on_lvl, (d_level *));
 static void FDECL(print_branch, (winid, int, int, int, BOOLEAN_P,
                                      struct lchoice *));
-/* SAVE2018 */
 static mapseen *FDECL(load_mapseen, (NHFILE *));
 static void FDECL(save_mapseen, (NHFILE *, mapseen *));
 static mapseen *FDECL(find_mapseen, (d_level *));
diff --git a/src/light.c b/src/light.c
index 328a69f1c..2fd09425a 100644
--- a/src/light.c
+++ b/src/light.c
@@ -44,7 +44,6 @@
 #define LSF_SHOW 0x1        /* display the light source */
 #define LSF_NEEDS_FIXUP 0x2 /* need oid fixup */
 
-/* SAVE2018 */
 static void FDECL(write_ls, (NHFILE *, light_source *));
 static int FDECL(maybe_write_ls, (NHFILE *, int, BOOLEAN_P));
 
@@ -446,8 +445,6 @@ boolean ghostly;
     }
 }
 
-/* SAVE2018 */
-
 /*
  * Part of the light source save routine.  Count up the number of light
  * sources that would be written.  If write_it is true, actually write
@@ -518,14 +515,6 @@ light_sources_sanity_check()
     }
 }
 
-/* SAVE2018 */
-#if 0
-static void
-write_ls(fd, ls)
-int fd;
-light_source *ls;
-#endif /* 0 */
-
 /* Write a light source structure to disk. */
 static void
 write_ls(nhfp, ls)
diff --git a/src/mkroom.c b/src/mkroom.c
index 05eb9550b..de87a14e2 100644
--- a/src/mkroom.c
+++ b/src/mkroom.c
@@ -26,9 +26,6 @@ static void NDECL(mktemple);
 static coord *FDECL(shrine_pos, (int));
 static struct permonst *NDECL(morguemon);
 static struct permonst *NDECL(squadmon);
-/* SAVE2018 */
-/* static void FDECL(save_room, (int,struct mkroom *)); */
-/* static void FDECL(rest_room, (int,struct mkroom *)); */
 static void FDECL(save_room, (NHFILE *, struct mkroom *));
 static void FDECL(rest_room, (NHFILE *, struct mkroom *));
 
diff --git a/src/restore.c b/src/restore.c
index 9c01c5432..fd44f2ea1 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -149,8 +149,6 @@ NHFILE *nhfp;
     }
 }
 
-/* SAVE2018 */
-
 static void
 restdamage(nhfp, ghostly)
 NHFILE *nhfp;
@@ -204,8 +202,6 @@ boolean ghostly;
     free((genericptr_t) tmp_dam);
 }
 
-/* SAVE2018 */
-
 /* restore one object */
 static void
 restobj(nhfp, otmp)
@@ -249,7 +245,7 @@ struct obj *otmp;
             newomonst(otmp);
             /* this is actually a monst struct, so we
                can just defer to restmon() here */
-            restmon(nhfp, OMONST(otmp));    /* SAVE2018 */
+            restmon(nhfp, OMONST(otmp));
         }
 
         /* omid - monster id number, connecting corpse to ghost */
@@ -297,8 +293,6 @@ struct obj *otmp;
     }
 }
 
-/* SAVE2018 */
-
 static struct obj *
 restobjchn(nhfp, ghostly, frozen)
 NHFILE *nhfp;
@@ -318,7 +312,7 @@ boolean ghostly, frozen;
             break;
 
         otmp = newobj();
-        restobj(nhfp, otmp); /* SAVE2018 */
+        restobj(nhfp, otmp);
         if (!first)
             first = otmp;
         else
@@ -389,8 +383,6 @@ boolean ghostly, frozen;
     return first;
 }
 
-/* SAVE2018 */
-
 /* restore one monster */
 static void
 restmon(nhfp, mtmp)
@@ -492,8 +484,6 @@ struct monst *mtmp;
     } /* mextra */
 }
 
-/* SAVE2018 */
-
 static struct monst *
 restmonchn(nhfp, ghostly)
 NHFILE *nhfp;
@@ -571,8 +561,6 @@ boolean ghostly;
     return first;
 }
 
-/* SAVE2018 */
-
 static struct fruit *
 loadfruitchn(nhfp)
 NHFILE *nhfp;
@@ -1134,8 +1122,6 @@ NHFILE *nhfp;
     return 1;
 }
 
-/* SAVE2018 */
-
 void
 restcemetery(nhfp, cemeteryaddr)
 NHFILE *nhfp;
@@ -1164,8 +1150,6 @@ struct cemetery **cemeteryaddr;
     }
 }
 
-/* SAVE2018 */
-
 /*ARGSUSED*/
 static void
 rest_levl(nhfp, rlecomp)
@@ -1362,7 +1346,7 @@ boolean ghostly;
             keepgoing = FALSE;
     }
     dealloc_trap(trap);
-    fobj = restobjchn(nhfp, ghostly, FALSE);    /* SAVE2018 */
+    fobj = restobjchn(nhfp, ghostly, FALSE);
     find_lev_obj();
     /* restobjchn()'s `frozen' argument probably ought to be a callback
        routine so that we can check for objects being buried under ice */
@@ -1466,8 +1450,6 @@ boolean ghostly;
         clear_id_mapping();
 }
 
-/* SAVE2018 */
-
 void
 get_plname_from_file(nhfp, plbuf)
 NHFILE *nhfp;
@@ -1486,8 +1468,6 @@ char *plbuf;
     return;
 }
 
-/* SAVE2018 */
-
 static void
 restore_msghistory(nhfp)
 NHFILE *nhfp;
diff --git a/src/save.c b/src/save.c
index b651ce52f..2b36da546 100644
--- a/src/save.c
+++ b/src/save.c
@@ -24,11 +24,6 @@ static int count_only;
 #define USE_BUFFERING
 #endif
 
-/*SAVE2018*/
-extern void FDECL(nhout, (int, const char *,
-                    const char *, int, genericptr_t, int));
-extern int NDECL(nhdatatypes_size);
-
 #ifdef MICRO
 int dotcnt, dotrow; /* also used in restore */
 #endif
diff --git a/src/worm.c b/src/worm.c
index 53e7e1cf5..0d14c83a0 100644
--- a/src/worm.c
+++ b/src/worm.c
@@ -535,8 +535,6 @@ NHFILE *nhfp;
     }
 }
 
-/* SAVE2018 */
-
 /*
  *  rest_worm()
  *