diff --git a/database.cc b/database.cc
index 7a3019e1..c470cc34 100644
--- a/database.cc
+++ b/database.cc
@@ -41,25 +41,9 @@ typedef struct {
     const char *prefix;
 } prefix_t;
 
-prefix_t NORMAL_PREFIX[] = {
-    { "subject", "S" },
-    { "body", "B" },
-    { "from_name", "FN" },
-    { "to_name", "TN" },
-    { "name", "N" },
-    { "attachment", "A" }
-};
-
 prefix_t BOOLEAN_PREFIX[] = {
     { "type", "K" },
-    { "from_email", "FE" },
-    { "to_email", "TE" },
-    { "email", "E" },
-    { "date", "D" },
-    { "label", "L" },
     { "tag", "L" },
-    { "source_id", "I" },
-    { "attachment_extension", "O" },
     { "msgid", "Q" },
     { "thread", "H" },
     { "ref", "R" },
@@ -71,10 +55,6 @@ _find_prefix (const char *name)
 {
     unsigned int i;
 
-    for (i = 0; i < ARRAY_SIZE (NORMAL_PREFIX); i++)
-	if (strcmp (name, NORMAL_PREFIX[i].name) == 0)
-	    return NORMAL_PREFIX[i].prefix;
-
     for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX); i++)
 	if (strcmp (name, BOOLEAN_PREFIX[i].name) == 0)
 	    return BOOLEAN_PREFIX[i].prefix;