diff --git a/fs/CipherFileIO.h b/fs/CipherFileIO.h
index f3f3bfa..bbeaf1f 100644
--- a/fs/CipherFileIO.h
+++ b/fs/CipherFileIO.h
@@ -80,7 +80,6 @@ class CipherFileIO : public BlockFileIO {
   int headerLen;
 
   bool perFileIV;
-  bool externalIVChaining;
   uint64_t externalIV;
   uint64_t fileIV;
   int lastFlags;
diff --git a/util/encfsctl.cpp b/util/encfsctl.cpp
index 92f6ff3..d2fef02 100644
--- a/util/encfsctl.cpp
+++ b/util/encfsctl.cpp
@@ -74,15 +74,13 @@ struct CommandOpts {
   const char *argStr;
   const char *usageStr;
 } commands[] = {
-      {"info",                                                 1,            1,
-       showInfo,                                               "(root dir)",
+      {"info", 1, 1, showInfo, "(root dir)",
        // xgroup(usage)
-       gettext_noop("  -- show information (Default command)")},
-      {"showKey",                    1, 1, cmd_showKey, "(root dir)",
+       gettext_noop("  -- show information")},
+      {"showKey", 1, 1, cmd_showKey, "(root dir)",
        // xgroup(usage)
        gettext_noop("  -- show key")},
-      {"passwd",                                       1,            1,
-       chpasswd,                                       "(root dir)",
+      {"passwd", 1, 1, chpasswd, "(root dir)",
        // xgroup(usage)
        gettext_noop("  -- change password for volume")},
       {"autopasswd", 1, 1, chpasswdAutomaticly, "(root dir)",
@@ -91,56 +89,34 @@ struct CommandOpts {
            "  -- change password for volume, taking password"
            " from standard input.\n\tNo prompts are issued.")},
       {"ls", 1, 2, cmd_ls, 0, 0},
-      {"showcruft",
-       1,
-       1,
-       cmd_showcruft,
-       "(root dir)",
+      {"showcruft", 1, 1, cmd_showcruft, "(root dir)",
        // xgroup(usage)
        gettext_noop("  -- show undecodable filenames in the volume")},
-      {"cat",
-       2,
-       2,
-       cmd_cat,
-       "(root dir) path",
+      {"cat", 2, 2, cmd_cat, "(root dir) path",
        // xgroup(usage)
        gettext_noop("  -- decodes the file and cats it to standard out")},
-      {"decode",
-       1,
-       100,
-       cmd_decode,
+      {"decode", 1, 100, cmd_decode,
        "[--extpass=prog] (root dir) [encoded-name ...]",
        // xgroup(usage)
        gettext_noop("  -- decodes name and prints plaintext version")},
-      {"encode",                                                1,
-       100,                                                     cmd_encode,
+      {"encode", 1, 100, cmd_encode,
        "[--extpass=prog] (root dir) [plaintext-name ...]",
        // xgroup(usage)
        gettext_noop("  -- encodes a filename and print result")},
-      {"export",
-       2,
-       2,
-       cmd_export,
-       "(root dir) path",
+      {"export", 2, 2, cmd_export, "(root dir) path",
        // xgroup(usage)
        gettext_noop("  -- decrypts a volume and writes results to path")},
-      {"ciphers",                                  0, 0, showCiphers, "",
+      {"ciphers", 0, 0, showCiphers, "",
        // xgroup(usage)
        gettext_noop("  -- show available ciphers")},
-      {"version",                                         0, 0, showVersion, "",
+      {"version", 0, 0, showVersion, "",
        // xgroup(usage)
        gettext_noop("  -- print version number and exit")},
       {0, 0, 0, 0, 0, 0}};
 
 static void usage(const char *name) {
   cerr << autosprintf(_("encfsctl version %s"), VERSION) << "\n"
-       << _("Usage:\n")
-      // displays usage commands, eg "./encfs (root dir) ..."
-      // xgroup(usage)
-       << autosprintf(
-              _("%s (root dir)\n"
-                "  -- displays information about the filesystem, or \n"),
-              name);
+       << _("Usage:\n");
 
   int offset = 0;
   while (commands[offset].name != 0) {