diff --git a/env.cpp b/env.cpp
index 398425c22..ddb5d2c4e 100644
--- a/env.cpp
+++ b/env.cpp
@@ -137,7 +137,6 @@ struct env_node_t
 
 class variable_entry_t
 {
-    bool exportv; /**< Whether the variable should be exported */
     wcstring value; /**< Value of the variable */
 };
 
diff --git a/fish.cpp b/fish.cpp
index abefa8985..8001f3764 100644
--- a/fish.cpp
+++ b/fish.cpp
@@ -382,36 +382,6 @@ static int fish_parse_opt(int argc, char **argv, std::vector<std::string> *out_c
     return my_optind;
 }
 
-/**
-   Calls a bunch of init functions, parses the init files and then
-   parses commands from stdin or files, depending on arguments
-*/
-
-static wcstring full_escape(const wchar_t *in)
-{
-    wcstring out;
-    for (; *in; in++)
-    {
-        if (*in < 32)
-        {
-            append_format(out, L"\\x%.2x", *in);
-        }
-        else if (*in < 128)
-        {
-            out.push_back(*in);
-        }
-        else if (*in < 65536)
-        {
-            append_format(out, L"\\u%.4x", *in);
-        }
-        else
-        {
-            append_format(out, L"\\U%.8x", *in);
-        }
-    }
-    return out;
-}
-
 extern int g_fork_count;
 int main(int argc, char **argv)
 {