3 files changed, 9 insertions, 42 deletions

diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 1843fd2e..04ff915f 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -80,8 +80,6 @@ typedef struct
     const CajaFileSortType sort_type;
     const char *metadata_text;
     const char *action;
-    const char *menu_label;
-    const char *menu_hint;
 } SortCriterion;
 
 typedef enum
@@ -125,65 +123,47 @@ static const SortCriterion sort_criteria[] =
     {
         CAJA_FILE_SORT_BY_DISPLAY_NAME,
         "name",
-        "Sort by Name",
-        N_("by _Name"),
-        N_("Keep icons sorted by name in rows")
+        "Sort by Name"
     },
     {
         CAJA_FILE_SORT_BY_SIZE,
         "size",
-        "Sort by Size",
-        N_("by _Size"),
-        N_("Keep icons sorted by size in rows")
+        "Sort by Size"
     },
     {
         CAJA_FILE_SORT_BY_SIZE_ON_DISK,
         "size_on_disk",
-        "Sort by Size on Disk",
-        N_("by S_ize on Disk"),
-        N_("Keep icons sorted by disk usage in rows")
+        "Sort by Size on Disk"
     },
     {
         CAJA_FILE_SORT_BY_TYPE,
         "type",
-        "Sort by Type",
-        N_("by _Type"),
-        N_("Keep icons sorted by type in rows")
+        "Sort by Type"
     },
     {
         CAJA_FILE_SORT_BY_MTIME,
         "modification date",
-        "Sort by Modification Date",
-        N_("by Modification _Date"),
-        N_("Keep icons sorted by modification date in rows")
+        "Sort by Modification Date"
     },
     {
         CAJA_FILE_SORT_BY_BTIME,
         "creation date",
-        "Sort by Creation Date",
-        N_("by _Creation Date"),
-        N_("Keep icons sorted by creation date in rows")
+        "Sort by Creation Date"
     },
     {
         CAJA_FILE_SORT_BY_EMBLEMS,
         "emblems",
-        "Sort by Emblems",
-        N_("by _Emblems"),
-        N_("Keep icons sorted by emblems in rows")
+        "Sort by Emblems"
     },
     {
         CAJA_FILE_SORT_BY_TRASHED_TIME,
         "trashed",
-        "Sort by Trash Time",
-        N_("by T_rash Time"),
-        N_("Keep icons sorted by trash time in rows")
+        "Sort by Trash Time"
     },
     {
         CAJA_FILE_SORT_BY_EXTENSION,
         "extension",
-        "Sort by Extension",
-        N_("by E_xtension"),
-        N_("Keep icons sorted by reversed extension segments in rows")
+        "Sort by Extension"
     }
 };
 
diff --git a/src/file-manager/fm-tree-model.c b/src/file-manager/fm-tree-model.c
index 3beb5f27..fba39e1c 100644
--- a/src/file-manager/fm-tree-model.c
+++ b/src/file-manager/fm-tree-model.c
@@ -119,12 +119,6 @@ struct FMTreeModelRoot
     TreeNode *root_node;
 };
 
-typedef struct
-{
-    CajaDirectory *directory;
-    FMTreeModel *model;
-} DoneLoadingParameters;
-
 static void fm_tree_model_tree_model_init (GtkTreeModelIface *iface);
 static void schedule_monitoring_update     (FMTreeModel *model);
 static void destroy_node_without_reporting (FMTreeModel *model,
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index 2e7cfbb5..a01f91e8 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -101,7 +101,6 @@ struct FMTreeViewDetails
     GtkWidget *popup_cut;
     GtkWidget *popup_copy;
     GtkWidget *popup_paste;
-    GtkWidget *popup_rename;
     GtkWidget *popup_trash;
     GtkWidget *popup_delete;
     GtkWidget *popup_properties;
@@ -114,12 +113,6 @@ struct FMTreeViewDetails
     guint selection_changed_timer;
 };
 
-typedef struct
-{
-    GList *uris;
-    FMTreeView *view;
-} PrependURIParameters;
-
 static GdkAtom copied_files_atom;
 
 static void  fm_tree_view_iface_init        (CajaSidebarIface         *iface);