diff --git a/sys/lib/dist/mail/lib/validatesender b/sys/lib/dist/mail/lib/validatesender
deleted file mode 100755
index 3768e63d3..000000000
--- a/sys/lib/dist/mail/lib/validatesender
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/rc
-
-rfork en
-fn usage{
-	echo 'usage: validatesender [-n /net] plan9.bell-labs.com glenda' >[1=2]
-	exit usage
-}
-
-echo $sysname $pid '$' validatesender $* >>/sys/log/smtpd.mx
-
-netroot=/net
-if(~ $1 -n){
-	shift
-	netroot=$1
-	shift
-}
-if(! ~ $#* 2)
-	usage
-
-dom=$1
-addr=$2
-
-# Cause some problems
-if(~ $dom swtch.com && ~ $addr glenda && ! ~ $sysname olive)
-	exit 'deferred: always defer this one'
-
-# Sites that we have to special case
-# Lucent only - use external network when mail from external domains
-# is delivered to us internally.  Assume that local domains are fine.
-#netroot=/net
-#if(~ $dom *.lucent.com lucent.com *.bell-labs.com bell-labs.com)
-#	exit ''
-#if(! ~ $sysname ethel)
-#	exit ''
-#if(~ $sysname ethel){
-#	if(! test -d /net.alt/tcp)
-#		import outside /net.alt
-#	if(test -d /net.alt/tcp)
-#		netroot=/net.alt
-#}
-
-if(x=`{upas/smtp -p $netroot/tcp!$dom /dev/null $addr >[2=1] | 
-		tee >{sed 's/^/'$sysname' '$pid' /' >> /sys/log/smtpd.mx} |
-		tail -1})
-	exit ''
-
-smtpstatus=$status
-if(~ $#x 0)
-	x=$smtpstatus
-if(~ $smtpstatus *'Permanent Failure'*)
-	exit 'rejected: smtp ping: '^$"x
-exit 'deferred: smtp ping: '^$"x
diff --git a/sys/src/cmd/upas/misc/empty.c b/sys/src/cmd/upas/misc/empty.c
deleted file mode 100644
index e69de29bb..000000000
diff --git a/sys/src/cmd/upas/misc/gone.msg b/sys/src/cmd/upas/misc/gone.msg
deleted file mode 100644
index 9eb1e5a6b..000000000
--- a/sys/src/cmd/upas/misc/gone.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a recorded message.  I am currently out of contact with my
-computer system.  Your message to me has been saved and will be
-read upon my return.  This is the last time you will receive this
-message during my absence.  Thank you.
diff --git a/sys/src/cmd/upas/misc/mail.rc b/sys/src/cmd/upas/misc/mail.rc
deleted file mode 100755
index fdf3a0f77..000000000
--- a/sys/src/cmd/upas/misc/mail.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/rc
-switch($#*){
-case 0
-	exec upas/nedmail
-}
-
-switch($1){
-case -f* -r* -c* -m*
-	exec upas/nedmail $*
-case *
-	exec upas/marshal -8 $*
-}
diff --git a/sys/src/cmd/upas/misc/mkfile b/sys/src/cmd/upas/misc/mkfile
deleted file mode 100644
index c3593840b..000000000
--- a/sys/src/cmd/upas/misc/mkfile
+++ /dev/null
@@ -1,38 +0,0 @@
-
-RCFILES=mail.rc\
-
-all:Q:
-	;
-
-installall:Q:	install
-	;
-
-install:V:
-	cp mail.rc /rc/bin/mail
-
-safeinstall:V:
-	cp mail.rc /rc/bin/mail
-
-safeinstallall:V:
-	cp mail.rc /rc/bin/mail
-
-clean:Q:
-	;
-nuke:V:
-	rm /rc/bin/mail
-
-UPDATE=\
-	gone.fishing\
-	gone.msg\
-	mail.rc\
-	mail.sh\
-	makefile\
-	mkfile\
-	namefiles\
-	omail.rc\
-	qmail\
-	remotemail\
-	rewrite\
-
-update:V:
-	update $UPDATEFLAGS $UPDATE
diff --git a/sys/src/cmd/upas/misc/namefiles b/sys/src/cmd/upas/misc/namefiles
deleted file mode 100644
index ab3853b1c..000000000
--- a/sys/src/cmd/upas/misc/namefiles
+++ /dev/null
@@ -1,2 +0,0 @@
-names.local
-names.global
diff --git a/sys/src/cmd/upas/misc/omail.rc b/sys/src/cmd/upas/misc/omail.rc
deleted file mode 100755
index ed64f38c4..000000000
--- a/sys/src/cmd/upas/misc/omail.rc
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/rc
-switch($#*){
-case 0
-	exec upas/edmail -m
-}
-
-switch($1){
-case -F* -m* -f* -r* -p* -e* -c* -D*
-	exec upas/edmail -m $*
-case '-#'* -a*
-	exec upas/sendmail $*
-case *
-	exec upas/sendmail $*
-}
diff --git a/sys/src/cmd/upas/misc/qmail b/sys/src/cmd/upas/misc/qmail
deleted file mode 100755
index 77a3d228a..000000000
--- a/sys/src/cmd/upas/misc/qmail
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/rc
-sender=$1
-shift
-addr=$1
-shift
-qer /mail/queue mail $sender $addr $* && runq /mail/queue /mail/lib/remotemail
diff --git a/sys/src/cmd/upas/misc/remotemail b/sys/src/cmd/upas/misc/remotemail
deleted file mode 100755
index 312ee5874..000000000
--- a/sys/src/cmd/upas/misc/remotemail
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/rc
-shift
-sender=$1
-shift
-addr=$1
-shift
-/bin/upas/smtp -g research.research.bell-labs.com $addr $sender $*
diff --git a/sys/src/cmd/upas/misc/rewrite b/sys/src/cmd/upas/misc/rewrite
deleted file mode 100644
index fd724eb1e..000000000
--- a/sys/src/cmd/upas/misc/rewrite
+++ /dev/null
@@ -1,20 +0,0 @@
-# case conversion for postmaster
-pOsTmAsTeR	alias		postmaster
-
-# local mail
-[^!@]+		translate	"/bin/upas/aliasmail '&'"
-local!(.*)	>>		/mail/box/\1/mbox
-\l!(.*)		alias		\1
-(helix|helix.bell-labs.com)!(.*)	alias		\2
-
-# we can be just as complicated as BSD sendmail...
-# convert source domain address to a chain a@b@c@d...
-@([^@!,]*):([^!@]*)@([^!]*)	alias	\2@\3@\1
-@([^@!]*),([^!@,]*):([^!@]*)@([^!]*)	alias	@\1:\3@\4@\2
-
-# convert a chain a@b@c@d... to ...d!c!b!a
-([^@]+)@([^@]+)@(.+)	alias	\2!\1@\3
-([^@]+)@([^@]+)		alias	\2!\1
-
-# /mail/lib/remotemail will take care of gating to systems we don't know
-([^!]*)!(.*) 		| 		"/mail/lib/qmail '\s' 'net!\1'" "'\2'"
diff --git a/sys/src/cmd/upas/mkfile b/sys/src/cmd/upas/mkfile
index 0092b5b76..4b64ae896 100644
--- a/sys/src/cmd/upas/mkfile
+++ b/sys/src/cmd/upas/mkfile
@@ -10,7 +10,6 @@ PROGS=\
 	fs\
 	imap4d\
 	marshal\
-	misc\
 	ml\
 	ned\
 	pop3\
@@ -88,30 +87,3 @@ update:V:
 		echo '>>>>>>>>>>' `{pwd} '<<<<<<<<<<<'
 		mk $MKFLAGS 'UPDATEFLAGS='$"UPDATEFLAGS update
 	}
-
-#
-# setup the mail directories.  this should be done by the administrator since
-# he/she will own everything.  the following files must be altered to reflect
-# local preference.
-#
-# /mail/lib/namefiles	- remove alias files you don't use, insert ones you do.
-# /mail/lib/remotemail	- change '-g research.research.bell-labs.com' to your own mail
-#			  gateway.  if you have none, remove it.
-#			- change '-h plan9.bell-labs.com' to a name you would like
-#			  this host to be known as.  if you don't care, take it
-#			  out and it will use the name in /env/site.
-# /mail/lib/rewrite	- change the line that contains 'helix' to include names,
-#			  other than the contents of /env/site, that your system
-#			  answers to.  this is a hack and will be fixed.
-#
-setup:V:
-	mkdir /mail
-	chmod 775 /mail
-	mkdir /mail/lib
-	chmod 775 /mail/lib
-	mkdir	  /mail/queue /mail/box /mail/tmp
-	chmod 777 /mail/queue /mail/box /mail/tmp
-	chmod +t  /mail/queue /mail/tmp
-	mkdir /mail/ml
-	chmod 775 /mail/ml
-	cp misc/rewrite misc/qmail misc/remotemail misc/namefiles /mail/lib