Index: src/checkin.c
==================================================================
--- src/checkin.c
+++ src/checkin.c
@@ -683,11 +683,11 @@
 **    -v|--verbose     Show all files as they are removed.
 **
 ** See also: addremove, extras, status
 */
 void clean_cmd(void){
-  int allFileFlag, allDirFlag, dryRunFlag, verboseFlag;
+  int allFileFlag, dryRunFlag, verboseFlag;
   int emptyDirsFlag, dirsOnlyFlag;
   unsigned scanFlags = 0;
   int verilyFlag = 0;
   const char *zIgnoreFlag, *zKeepFlag, *zCleanFlag;
   Glob *pIgnore, *pKeep, *pClean;
@@ -698,11 +698,11 @@
     dryRunFlag = find_option("test",0,0)!=0; /* deprecated */
   }
   if( !dryRunFlag ){
     dryRunFlag = find_option("whatif",0,0)!=0;
   }
-  allFileFlag = allDirFlag = find_option("force","f",0)!=0;
+  allFileFlag = find_option("force","f",0)!=0;
   dirsOnlyFlag = find_option("dirsonly",0,0)!=0;
   emptyDirsFlag = find_option("emptydirs","d",0)!=0 || dirsOnlyFlag;
   if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL;
   if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
   if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED;
@@ -710,11 +710,11 @@
   verboseFlag = find_option("verbose","v",0)!=0;
   zKeepFlag = find_option("keep",0,1);
   zCleanFlag = find_option("clean",0,1);
   db_must_be_within_tree();
   if( find_option("verily","x",0)!=0 ){
-    verilyFlag = allFileFlag = allDirFlag = 1;
+    verilyFlag = allFileFlag = 1;
     emptyDirsFlag = 1;
     scanFlags |= SCAN_ALL;
     zCleanFlag = 0;
   }
   if( zIgnoreFlag==0 && !verilyFlag ){
@@ -802,25 +802,10 @@
           fossil_print("KEPT directory \"%s\" not removed (due to --keep"
                        " or \"keep-glob\")\n", zName+nRoot);
         }
         continue;
       }
-      if( !allDirFlag && !dryRunFlag && !glob_match(pClean, zName+nRoot) ){
-        Blob ans;
-        char cReply;
-        char *prompt = mprintf("Remove empty directory \"%s\" (a=all/y/N)? ",
-                               zName+nRoot);
-        prompt_user(prompt, &ans);
-        cReply = blob_str(&ans)[0];
-        if( cReply=='a' || cReply=='A' ){
-          allDirFlag = 1;
-        }else if( cReply!='y' && cReply!='Y' ){
-          blob_reset(&ans);
-          continue;
-        }
-        blob_reset(&ans);
-      }
       if( dryRunFlag || file_rmdir(zName)==0 ){
         if( verboseFlag || dryRunFlag ){
           fossil_print("Removed unmanaged directory: %s\n", zName+nRoot);
         }
       }else if( verboseFlag ){