diff --git a/src/command/cmd_funcs.h b/src/command/cmd_funcs.h
index d5311bba..03c92522 100644
--- a/src/command/cmd_funcs.h
+++ b/src/command/cmd_funcs.h
@@ -128,7 +128,6 @@ gboolean cmd_status_get(ProfWin* window, const char* const command, gchar** args
 gboolean cmd_status_set(ProfWin* window, const char* const command, gchar** args);
 gboolean cmd_sub(ProfWin* window, const char* const command, gchar** args);
 gboolean cmd_theme(ProfWin* window, const char* const command, gchar** args);
-gboolean cmd_tiny(ProfWin* window, const char* const command, gchar** args);
 gboolean cmd_wintitle(ProfWin* window, const char* const command, gchar** args);
 gboolean cmd_vercheck(ProfWin* window, const char* const command, gchar** args);
 gboolean cmd_who(ProfWin* window, const char* const command, gchar** args);
diff --git a/src/omemo/omemo.h b/src/omemo/omemo.h
index 8c17f48d..7e7c1f14 100644
--- a/src/omemo/omemo.h
+++ b/src/omemo/omemo.h
@@ -41,7 +41,7 @@
 #define OMEMO_ERR_UNSUPPORTED_CRYPTO -10000
 #define OMEMO_ERR_GCRYPT             -20000
 
-#define OMEMO_AESGCM_NONCE_LENGTH 12
+#define OMEMO_AESGCM_NONCE_LENGTH AES128_GCM_IV_LENGTH
 #define OMEMO_AESGCM_KEY_LENGTH   32
 #define OMEMO_AESGCM_URL_SCHEME   "aesgcm"
 
diff --git a/src/tools/aesgcm_upload.c b/src/tools/aesgcm_upload.c
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/tools/aesgcm_upload.h b/src/tools/aesgcm_upload.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/tools/http_download.c b/src/tools/http_download.c
index 397ff4b8..f97fd704 100644
--- a/src/tools/http_download.c
+++ b/src/tools/http_download.c
@@ -193,7 +193,7 @@ http_file_get(void* userdata)
                                                  download->url,
                                                  download->filename);
 
-        // TODO(wstrm): Log the error.
+        // TODO: Log the error.
         if (!call_external(argv, NULL, NULL)) {
             http_print_transfer_update(download->window, download->url,
                                        "Downloading '%s' failed: Unable to call "
@@ -201,7 +201,7 @@ http_file_get(void* userdata)
                                        download->url,
                                        download->cmd_template,
                                        download->filename,
-                                       "TODO(wstrm): Log the error");
+                                       "TODO: Log the error");
         }
 
         g_strfreev(argv);