diff --git a/completion/bash-completion b/completion/bash-completion
index af9acf00..6018c19d 100644
--- a/completion/bash-completion
+++ b/completion/bash-completion
@@ -146,7 +146,7 @@ __complete_install() {
 __complete_update() {
 	opts="-c -v -q -b -i -I -e -w"
 	lopts="--create-metadata --verbose --quiet --buildreport
- --interactive --icons --editor --wiki --pretty --clean --delete-unknown
+ --icons --wiki --pretty --clean --delete-unknown
  --nosign --rename-apks --use-date-from-apk"
 	case "${prev}" in
 		-e|--editor)
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 968ee050..15b055e0 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1851,13 +1851,8 @@ def main():
                         help=_("Delete APKs and/or OBBs without metadata from the repo"))
     parser.add_argument("-b", "--buildreport", action="store_true", default=False,
                         help=_("Report on build data status"))
-    parser.add_argument("-i", "--interactive", default=False, action="store_true",
-                        help=_("Interactively ask about things that need updating."))
     parser.add_argument("-I", "--icons", action="store_true", default=False,
                         help=_("Resize all the icons exceeding the max pixel size and exit"))
-    parser.add_argument("-e", "--editor", default="/etc/alternatives/editor",
-                        help=_("Specify editor to use in interactive mode. Default is {path}")
-                        .format(path='/etc/alternatives/editor'))
     parser.add_argument("-w", "--wiki", default=False, action="store_true",
                         help=_("Update the wiki"))
     parser.add_argument("--pretty", action="store_true", default=False,
diff --git a/locale/fdroidserver.pot b/locale/fdroidserver.pot
index 5c5323c3..f09b9b61 100644
--- a/locale/fdroidserver.pot
+++ b/locale/fdroidserver.pot
@@ -784,10 +784,6 @@ msgstr ""
 msgid "Interact with the repo HTTP server"
 msgstr ""
 
-#: ../fdroidserver/update.py
-msgid "Interactively ask about things that need updating."
-msgstr ""
-
 #: ../fdroidserver/update.py
 msgid "Invalid APK"
 msgstr ""
@@ -1325,19 +1321,6 @@ msgstr ""
 msgid "Specify an identity file to provide to SSH for rsyncing"
 msgstr ""
 
-#: ../fdroidserver/update.py
-msgid "Specify editor to use in interactive mode. Default "
-msgstr ""
-
-#, c-format
-msgid "Specify editor to use in interactive mode. Default %s"
-msgstr ""
-
-#: ../fdroidserver/update.py
-#, python-brace-format
-msgid "Specify editor to use in interactive mode. Default is {path}"
-msgstr ""
-
 #: ../fdroidserver/build.py
 msgid "Specify that we're running on the build server"
 msgstr ""