diff --git a/bin/miaou-bash b/bin/miaou-bash
index ef2b99a..d5634ff 100755
--- a/bin/miaou-bash
+++ b/bin/miaou-bash
@@ -266,17 +266,10 @@ function on_error {
 }
 
 function self_upgrade {
-  # sudo -E miaou-bash "$MIAOU_BASH_DIR"/lib/self-upgrade.bash
   . "$MIAOU_BASH_DIR"/lib/self-upgrade.bash
 }
 
-function initiate {
-  # sudo -E miaou-bash "$MIAOU_BASH_DIR"/lib/initiate.bash
-  . "$MIAOU_BASH_DIR"/lib/initiate.bash
-}
-
 function uninstall {
-  # sudo -E miaou-bash "$MIAOU_BASH_DIR"/lib/uninstall.bash
   . "$MIAOU_BASH_DIR"/lib/uninstall.bash
 }
 
@@ -636,19 +629,8 @@ function parse_options {
     case "$1" in
     --help) usage && builtin exit ;;
     --version) cat "${MIAOU_BASH_DIR:-/opt/miaou-bash}/.semver_git_tag" && builtin exit ;;
-    --self-upgrade)
-      self_upgrade
-      builtin exit
-      ;;
-    --initiate)
-      #TODO: remove, self_upgrade does it anyway
-      initiate
-      builtin exit
-      ;;
-    --uninstall)
-      uninstall
-      builtin exit
-      ;;
+    --self-upgrade) self_upgrade && builtin exit ;;
+    --uninstall) uninstall && builtin exit ;;
     -*) >&2 echo "ERROR: option '$1' unknown!" && usage && builtin exit 2 ;;
     esac
   fi
diff --git a/lib/self-upgrade.bash b/lib/self-upgrade.bash
index ebae6db..f8dc08c 100644
--- a/lib/self-upgrade.bash
+++ b/lib/self-upgrade.bash
@@ -19,9 +19,9 @@ function self_upgrade {
 }
 
 #TODO: to remove
-function repair_miaou_bash_dir {
+function safe_mode {
   if [[ ! -v MIAOU_BASH_DIR ]]; then
-    >&2 echo 'WARNING: MIAOU_BASH_DIR undefined : repair-mode enabled'
+    >&2 echo 'WARNING: MIAOU_BASH_DIR undefined : safe-mode enabled'
     MIAOU_BASH_DIR=/opt/miaou-bash
     export MIAOU_BASH_DIR
   fi
@@ -29,7 +29,7 @@ function repair_miaou_bash_dir {
 
 # MAIN
 
-repair_miaou_bash_dir
+safe_mode
 source "$MIAOU_BASH_DIR"/lib/functions.bash
 assert_system_mode
 assert_root
@@ -37,7 +37,7 @@ assert_root
 current=$(miaou-bash --version)
 latest=$("$MIAOU_BASH_DIR/tools/wget_semver" artcode miaou/miaou-bash)
 if [[ "$current" == "$latest" ]]; then
-  . "$MIAOU_BASH_DIR"/bin/miaou-bash --initiate
+  . "$MIAOU_BASH_DIR"/lib/initiate.bash
   echo "up-to-date version: $current"
 else
   self_upgrade