diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc
index 3cc4a7fba..208122f72 100755
--- a/sys/src/9/boot/bootrc
+++ b/sys/src/9/boot/bootrc
@@ -90,9 +90,6 @@ fn main{
 		}
 		if not
 			x=($x -u)
-		if(~ $autolog true || ~ $autolog yes || ~ $autolog 1)
-			if(! ~ $service cpu)
-				x=($x -T)
 		if(! ~ $#debugfactotum 0)
 			x=($x -p)
 		must $x
@@ -106,9 +103,6 @@ fn main{
 	if(~ $#$x 0) x=auth
 	if(! ~ $#$x 0 && test -x /bin/auth/secstore && test -f /mnt/factotum/ctl){
 		x=(auth/secstore -G factotum -s^$$x)
-		if(~ $autolog true || ~ $autolog yes || ~ $autolog 1)
-			if(! ~ $service cpu)
-				x=($x -n)
 		if(~ $service cpu)
 			$x -n >/mnt/factotum/ctl
 		if(~ $status *readnvram* || ! ~ $service cpu)
@@ -123,7 +117,7 @@ fn main{
 		if(~ $#bootdisk 1 && ~ $#cfs 0)
 			cfs=$bootdisk/cache
 		if(~ $#cfs 1 && ! ~ $cfs off && test -f $cfs){
-			x=(/bin/cfs -S -s -f $cfs)
+			x=(/bin/cfs -s -f $cfs)
 			if(~ -f $ff)
 				x=($x -r)
 			{$x </srv/boot &} | echo 0 >/srv/cfs
diff --git a/sys/src/cmd/auth/factotum/fs.c b/sys/src/cmd/auth/factotum/fs.c
index 1bde3cfbc..7d195ac01 100644
--- a/sys/src/cmd/auth/factotum/fs.c
+++ b/sys/src/cmd/auth/factotum/fs.c
@@ -64,18 +64,12 @@ main(int argc, char **argv)
 	Dir d;
 	Proto *p;
 
-	askforkeys = 1;
 	trysecstore = 1;
 
 	ARGBEGIN{
 	case 'D':
 		chatty9p++;
 		break;
-	case 'T':
-		askforkeys = 1;
-		trysecstore = 1;
-		sflag = 1;
-		break;
 	case 'S':		/* server: read nvram, no prompting for keys */
 		askforkeys = 0;
 		trysecstore = 0;
@@ -185,10 +179,7 @@ main(int argc, char **argv)
 			if((fd = open(smprint("%s/factotum/ctl", mtpt), OWRITE)) < 0)
 				sysfatal("can't open factotum: %r");
 			dup(fd, 1);
-			if(sflag)
-				execl("/bin/auth/secstore", "secstore", "-n", "-G", "factotum", nil);
-			else
-				execl("/bin/auth/secstore", "secstore", "-G", "factotum", nil);
+			execl("/bin/auth/secstore", "secstore", "-G", "factotum", nil);
 			exits(nil);
 		}
 		waitpid();