diff --git a/config/definitions b/config/definitions
index 8b585ba1..e99ac03a 100644
--- a/config/definitions
+++ b/config/definitions
@@ -85,7 +85,6 @@
 
 #define __NAME 100
 
-#define __FONT 203
 #define __ORIENTATION 200
 #define __JUSTIFICATION 201
 #define __DRAWING_EFFECT 204
diff --git a/src/conf.h b/src/conf.h
index 43b49e64..21de39bc 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2009 Kim Woelders
+ * Copyright (C) 2004-2010 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -48,8 +48,6 @@
 
 #define TEXT_ORIENTATION 200
 #define TEXT_JUSTIFICATION 201
-#define TEXT_MODE 202
-#define TEXT_FONTNAME 203
 #define TEXT_EFFECT 204
 #define TEXT_FG_COL 205
 #define TEXT_BG_COL 206
diff --git a/src/tclass.c b/src/tclass.c
index 143ccf9a..ff98ed65 100644
--- a/src/tclass.c
+++ b/src/tclass.c
@@ -58,14 +58,10 @@ TextstateCreate(const char *font)
    if (!ts)
       return NULL;
 
-   ts->style.mode = MODE_WRAP_CHAR;
    ts->style.orientation = FONT_TO_RIGHT;
 
    if (font)
-     {
-	ts->fontname = TextstateFontLookup(font);
-	ts->style.mode = MODE_VERBATIM;
-     }
+      ts->fontname = TextstateFontLookup(font);
 
    return ts;
 }
@@ -332,9 +328,6 @@ TextclassConfigLoad(FILE * fs)
 	  case TEXT_ORIENTATION:
 	     ts->style.orientation = atoi(s2);
 	     continue;
-	  case TEXT_MODE:
-	     ts->style.mode = atoi(s2);
-	     continue;
 	  case TEXT_EFFECT:
 	     ts->style.effect = atoi(s2);
 	     continue;
diff --git a/src/tclass.h b/src/tclass.h
index 053384d8..20df9f8d 100644
--- a/src/tclass.h
+++ b/src/tclass.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2009 Kim Woelders
+ * Copyright (C) 2004-2010 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -28,16 +28,11 @@
 #include "etypes.h"
 #include "xwin.h"
 
-#define MODE_VERBATIM     0
-#define MODE_WRAP_CHAR    1
-#define MODE_WRAP_WORD    2
-
 #define FONT_TO_RIGHT     0
 #define FONT_TO_DOWN      1
 #define FONT_TO_UP        2
 #define FONT_TO_LEFT      3
 
-#define FONT_TYPE_UNKNOWN       0
 #define FONT_TYPE_XFONT         0	/* XFontStruct     */
 #define FONT_TYPE_XFS           2	/* XFontSet        */
 #define FONT_TYPE_IFT           3	/* Imlib2/FreeType */