diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion
index 664b7b9c79..d0a17d29b3 100644
--- a/etc/config.sh/bash_completion
+++ b/etc/config.sh/bash_completion
@@ -659,31 +659,6 @@ _deformedGeom_ ()
 }
 complete -o filenames -o nospace -F _deformedGeom_ deformedGeom
 
-_denseParticleFoam_ ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local prev="${COMP_WORDS[COMP_CWORD-1]}"
-    local line=${COMP_LINE}
-    local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
-
-    opts="-case -doc -fileHandler -help -hostRoots -libs -noFunctionObjects -parallel -roots -solver -srcDoc"
-    for o in $used ; do opts="${opts/$o/}" ; done
-    extra=""
-
-    [ "$COMP_CWORD" = 1 ] || \
-    case "$prev" in
-        -case)
-            opts="" ; extra="-d" ;;
-        -fileHandler)
-            opts="uncollated collated masterUncollated" ; extra="" ;;
-        -hostRoots|-libs|-roots|-solver)
-            opts="" ; extra="" ;;
-       *) ;;
-    esac
-    COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) )
-}
-complete -o filenames -o nospace -F _denseParticleFoam_ denseParticleFoam
-
 _dnsFoam_ ()
 {
     local cur="${COMP_WORDS[COMP_CWORD]}"
@@ -709,31 +684,6 @@ _dnsFoam_ ()
 }
 complete -o filenames -o nospace -F _dnsFoam_ dnsFoam
 
-_driftFluxFoam_ ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local prev="${COMP_WORDS[COMP_CWORD-1]}"
-    local line=${COMP_LINE}
-    local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
-
-    opts="-case -doc -fileHandler -help -hostRoots -libs -noFunctionObjects -parallel -roots -solver -srcDoc"
-    for o in $used ; do opts="${opts/$o/}" ; done
-    extra=""
-
-    [ "$COMP_CWORD" = 1 ] || \
-    case "$prev" in
-        -case)
-            opts="" ; extra="-d" ;;
-        -fileHandler)
-            opts="uncollated collated masterUncollated" ; extra="" ;;
-        -hostRoots|-libs|-roots|-solver)
-            opts="" ; extra="" ;;
-       *) ;;
-    esac
-    COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) )
-}
-complete -o filenames -o nospace -F _driftFluxFoam_ driftFluxFoam
-
 _dsmcFoam_ ()
 {
     local cur="${COMP_WORDS[COMP_CWORD]}"
@@ -1369,7 +1319,7 @@ _foamToC_ ()
     local line=${COMP_LINE}
     local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
 
-    opts="-all -allLibs -doc -functionObjects -fvConstraints -fvModels -help -libs -scalarBCs -search -solver -srcDoc -switches -table -tables -vectorBCs"
+    opts="-all -allLibs -doc -functionObjects -fvConstraints -fvModels -help -libs -listAllLibs -scalarBCs -search -solver -srcDoc -switches -table -tables -vectorBCs"
     for o in $used ; do opts="${opts/$o/}" ; done
     extra=""
 
@@ -3973,31 +3923,6 @@ _tetgenToFoam_ ()
 }
 complete -o filenames -o nospace -F _tetgenToFoam_ tetgenToFoam
 
-_thermoFoam_ ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local prev="${COMP_WORDS[COMP_CWORD-1]}"
-    local line=${COMP_LINE}
-    local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
-
-    opts="-case -doc -fileHandler -help -hostRoots -libs -noFunctionObjects -parallel -postProcess -roots -srcDoc"
-    for o in $used ; do opts="${opts/$o/}" ; done
-    extra=""
-
-    [ "$COMP_CWORD" = 1 ] || \
-    case "$prev" in
-        -case)
-            opts="" ; extra="-d" ;;
-        -fileHandler)
-            opts="uncollated collated masterUncollated" ; extra="" ;;
-        -hostRoots|-libs|-roots)
-            opts="" ; extra="" ;;
-       *) ;;
-    esac
-    COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) )
-}
-complete -o filenames -o nospace -F _thermoFoam_ thermoFoam
-
 _topoSet_ ()
 {
     local cur="${COMP_WORDS[COMP_CWORD]}"