diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c
index bf50f4b1a276..5e7d3661bbcd 100644
--- a/bin/rmail/rmail.c
+++ b/bin/rmail/rmail.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rmail.c,v 1.10 1997/03/28 15:24:35 imp Exp $
+ *	$Id: rmail.c,v 1.11 1997/06/06 06:46:27 charnier Exp $
  */
 
 #ifndef lint
@@ -80,9 +80,6 @@ static char const sccsid[] = "@(#)rmail.c	8.1 (Berkeley) 5/31/93";
 #include <sysexits.h>
 #include <unistd.h>
 
-#ifdef 0
-void err __P((int, const char *, ...));
-#endif
 void usage __P((void));
 
 int
@@ -352,33 +349,3 @@ usage()
 	exit(EX_USAGE);
 }
 
-#ifdef 0
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-void
-#ifdef __STDC__
-err(int eval, const char *fmt, ...)
-#else
-err(eval, fmt, va_alist)
-	int eval;
-	const char *fmt;
-	va_dcl
-#endif
-{
-	va_list ap;
-#if __STDC__
-	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
-	(void)fprintf(stderr, "rmail: ");
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	(void)fprintf(stderr, "\n");
-	exit(eval);
-}
-#endif
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index f70b6d124459..1bee83dbe6be 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: quotacheck.c,v 1.7 1997/06/16 06:38:14 charnier Exp $
  */
 
 #ifndef lint
@@ -615,34 +615,3 @@ bread(bno, buf, cnt)
 	    read(fi, buf, cnt) != cnt)
 		errx(1, "block %ld", bno);
 }
-
-#ifdef 0
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-void
-#if __STDC__
-err(const char *fmt, ...)
-#else
-err(fmt, va_alist)
-	char *fmt;
-        va_dcl
-#endif
-{
-	va_list ap;
-#if __STDC__
-	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
-	(void)fprintf(stderr, "quotacheck: ");
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	(void)fprintf(stderr, "\n");
-	exit(1);
-	/* NOTREACHED */
-}
-#endif
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index 9ed2642638ea..6fb6a012d3c6 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: reboot.c,v 1.5 1997/06/16 06:43:13 charnier Exp $
  */
 
 #ifndef lint
@@ -181,34 +181,3 @@ usage()
 	(void)fprintf(stderr, "usage: %s [-nq]\n", dohalt ? "halt" : "reboot");
 	exit(1);
 }
-
-#ifdef 0
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-void
-#if __STDC__
-err(const char *fmt, ...)
-#else
-err(fmt, va_alist)
-	char *fmt;
-        va_dcl
-#endif
-{
-	va_list ap;
-#if __STDC__
-	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
-	(void)fprintf(stderr, "%s: ", dohalt ? "halt" : "reboot");
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	(void)fprintf(stderr, "\n");
-	exit(1);
-	/* NOTREACHED */
-}
-#endif
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 977d2ec7df36..1a50405e5a53 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: colrm.c,v 1.3 1997/06/26 11:26:20 charnier Exp $
  */
 
 #ifndef lint
@@ -139,33 +139,3 @@ usage()
 	exit(1);
 }
 
-#ifdef 0
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-void
-#if __STDC__
-err(const char *fmt, ...)
-#else
-err(fmt, va_alist)
-	char *fmt;
-        va_dcl
-#endif
-{
-	va_list ap;
-#if __STDC__
-	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
-	(void)fprintf(stderr, "colrm: ");
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	(void)fprintf(stderr, "\n");
-	exit(1);
-	/* NOTREACHED */
-}
-#endif