diff --git a/sbin/Makefile b/sbin/Makefile
index c125075c669..0c648f29bad 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.5 (Berkeley) 3/31/94
 
 .include <src.opts.mk>
 
diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc
index d59f70fe1ef..a9e857c046d 100644
--- a/sbin/Makefile.inc
+++ b/sbin/Makefile.inc
@@ -1,4 +1,3 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/8/93
 
 .include <src.opts.mk>
 
diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8
index 19cd867df56..93244c52ce4 100644
--- a/sbin/bectl/bectl.8
+++ b/sbin/bectl/bectl.8
@@ -13,8 +13,6 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"
-.\"     @(#)be.1
-.\"
 .Dd October 5, 2023
 .Dt BECTL 8
 .Os
diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile
index f1d6461beae..9bfa0fad657 100644
--- a/sbin/bsdlabel/Makefile
+++ b/sbin/bsdlabel/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.2 (Berkeley) 3/17/94
 
 .PATH: ${SRCTOP}/sys/geom
 
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index 9228bba78d4..0e5b35a0588 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -28,8 +28,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\"
 .Dd October 5, 2016
 .Dt BSDLABEL 8
 .Os
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index 766def59ffe..bc0dec3bc39 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -49,10 +49,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 1/7/94";
-/* from static char sccsid[] = "@(#)disklabel.c	1.2 (Symmetric) 11/28/85"; */
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/bsdlabel/pathnames.h b/sbin/bsdlabel/pathnames.h
index f28593e71e5..4d215eb72e3 100644
--- a/sbin/bsdlabel/pathnames.h
+++ b/sbin/bsdlabel/pathnames.h
@@ -27,8 +27,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  */
 
 #include <paths.h>
diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile
index 726adbf8871..ac3eda4cd59 100644
--- a/sbin/clri/Makefile
+++ b/sbin/clri/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PACKAGE=ufs
 PROG=	clri
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index f9a86fe659e..9d1fb92e22b 100644
--- a/sbin/clri/clri.8
+++ b/sbin/clri/clri.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)clri.8	8.2 (Berkeley) 4/19/94
-.\"
 .Dd October 5, 2016
 .Dt CLRI 8
 .Os
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index 7144490869c..8eeafbda70a 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -39,9 +39,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)clri.c	8.2 (Berkeley) 9/23/93";
-#endif /* not lint */
 #endif
 
 #include <sys/cdefs.h>
diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile
index 2ddb6021803..809f1060d18 100644
--- a/sbin/comcontrol/Makefile
+++ b/sbin/comcontrol/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	5.4 (Berkeley) 6/5/91
 
 PACKAGE=runtime
 PROG=	comcontrol
diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile
index 4214988b7c7..d1863f2b448 100644
--- a/sbin/dmesg/Makefile
+++ b/sbin/dmesg/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PACKAGE=runtime
 PROG=	dmesg
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index cbd7d66f9e9..2ef3be8b661 100644
--- a/sbin/dmesg/dmesg.8
+++ b/sbin/dmesg/dmesg.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)dmesg.8	8.1 (Berkeley) 6/5/93
-.\"
 .Dd May 7, 2022
 .Dt DMESG 8
 .Os
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index 9b744aee7d2..4e243d2f51c 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -36,9 +36,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static const char sccsid[] = "@(#)dmesg.c	8.1 (Berkeley) 6/5/93";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/types.h>
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 5cb5b9f27a4..d982e5bc033 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 #	dump.h			header file
 #	itime.c			reads /etc/dumpdates
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index 00cfef444c9..08b3c2e574d 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -26,8 +26,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\"
 .Dd December 28, 2020
 .Dt DUMP 8
 .Os
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index bd133fc4c68..9429704a180 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -27,8 +27,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)dump.h	8.2 (Berkeley) 4/28/95
  */
 
 /*
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index a8b2d9c221d..ef75be6f2a1 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -30,9 +30,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)dumprmt.c	8.3 (Berkeley) 4/28/95";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index d9121e4df05..adeaa044ff4 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -30,9 +30,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index a5b4eaa6f8a..945c38e519a 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -36,9 +36,6 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/1/95";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index d3ca5b2a926..15d34020b24 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -30,9 +30,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)optr.c	8.2 (Berkeley) 1/6/94";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/pathnames.h b/sbin/dump/pathnames.h
index 3ee966a55ff..e309643473a 100644
--- a/sbin/dump/pathnames.h
+++ b/sbin/dump/pathnames.h
@@ -27,8 +27,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  */
 
 #include <paths.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 3a3574f6d44..dd3a7672586 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -30,9 +30,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)tape.c	8.4 (Berkeley) 5/1/95";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 281cffcdf6f..c166b6a1af2 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -30,9 +30,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)traverse.c	8.7 (Berkeley) 6/15/95";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index 5f44c80f935..86ce682642b 100644
--- a/sbin/dump/unctime.c
+++ b/sbin/dump/unctime.c
@@ -30,9 +30,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)unctime.c	8.2 (Berkeley) 6/14/94";
-#endif
 #endif /* not lint */
 
 #include <time.h>
diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile
index d7f768ad4c3..b416eb1cd58 100644
--- a/sbin/dumpfs/Makefile
+++ b/sbin/dumpfs/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PACKAGE=ufs
 PROG=	dumpfs
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index 63da8e59aa4..768329315bc 100644
--- a/sbin/dumpfs/dumpfs.8
+++ b/sbin/dumpfs/dumpfs.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)dumpfs.8	8.1 (Berkeley) 6/5/93
-.\"
 .Dd July 2, 2021
 .Dt DUMPFS 8
 .Os
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 7d2598c190e..9eb1cba2682 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -51,9 +51,6 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)dumpfs.c	8.5 (Berkeley) 4/29/95";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index 59d199a2de1..a57dfef7096 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     From: @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\"
 .Dd April 23, 2020
 .Dt DUMPON 8
 .Os
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 81144e33bc7..20a9246496a 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -36,9 +36,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "From: @(#)swapon.c	8.1 (Berkeley) 6/5/93";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/etherswitchcfg/Makefile b/sbin/etherswitchcfg/Makefile
index 12a5c01e9ed..6312f07b09d 100644
--- a/sbin/etherswitchcfg/Makefile
+++ b/sbin/etherswitchcfg/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	5.4 (Berkeley) 6/5/91
 
 PACKAGE=runtime
 PROG=	etherswitchcfg
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
index 043be5743ab..cc03ac9d08c 100644
--- a/sbin/ffsinfo/Makefile
+++ b/sbin/ffsinfo/Makefile
@@ -1,5 +1,3 @@
-# @(#)Makefile    8.8 (Berkeley) 6/21/2000
-#
 # $TSHeader: src/sbin/ffsinfo/Makefile,v 1.3 2000/12/05 19:45:10 tomsoft Exp $
 #
 
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 3757ed062ba..6bef9a31b8f 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -30,8 +30,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * From: @(#)mount.c	8.19 (Berkeley) 4/19/94
  * From: $NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp 
  * $NetBSD: fsck.c,v 1.30 2003/08/07 10:04:15 agc Exp $
  */
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index de8913c1ecb..59805dbbf3d 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.2 (Berkeley) 4/27/95
 
 PACKAGE=ufs
 PROG=	fsck_ffs
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index 0551ba4521c..597cb199640 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -30,9 +30,6 @@
  */
 
 #if 0
-#ifndef lint
-static const char sccsid[] = "@(#)dir.c	8.8 (Berkeley) 4/28/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 827336a77d6..312142eab9a 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -57,8 +57,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)fsck.h	8.4 (Berkeley) 5/9/95
  */
 
 #ifndef _FSCK_H_
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index 8288216c068..1eb9ebeb3b9 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -26,8 +26,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)fsck.8	8.4 (Berkeley) 5/9/95
-.\"
 .Dd November 17, 2023
 .Dt FSCK_FFS 8
 .Os
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 05f83789236..7e9a2c4661e 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -30,9 +30,6 @@
  */
 
 #if 0
-#ifndef lint
-static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/globs.c b/sbin/fsck_ffs/globs.c
index b004dd7d48b..8c69b8db44e 100644
--- a/sbin/fsck_ffs/globs.c
+++ b/sbin/fsck_ffs/globs.c
@@ -36,9 +36,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index e4349ff9708..8b154d972dd 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -30,9 +30,6 @@
  */
 
 #if 0
-#ifndef lint
-static const char sccsid[] = "@(#)inode.c	8.8 (Berkeley) 4/28/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 4189af1ba51..63446f63a11 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -36,9 +36,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #define _WANT_P_OSREL
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index bed9d547f63..99da2db3bc6 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -30,9 +30,6 @@
  */
 
 #if 0
-#ifndef lint
-static const char sccsid[] = "@(#)pass1.c	8.6 (Berkeley) 4/28/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index c1af6158f92..fe6acd4c27d 100644
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@@ -30,9 +30,6 @@
  */
 
 #if 0
-#ifndef lint
-static const char sccsid[] = "@(#)pass1b.c	8.4 (Berkeley) 4/28/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index 977ee1b1c61..d92bf22c439 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -30,9 +30,6 @@
  */
 
 #if 0
-#ifndef lint
-static const char sccsid[] = "@(#)pass2.c	8.9 (Berkeley) 4/28/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index 9a01bb02ccc..ac0b61437cc 100644
--- a/sbin/fsck_ffs/pass3.c
+++ b/sbin/fsck_ffs/pass3.c
@@ -30,9 +30,6 @@
  */
 
 #if 0
-#ifndef lint
-static const char sccsid[] = "@(#)pass3.c	8.2 (Berkeley) 4/27/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index b4cf59bc97d..bddd7ca9a94 100644
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@@ -30,9 +30,6 @@
  */
 
 #if 0
-#ifndef lint
-static const char sccsid[] = "@(#)pass4.c	8.4 (Berkeley) 4/28/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index 8980ba60e03..efe36ca42cb 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -30,9 +30,6 @@
  */
 
 #if 0
-#ifndef lint
-static const char sccsid[] = "@(#)pass5.c	8.9 (Berkeley) 4/28/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index b3d58749015..71088ee1384 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -30,9 +30,6 @@
  */
 
 #if 0
-#ifndef lint
-static const char sccsid[] = "@(#)setup.c	8.10 (Berkeley) 5/9/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 45bbcc9d661..e5ec06cb101 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -30,9 +30,6 @@
  */
 
 #if 0
-#ifndef lint
-static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 5a71210dc36..28016b4ccdf 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -1,5 +1,4 @@
 #	$NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PACKAGE=ufs
 PROG=	fsdb
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index 3f72e6ac625..6fb1ba51db0 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -1,5 +1,3 @@
-#	@(#)Makefile	8.8 (Berkeley) 6/21/2000
-#
 # $TSHeader: src/sbin/growfs/Makefile,v 1.4 2000/12/05 19:45:24 tomsoft Exp $
 #
 
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index b95d7a6ea17..e5701fbcdbb 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -1,4 +1,3 @@
-#	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
 
 .include <src.opts.mk>
 
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 3b1774606b2..789b98fd744 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\"
 .Dd November 08, 2023
 .Dt IFCONFIG 8
 .Os
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 4e2f8e782de..cd91cf7991b 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -33,9 +33,6 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1983, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
-#if 0
-static char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 79ccaf149ac..96560806529 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 7/19/93
 
 CONFGROUPS=	CONFTTYS
 PACKAGE=runtime
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 88d663a1afe..4f988438cd3 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -28,8 +28,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\"
 .Dd July 22, 2021
 .Dt INIT 8
 .Os
diff --git a/sbin/init/init.c b/sbin/init/init.c
index d5200e4cfe3..a78bfac073d 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -39,9 +39,6 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 7/15/93";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/init/pathnames.h b/sbin/init/pathnames.h
index e385aed648b..c04155a901a 100644
--- a/sbin/init/pathnames.h
+++ b/sbin/init/pathnames.h
@@ -30,8 +30,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  */
 
 #include <paths.h>
diff --git a/sbin/init/ttys b/sbin/init/ttys
index f5cfe4118da..d3ac4546d9b 100644
--- a/sbin/init/ttys
+++ b/sbin/init/ttys
@@ -1,6 +1,3 @@
-#
-#	@(#)ttys	5.1 (Berkeley) 4/17/89
-#
 # This file specifies various information about terminals on the system.
 # It is used by several different programs.  Common entries for the
 # various columns include:
diff --git a/sbin/ipf/common/ipf.h b/sbin/ipf/common/ipf.h
index c672c53cb56..20a0087ed5a 100644
--- a/sbin/ipf/common/ipf.h
+++ b/sbin/ipf/common/ipf.h
@@ -3,8 +3,6 @@
  * Copyright (C) 2012 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
- *
- * @(#)ipf.h	1.12 6/5/96
  * $Id$
  */
 
diff --git a/sbin/ipf/common/ipmon.h b/sbin/ipf/common/ipmon.h
index 8caf20fdf72..4d377027eb3 100644
--- a/sbin/ipf/common/ipmon.h
+++ b/sbin/ipf/common/ipmon.h
@@ -3,8 +3,6 @@
  * Copyright (C) 2012 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
- *
- * @(#)ip_fil.h	1.35 6/5/96
  * $Id$
  */
 
diff --git a/sbin/ipf/ipf/bpf-ipf.h b/sbin/ipf/ipf/bpf-ipf.h
index 1c303215037..7bc299d5725 100644
--- a/sbin/ipf/ipf/bpf-ipf.h
+++ b/sbin/ipf/ipf/bpf-ipf.h
@@ -35,10 +35,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
- *
- * @(#) $Header: /devel/CVS/IP-Filter/bpf-ipf.h,v 2.1 2002/10/26 12:14:26 darrenr Exp $ (LBL)
  */
 
 #ifndef BPF_MAJOR_VERSION
diff --git a/sbin/ipf/ipf/bpf_filter.c b/sbin/ipf/ipf/bpf_filter.c
index ff7c93576d1..b380eb8e20e 100644
--- a/sbin/ipf/ipf/bpf_filter.c
+++ b/sbin/ipf/ipf/bpf_filter.c
@@ -35,8 +35,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)bpf.c	7.5 (Berkeley) 7/15/91
  */
 
 #if !(defined(lint) || defined(KERNEL) || defined(_KERNEL))
diff --git a/sbin/ipf/ipf/ipf.c b/sbin/ipf/ipf/ipf.c
index fb40371fefd..cf14c06ee82 100644
--- a/sbin/ipf/ipf/ipf.c
+++ b/sbin/ipf/ipf/ipf.c
@@ -10,10 +10,6 @@
 #include <sys/ioctl.h>
 #include "netinet/ipl.h"
 
-#if !defined(lint)
-static const char sccsid[] = "@(#)ipf.c	1.23 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 #if !defined(__SVR4) && defined(__GNUC__)
 extern	char	*index(const char *, int);
diff --git a/sbin/ipf/ipf/ipfcomp.c b/sbin/ipf/ipf/ipfcomp.c
index 47094e01ab2..da4f270333c 100644
--- a/sbin/ipf/ipf/ipfcomp.c
+++ b/sbin/ipf/ipf/ipfcomp.c
@@ -4,10 +4,6 @@
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
-#if !defined(lint)
-static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 #include "ipf.h"
 
diff --git a/sbin/ipf/ipfs/ipfs.c b/sbin/ipf/ipfs/ipfs.c
index bb342cbb931..6225c6e1154 100644
--- a/sbin/ipf/ipfs/ipfs.c
+++ b/sbin/ipf/ipfs/ipfs.c
@@ -30,9 +30,6 @@
 #include "ipf.h"
 #include "netinet/ipl.h"
 
-#if !defined(lint)
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 #ifndef	IPF_SAVEDIR
 # define	IPF_SAVEDIR	"/var/db/ipf"
diff --git a/sbin/ipf/ipfstat/ipfstat.c b/sbin/ipf/ipfstat/ipfstat.c
index f9696bfce73..ba9556f5421 100644
--- a/sbin/ipf/ipfstat/ipfstat.c
+++ b/sbin/ipf/ipfstat/ipfstat.c
@@ -37,10 +37,6 @@
 # include <paths.h>
 #endif
 
-#if !defined(lint)
-static const char sccsid[] = "@(#)fils.c	1.21 4/20/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 
 extern	char	*optarg;
diff --git a/sbin/ipf/ipfsync/ipfsyncd.c b/sbin/ipf/ipfsync/ipfsyncd.c
index ead92b70371..e22aa7c1423 100644
--- a/sbin/ipf/ipfsync/ipfsyncd.c
+++ b/sbin/ipf/ipfsync/ipfsyncd.c
@@ -3,10 +3,6 @@
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
-#if !defined(lint)
-static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ipfsyncd.c,v 1.1.2.2 2012/07/22 08:04:24 darren_r Exp $";
-#endif
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sbin/ipf/ipfsync/ipsyncm.c b/sbin/ipf/ipfsync/ipsyncm.c
index a9484a339c8..74dada9f56c 100644
--- a/sbin/ipf/ipfsync/ipsyncm.c
+++ b/sbin/ipf/ipfsync/ipsyncm.c
@@ -4,10 +4,6 @@
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
-#if !defined(lint)
-static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sbin/ipf/ipfsync/ipsyncs.c b/sbin/ipf/ipfsync/ipsyncs.c
index ee9ecfd4f88..4aec6925f07 100644
--- a/sbin/ipf/ipfsync/ipsyncs.c
+++ b/sbin/ipf/ipfsync/ipsyncs.c
@@ -4,10 +4,6 @@
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
-#if !defined(lint)
-static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/sbin/ipf/ipftest/ip_fil.c b/sbin/ipf/ipftest/ip_fil.c
index 74d4ec778d8..6df3bed8224 100644
--- a/sbin/ipf/ipftest/ip_fil.c
+++ b/sbin/ipf/ipftest/ip_fil.c
@@ -6,10 +6,6 @@
  *
  * $Id$
  */
-#if !defined(lint)
-static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 #include "ipf.h"
 #include "md5.h"
diff --git a/sbin/ipf/ipftest/ipftest.c b/sbin/ipf/ipftest/ipftest.c
index d83d4788408..2dfbe20592b 100644
--- a/sbin/ipf/ipftest/ipftest.c
+++ b/sbin/ipf/ipftest/ipftest.c
@@ -9,10 +9,6 @@
 #include <sys/ioctl.h>
 #include <sys/file.h>
 
-#if !defined(lint)
-static const char sccsid[] = "@(#)ipt.c	1.19 6/3/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 extern	char	*optarg;
 extern	struct ipread	pcap, iptext, iphex;
diff --git a/sbin/ipf/ipmon/ipmon.c b/sbin/ipf/ipmon/ipmon.c
index 1f3a81fa20f..d06c7bf71b0 100644
--- a/sbin/ipf/ipmon/ipmon.c
+++ b/sbin/ipf/ipmon/ipmon.c
@@ -13,10 +13,6 @@
 #include <fcntl.h>
 #include <signal.h>
 
-#if !defined(lint)
-static const char sccsid[] = "@(#)ipmon.c	1.21 6/5/96 (C)1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 
 #define	STRERROR(x)	strerror(x)
diff --git a/sbin/ipf/ipnat/ipnat.c b/sbin/ipf/ipnat/ipnat.c
index 07d11fc535e..8eb2e240f6c 100644
--- a/sbin/ipf/ipnat/ipnat.c
+++ b/sbin/ipf/ipnat/ipnat.c
@@ -49,10 +49,6 @@
 
 # define	STRERROR(x)	strerror(x)
 
-#if !defined(lint)
-static const char sccsid[] ="@(#)ipnat.c	1.9 6/5/96 (C) 1993 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 
 #if	SOLARIS
diff --git a/sbin/ipf/ipsend/arp.c b/sbin/ipf/ipsend/arp.c
index 1aed79aa500..a9409093213 100644
--- a/sbin/ipf/ipsend/arp.c
+++ b/sbin/ipf/ipsend/arp.c
@@ -4,10 +4,6 @@
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
-#if !defined(lint)
-static const char sccsid[] = "@(#)arp.c	1.4 1/11/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 # include <sys/sockio.h>
diff --git a/sbin/ipf/ipsend/ipsend.c b/sbin/ipf/ipsend/ipsend.c
index 22218b07c40..83440d7cb09 100644
--- a/sbin/ipf/ipsend/ipsend.c
+++ b/sbin/ipf/ipsend/ipsend.c
@@ -3,10 +3,6 @@
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
-#if !defined(lint)
-static const char sccsid[] = "@(#)ipsend.c	1.5 12/10/95 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sbin/ipf/ipsend/ipsopt.c b/sbin/ipf/ipsend/ipsopt.c
index 6efbea16bc2..ffad9c00846 100644
--- a/sbin/ipf/ipsend/ipsopt.c
+++ b/sbin/ipf/ipsend/ipsopt.c
@@ -5,10 +5,6 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  */
-#if !defined(lint)
-static const char sccsid[] = "@(#)ipsopt.c	1.2 1/11/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sbin/ipf/ipsend/resend.c b/sbin/ipf/ipsend/resend.c
index 484709e89c5..1512f8293c8 100644
--- a/sbin/ipf/ipsend/resend.c
+++ b/sbin/ipf/ipsend/resend.c
@@ -5,10 +5,6 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  */
-#if !defined(lint)
-static const char sccsid[] = "@(#)resend.c	1.3 1/11/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sbin/ipf/ipsend/sbpf.c b/sbin/ipf/ipsend/sbpf.c
index d2efc4a19f6..6d5d60292ce 100644
--- a/sbin/ipf/ipsend/sbpf.c
+++ b/sbin/ipf/ipsend/sbpf.c
@@ -39,10 +39,6 @@
 
 #include "ipsend.h"
 
-#if !defined(lint)
-static const char sccsid[] = "@(#)sbpf.c	1.3 8/25/95 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 /*
  * the code herein is dervied from libpcap.
diff --git a/sbin/ipf/ipsend/sdlpi.c b/sbin/ipf/ipsend/sdlpi.c
index a8ccd2d41df..d4195c45662 100644
--- a/sbin/ipf/ipsend/sdlpi.c
+++ b/sbin/ipf/ipsend/sdlpi.c
@@ -38,10 +38,6 @@
 
 #include "ipsend.h"
 
-#if !defined(lint)
-static const char sccsid[] = "@(#)sdlpi.c	1.3 10/30/95 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 #define	CHUNKSIZE	8192
 #define BUFSPACE	(4*CHUNKSIZE)
diff --git a/sbin/ipf/ipsend/snit.c b/sbin/ipf/ipsend/snit.c
index e7fb51b7254..6dc9df06714 100644
--- a/sbin/ipf/ipsend/snit.c
+++ b/sbin/ipf/ipsend/snit.c
@@ -38,10 +38,6 @@
 
 #include "ipsend.h"
 
-#if !defined(lint)
-static const char sccsid[] = "@(#)snit.c	1.5 1/11/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 #define	CHUNKSIZE	8192
 #define BUFSPACE	(4*CHUNKSIZE)
diff --git a/sbin/ipf/ipsend/sock.c b/sbin/ipf/ipsend/sock.c
index 6159864364b..b42f56f848d 100644
--- a/sbin/ipf/ipsend/sock.c
+++ b/sbin/ipf/ipsend/sock.c
@@ -4,10 +4,6 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  */
-#if !defined(lint)
-static const char sccsid[] = "@(#)sock.c	1.2 1/11/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/sbin/ipf/ipsend/sockraw.c b/sbin/ipf/ipsend/sockraw.c
index 56fcb717453..ab65f63753c 100644
--- a/sbin/ipf/ipsend/sockraw.c
+++ b/sbin/ipf/ipsend/sockraw.c
@@ -28,9 +28,6 @@
 #include <errno.h>
 #include "ipsend.h"
 
-#if !defined(lint) && defined(LIBC_SCCS)
-static	char	sirix[] = "@(#)sirix.c	1.0 10/9/97 (C)1997 Marc Boucher";
-#endif
 
 
 int
diff --git a/sbin/ipf/libipf/facpri.c b/sbin/ipf/libipf/facpri.c
index eac41abcfea..9f66cedc7df 100644
--- a/sbin/ipf/libipf/facpri.c
+++ b/sbin/ipf/libipf/facpri.c
@@ -20,9 +20,6 @@
 #include <syslog.h>
 #include "facpri.h"
 
-#if !defined(lint)
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 
 typedef	struct	table	{
diff --git a/sbin/ipf/libipf/getnattype.c b/sbin/ipf/libipf/getnattype.c
index 60ab7793a32..30bae7ce021 100644
--- a/sbin/ipf/libipf/getnattype.c
+++ b/sbin/ipf/libipf/getnattype.c
@@ -9,9 +9,6 @@
 #include "ipf.h"
 #include "kmem.h"
 
-#if !defined(lint)
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 
 /*
diff --git a/sbin/ipf/libipf/inet_addr.c b/sbin/ipf/libipf/inet_addr.c
index 11e468eb09f..d64b3da4136 100644
--- a/sbin/ipf/libipf/inet_addr.c
+++ b/sbin/ipf/libipf/inet_addr.c
@@ -54,10 +54,6 @@
  * --Copyright--
  */
 
-#if !defined(lint)
-static const char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static const char rcsid[] = "@(#)$Id: inet_addr.c,v 1.8.2.3 2004/12/09 19:41:20 darrenr Exp $";
-#endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #include <netinet/in.h>
diff --git a/sbin/ipf/libipf/ipft_hx.c b/sbin/ipf/libipf/ipft_hx.c
index d6ae80ec4ef..98c0d1eb011 100644
--- a/sbin/ipf/libipf/ipft_hx.c
+++ b/sbin/ipf/libipf/ipft_hx.c
@@ -4,10 +4,6 @@
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
-#if !defined(lint)
-static const char sccsid[] = "@(#)ipft_hx.c	1.1 3/9/96 (C) 1996 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 #include <ctype.h>
 
diff --git a/sbin/ipf/libipf/ipft_pc.c b/sbin/ipf/libipf/ipft_pc.c
index 0f4a9f6a598..ff4acd5d175 100644
--- a/sbin/ipf/libipf/ipft_pc.c
+++ b/sbin/ipf/libipf/ipft_pc.c
@@ -9,9 +9,6 @@
 #include "ipf.h"
 #include "ipt.h"
 
-#if !defined(lint)
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 struct	llc	{
 	int	lc_type;
diff --git a/sbin/ipf/libipf/ipft_tx.c b/sbin/ipf/libipf/ipft_tx.c
index bab33016b9c..e54a7e15f98 100644
--- a/sbin/ipf/libipf/ipft_tx.c
+++ b/sbin/ipf/libipf/ipft_tx.c
@@ -6,10 +6,6 @@
  *
  * $Id$
  */
-#if !defined(lint)
-static const char sccsid[] = "@(#)ipft_tx.c	1.7 6/5/96 (C) 1993 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 #include <ctype.h>
 
diff --git a/sbin/ipf/libipf/kmem.c b/sbin/ipf/libipf/kmem.c
index 0f15159b034..6ebd0dee6b7 100644
--- a/sbin/ipf/libipf/kmem.c
+++ b/sbin/ipf/libipf/kmem.c
@@ -29,10 +29,6 @@
 
 #include "kmem.h"
 
-#if !defined(lint)
-static const char sccsid[] = "@(#)kmem.c	1.4 1/12/96 (C) 1992 Darren Reed";
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 
 
diff --git a/sbin/ipf/libipf/nat_setgroupmap.c b/sbin/ipf/libipf/nat_setgroupmap.c
index fd3a2c120e1..97a5211688c 100644
--- a/sbin/ipf/libipf/nat_setgroupmap.c
+++ b/sbin/ipf/libipf/nat_setgroupmap.c
@@ -4,9 +4,6 @@
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
-#if !defined(lint)
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 #include "ipf.h"
 
diff --git a/sbin/ipf/libipf/printactiveaddr.c b/sbin/ipf/libipf/printactiveaddr.c
index 66b5b00aaf9..70deafa345e 100644
--- a/sbin/ipf/libipf/printactiveaddr.c
+++ b/sbin/ipf/libipf/printactiveaddr.c
@@ -9,9 +9,6 @@
 #include "ipf.h"
 
 
-#if !defined(lint)
-static const char rcsid[] = "@(#)$Id: printactiveaddr.c,v 1.3.2.2 2012/07/22 08:04:24 darren_r Exp $";
-#endif
 
 
 void
diff --git a/sbin/ipf/libipf/printactivenat.c b/sbin/ipf/libipf/printactivenat.c
index 0a4c254c952..ba792d3b2be 100644
--- a/sbin/ipf/libipf/printactivenat.c
+++ b/sbin/ipf/libipf/printactivenat.c
@@ -10,9 +10,6 @@
 #include "ipf.h"
 
 
-#if !defined(lint)
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 static int proto_opened = 0;
 
diff --git a/sbin/ipf/libipf/printaps.c b/sbin/ipf/libipf/printaps.c
index ee0c516ae2e..df27c48b72c 100644
--- a/sbin/ipf/libipf/printaps.c
+++ b/sbin/ipf/libipf/printaps.c
@@ -11,9 +11,6 @@
 #include "kmem.h"
 
 
-#if !defined(lint)
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 
 void
diff --git a/sbin/ipf/libipf/printnat.c b/sbin/ipf/libipf/printnat.c
index e4c096429b5..0b032955c8d 100644
--- a/sbin/ipf/libipf/printnat.c
+++ b/sbin/ipf/libipf/printnat.c
@@ -11,9 +11,6 @@
 #include "kmem.h"
 
 
-#if !defined(lint)
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 
 /*
diff --git a/sbin/ipf/libipf/printnataddr.c b/sbin/ipf/libipf/printnataddr.c
index ee00b5b14d6..e6003f0b076 100644
--- a/sbin/ipf/libipf/printnataddr.c
+++ b/sbin/ipf/libipf/printnataddr.c
@@ -10,9 +10,6 @@
 #include "kmem.h"
 
 
-#if !defined(lint)
-static const char rcsid[] = "@(#)$Id: printnataddr.c,v 1.4.2.2 2012/07/22 08:04:24 darren_r Exp $";
-#endif
 
 
 void
diff --git a/sbin/ipf/libipf/printproto.c b/sbin/ipf/libipf/printproto.c
index 7bc4952b3b7..3d4c881ff6d 100644
--- a/sbin/ipf/libipf/printproto.c
+++ b/sbin/ipf/libipf/printproto.c
@@ -7,9 +7,6 @@
 #include "ipf.h"
 
 
-#if !defined(lint)
-static const char rcsid[] = "@(#)$Id$";
-#endif
 
 
 void
diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile
index 359c4b96f9f..c9bf1679645 100644
--- a/sbin/md5/Makefile
+++ b/sbin/md5/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/9/93
 
 PACKAGE=runtime
 PROG=	md5
diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 757e38cc484..938d6ddf12b 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -31,8 +31,6 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.\"
-.\"     @(#)vnconfig.8	8.1 (Berkeley) 6/5/93
 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29
 .\"
 .Dd August 27, 2021
diff --git a/sbin/mknod/Makefile b/sbin/mknod/Makefile
index 3a3be17f9cf..ce2c8d0cd97 100644
--- a/sbin/mknod/Makefile
+++ b/sbin/mknod/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PACKAGE=runtime
 PROG=	mknod
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 7bac489f4a2..99337bd3476 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\"
 .Dd October 3, 2016
 .Dt MKNOD 8
 .Os
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 091c05cbfac..aeee4c12508 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -39,9 +39,6 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)mknod.c	8.1 (Berkeley) 6/5/93";
-#endif
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index 98ac87c2d74..ad5a27f7d76 100644
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.6 (Berkeley) 5/8/95
 
 PACKAGE=runtime
 PROG=	mount
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index 31987f7b0b7..331584d885c 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -30,9 +30,6 @@
  */
 
 #if 0
-#ifndef lint
-static char sccsid[] = "@(#)getmntopts.c	8.3 (Berkeley) 3/29/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/mount/mntopts.3 b/sbin/mount/mntopts.3
index 782acabef1a..fe2073c3dc7 100644
--- a/sbin/mount/mntopts.3
+++ b/sbin/mount/mntopts.3
@@ -22,8 +22,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)getmntopts.3	8.3 (Berkeley) 3/30/95
-.\"
 .Dd January 19, 2023
 .Dt MNTOPTS 3
 .Os
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 21d4965ea39..dc1452097ed 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -27,8 +27,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)mntopts.h	8.7 (Berkeley) 3/29/95
  */
 
 struct mntopt {
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 91e697bdc3b..fbca8aef999 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\"
 .Dd October 4, 2023
 .Dt MOUNT 8
 .Os
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 2fcc94e4081..0b22056118a 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -33,9 +33,6 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1989, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
-#if 0
-static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
-#endif
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount/mount_fs.c b/sbin/mount/mount_fs.c
index 7aac2b0ce10..b7000c46e57 100644
--- a/sbin/mount/mount_fs.c
+++ b/sbin/mount/mount_fs.c
@@ -39,9 +39,6 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)mount_fs.c	8.6 (Berkeley) 4/26/95";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/pathnames.h b/sbin/mount/pathnames.h
index f584d7ce9f1..169d5384cc7 100644
--- a/sbin/mount/pathnames.h
+++ b/sbin/mount/pathnames.h
@@ -27,8 +27,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)pathnames.h	8.2 (Berkeley) 3/27/94
  */
 
 #define	_PATH_MOUNTDPID	"/var/run/mountd.pid"
diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c
index 3785451e65b..6648866234b 100644
--- a/sbin/mount/vfslist.c
+++ b/sbin/mount/vfslist.c
@@ -30,9 +30,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)vfslist.c	8.1 (Berkeley) 5/8/95";
-#endif
 #endif /* not lint */
 #include <sys/cdefs.h>
 #include <err.h>
diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index 30c2b39afd9..ae9cde8080a 100644
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.3 (Berkeley) 3/27/94
 
 PACKAGE=runtime
 PROG=	mount_cd9660
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index a31e6d83324..cd6f7a19f6e 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -29,8 +29,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)mount_cd9660.8	8.3 (Berkeley) 3/27/94
-.\"
 .Dd August 11, 2018
 .Dt MOUNT_CD9660 8
 .Os
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index f867e94da41..0699c680211 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -32,8 +32,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *      @(#)mount_cd9660.c	8.7 (Berkeley) 5/1/95
  */
 
 #ifndef lint
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 567dff2fc15..2af94bff3a9 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@@ -1,5 +1,3 @@
-#	@(#)Makefile	8.2 (Berkeley) 3/27/94
-#
 
 PACKAGE=nfs
 PROG=	mount_nfs
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index d7b1ffdb754..3ef622a96dc 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
-.\"
 .Dd October 8, 2023
 .Dt MOUNT_NFS 8
 .Os
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index f2f22e0a0cc..0c01c41b429 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -39,9 +39,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)mount_nfs.c	8.11 (Berkeley) 5/4/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index 3063cb6030f..591ee9a9e24 100644
--- a/sbin/mount_nullfs/Makefile
+++ b/sbin/mount_nullfs/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.3 (Berkeley) 3/27/94
 
 PACKAGE=runtime
 PROG=	mount_nullfs
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index e3648a2fb2f..940cb1650a3 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -30,8 +30,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)mount_null.8	8.6 (Berkeley) 5/1/95
-.\"
 .Dd June 11, 2023
 .Dt MOUNT_NULLFS 8
 .Os
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index c6bf09a1ca1..dbaa295d5df 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -39,9 +39,6 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)mount_null.c	8.6 (Berkeley) 4/26/95";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index 6cd7eeace1e..a548429b03c 100644
--- a/sbin/mount_unionfs/Makefile
+++ b/sbin/mount_unionfs/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.3 (Berkeley) 3/27/94
 
 PACKAGE=runtime
 PROG=	mount_unionfs
diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8
index 879198f51a8..5469fef4ad3 100644
--- a/sbin/mount_unionfs/mount_unionfs.8
+++ b/sbin/mount_unionfs/mount_unionfs.8
@@ -28,8 +28,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)mount_union.8	8.6 (Berkeley) 3/27/94
-.\"
 .Dd October 3, 2016
 .Dt MOUNT_UNIONFS 8
 .Os
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index 01c32f26792..ff5650efb02 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -42,9 +42,6 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)mount_union.c	8.5 (Berkeley) 3/27/94";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile
index 50834666fba..b8070d90257 100644
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.2 (Berkeley) 3/27/94
 
 .PATH: ${SRCTOP}/sys/geom
 
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index b0d178de984..6b5263aef3f 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -39,9 +39,6 @@
  */
 
 #if 0
-#ifndef lint
-static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #define _WANT_P_OSREL
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index e1496af814c..05d2413a44e 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\"
 .Dd October 21, 2022
 .Dt NEWFS 8
 .Os
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index afb71f9f25b..820874b5570 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -45,9 +45,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)newfs.c	8.13 (Berkeley) 5/1/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 /*
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
index 78e3e77da60..c75b1075c4e 100644
--- a/sbin/nfsiod/Makefile
+++ b/sbin/nfsiod/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	nfsiod
 MAN=	nfsiod.8
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index cb9ab471ddd..7abe5a832bb 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     From: @(#)nfsiod.8	8.2 (Berkeley) 2/22/94
-.\"
 .Dd December 26, 2009
 .Dt NFSIOD 8
 .Os
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index 45a0ec0a974..330f5efce78 100644
--- a/sbin/nfsiod/nfsiod.c
+++ b/sbin/nfsiod/nfsiod.c
@@ -39,9 +39,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
-#ifndef lint
-static char sccsid[] = "@(#)nfsiod.c	8.4 (Berkeley) 5/3/95";
-#endif
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 1483a93ace3..a710629cb24 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 .include <src.opts.mk>
 
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index 34ffc98c3a4..0eaec196e1e 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\"
 .Dd September 15, 2023
 .Dt PING 8
 .Os
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 3b8663772e8..5c97496aa1f 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -39,9 +39,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 /*
diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c
index 10deb57ad6b..50254c3eeeb 100644
--- a/sbin/ping/ping6.c
+++ b/sbin/ping/ping6.c
@@ -72,9 +72,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
-#endif /* not lint */
 #endif
 
 #include <sys/cdefs.h>
diff --git a/sbin/ping/utils.c b/sbin/ping/utils.c
index 920102a6896..1488fdfeb06 100644
--- a/sbin/ping/utils.c
+++ b/sbin/ping/utils.c
@@ -39,9 +39,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <string.h>
diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile
index 644e46e3a77..d737e4f0472 100644
--- a/sbin/quotacheck/Makefile
+++ b/sbin/quotacheck/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PACKAGE=quotacheck
 PROG=	quotacheck
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 2675245aa34..cd1b60e5106 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -28,8 +28,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)quotacheck.8	8.1 (Berkeley) 6/5/93
-.\"
 .Dd January 25, 2007
 .Dt QUOTACHECK 8
 .Os
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 3f608c103b1..952c101a603 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -39,9 +39,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)quotacheck.c	8.3 (Berkeley) 1/29/94";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 /*
diff --git a/sbin/rcorder/hash.h b/sbin/rcorder/hash.h
index 6ccf76d002a..d1f096a3c01 100644
--- a/sbin/rcorder/hash.h
+++ b/sbin/rcorder/hash.h
@@ -38,8 +38,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	from: @(#)hash.h	8.1 (Berkeley) 6/6/93
  */
 
 /* hash.h --
diff --git a/sbin/rcorder/sprite.h b/sbin/rcorder/sprite.h
index 29b25b0ba26..8ca07f7aa6d 100644
--- a/sbin/rcorder/sprite.h
+++ b/sbin/rcorder/sprite.h
@@ -38,8 +38,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	from: @(#)sprite.h	8.1 (Berkeley) 6/6/93
  */
 
 /*
diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile
index 7f7fe4a7741..4db6d5589e9 100644
--- a/sbin/reboot/Makefile
+++ b/sbin/reboot/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PACKAGE=runtime
 PROG=	reboot
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index da8fc2e430a..5e97a759468 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -32,8 +32,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
-.\"
 .Dd July 11, 2020
 .Dt BOOT 8 i386
 .Os
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index 13119ecf64f..e9a23ef84d6 100644
--- a/sbin/reboot/reboot.8
+++ b/sbin/reboot/reboot.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)reboot.8	8.1 (Berkeley) 6/9/93
-.\"
 .Dd December 20, 2017
 .Dt REBOOT 8
 .Os
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index dce747d79b1..5cfbacef184 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -36,9 +36,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)reboot.c	8.1 (Berkeley) 6/5/93";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/types.h>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index f23258a00cd..915ad0d1ad6 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 .PATH: ${.CURDIR:H}/dump
 
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index db9e05a0bc5..aa57809c5b4 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -35,9 +35,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)dirs.c	8.7 (Berkeley) 5/1/95";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index fac58891a35..0b2f85d878c 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -27,8 +27,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)extern.h	8.2 (Berkeley) 1/7/94
  */
 
 struct entry	*addentry(char *, ino_t, int);
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 336ab61221d..fd8a063bdac 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -30,9 +30,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)interactive.c	8.5 (Berkeley) 5/1/95";
-#endif
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 6eba6954b6e..64862ecf17c 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -36,9 +36,6 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/4/95";
-#endif
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 1499b8d737d..b7b96a1a0d2 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\"
 .Dd October 12, 2006
 .Dt RESTORE 8
 .Os
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 33e97c18c41..bfe0f5f49fd 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -30,9 +30,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)restore.c	8.3 (Berkeley) 9/13/94";
-#endif
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index e4db29340b8..e54555f39dd 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -32,8 +32,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)restore.h	8.3 (Berkeley) 9/13/94
  */
 
 /*
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 0172a2c593d..6b3a136f88b 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -30,9 +30,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)symtab.c	8.3 (Berkeley) 4/28/95";
-#endif
 #endif /* not lint */
 
 /*
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index c3fe0d7d8b0..dde20333a43 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -35,9 +35,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
-#endif
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index d95330f6de4..50d080d24da 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -30,9 +30,6 @@
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)utilities.c	8.5 (Berkeley) 4/28/95";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index 7685a2fecd6..b0a0670e462 100644
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 .include <src.opts.mk>
 
diff --git a/sbin/route/keywords b/sbin/route/keywords
index 496fb8b95e2..cbd8799ffb6 100644
--- a/sbin/route/keywords
+++ b/sbin/route/keywords
@@ -1,4 +1,3 @@
-#	@(#)keywords	8.2 (Berkeley) 3/19/94
 
 4
 6
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 4eccd511f0c..08d5aae36b2 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)route.8	8.3 (Berkeley) 3/19/94
-.\"
 .Dd June 16, 2023
 .Dt ROUTE 8
 .Os
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 3913bdc9e6a..60379e11d09 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -36,9 +36,6 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)route.c	8.6 (Berkeley) 4/28/95";
-#endif
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index 903d716e3ab..81f3131f267 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -27,8 +27,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)defs.h	8.1 (Berkeley) 6/5/93
  */
 
 
@@ -86,9 +84,6 @@
 #define RIPVERSION RIPv2
 #include <protocols/routed.h>
 
-#ifndef __RCSID
-#define __RCSID(_s) static const char rcsid[] UNUSED = _s
-#endif
 #ifndef __COPYRIGHT
 #define __COPYRIGHT(_s) static const char copyright[] UNUSED = _s
 #endif
diff --git a/sbin/routed/pathnames.h b/sbin/routed/pathnames.h
index 75dc1736430..f5b8bd31b4d 100644
--- a/sbin/routed/pathnames.h
+++ b/sbin/routed/pathnames.h
@@ -27,8 +27,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  */
 
 #include <paths.h>
diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c
index c4a0e5de2c2..ad5b1df1f57 100644
--- a/sbin/routed/radix.c
+++ b/sbin/routed/radix.c
@@ -27,8 +27,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)radix.c	8.4 (Berkeley) 11/2/94
  */
 
 /*
diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h
index dfe502f280b..35f7dcf7e08 100644
--- a/sbin/routed/radix.h
+++ b/sbin/routed/radix.h
@@ -27,8 +27,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)radix.h	8.2 (Berkeley) 10/31/94
  */
 
 #ifndef __RADIX_H_
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 08d39041cdf..8cf12d7b60e 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -27,8 +27,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)routed.8	8.2 (Berkeley) 12/11/93
-.\"
 .Dd June 27, 2022
 .Dt ROUTED 8
 .Os
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index 24c01a8ac30..a6896b8e736 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -50,9 +50,6 @@
 #endif
 
 #define UNUSED __attribute__((unused))
-#ifndef __RCSID
-#define __RCSID(_s) static const char rcsid[] UNUSED = _s
-#endif
 #ifndef __COPYRIGHT
 #define __COPYRIGHT(_s) static const char copyright[] UNUSED = _s
 #endif
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 8a3b80d7346..53d2360719d 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     From: @(#)savecore.8	8.1 (Berkeley) 6/5/93
-.\"
 .Dd April 4, 2022
 .Dt SAVECORE 8
 .Os
diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile
index 32c9d697993..3271570b352 100644
--- a/sbin/shutdown/Makefile
+++ b/sbin/shutdown/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PACKAGE=runtime
 PROG=	shutdown
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index 7f60f22cc0e..70df537b8bf 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)shutdown.8	8.2 (Berkeley) 4/27/95
-.\"
 .Dd November 7, 2022
 .Dt SHUTDOWN 8
 .Os
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 3864e44025e..9e01d54ae21 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -36,9 +36,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)shutdown.c	8.4 (Berkeley) 4/28/95";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile
index 4cca18367c1..27808aed585 100644
--- a/sbin/swapon/Makefile
+++ b/sbin/swapon/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PACKAGE=runtime
 PROG=	swapon
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index 64ad9edca77..f5534c06eb9 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\"
 .Dd November 29, 2021
 .Dt SWAPON 8
 .Os
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index b9b865c0fc0..039356541b7 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -36,9 +36,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)swapon.c	8.1 (Berkeley) 6/5/93";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #include <sys/param.h>
diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index e5455568223..e1e590307c6 100644
--- a/sbin/sysctl/Makefile
+++ b/sbin/sysctl/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 .include <src.opts.mk>
 
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index ed768510eb6..837282e80a9 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\"
 .Dd August 18, 2023
 .Dt SYSCTL 8
 .Os
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index e78c3fe671c..2a1f7888531 100644
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PACKAGE=ufs
 PROG=	tunefs
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index 19059e33583..97de1abf33c 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
-.\"
 .Dd November 17, 2023
 .Dt TUNEFS 8
 .Os
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 9b38e23effd..803ef1c7aab 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -36,9 +36,6 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)tunefs.c	8.2 (Berkeley) 4/19/94";
-#endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 /*
diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile
index 5d8cb0670cc..7b440db82af 100644
--- a/sbin/umount/Makefile
+++ b/sbin/umount/Makefile
@@ -1,5 +1,3 @@
-#	@(#)Makefile	8.4 (Berkeley) 6/22/95
-#
 
 PACKAGE=runtime
 PROG=	umount
diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8
index b5a7d723026..180572017f6 100644
--- a/sbin/umount/umount.8
+++ b/sbin/umount/umount.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)umount.8	8.2 (Berkeley) 5/8/95
-.\"
 .Dd June 19, 2020
 .Dt UMOUNT 8
 .Os
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index aca7c201bc9..097f558e7f1 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -36,9 +36,6 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)umount.c	8.8 (Berkeley) 5/8/95";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/zfsbootcfg/Makefile b/sbin/zfsbootcfg/Makefile
index e5e20fc5213..3d5589dcee4 100644
--- a/sbin/zfsbootcfg/Makefile
+++ b/sbin/zfsbootcfg/Makefile
@@ -1,4 +1,3 @@
-#	@(#)Makefile	8.4 (Berkeley) 6/22/95
 
 PROG=	zfsbootcfg
 MAN=	zfsbootcfg.8