diff --git a/os/Xtrans.c b/os/Xtrans.c
index eb347516e..4c1286fc8 100644
--- a/os/Xtrans.c
+++ b/os/Xtrans.c
@@ -342,21 +342,6 @@ TRANS(ParseAddress) (const char *address,
 
     _port = mybuf;
 
-#if defined(FS_t)
-    /*
-     * Is there an optional catalogue list?
-     */
-
-    if ((mybuf = strchr (mybuf,'/')) != NULL)
-	*mybuf ++= '\0';
-
-    /*
-     * The rest, if any, is the (currently unused) catalogue list.
-     *
-     * _catalogue = mybuf;
-     */
-#endif
-
 done_parsing:
     /*
      * Now that we have all of the components, allocate new
diff --git a/os/Xtrans.h b/os/Xtrans.h
index b383fb231..792324343 100644
--- a/os/Xtrans.h
+++ b/os/Xtrans.h
@@ -90,13 +90,6 @@ static const char *__xtransname = "_XimTrans";
 #endif
 #endif /* XIM_t */
 
-#ifdef FS_t
-#define TRANS(func) _FSTrans##func
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_FSTrans";
-#endif
-#endif /* FS_t */
-
 #if !defined(TRANS)
 #define TRANS(func) _XTrans##func
 #ifdef XTRANSDEBUG
diff --git a/os/Xtranslcl.c b/os/Xtranslcl.c
index 9defc902b..1958c667d 100644
--- a/os/Xtranslcl.c
+++ b/os/Xtranslcl.c
@@ -223,9 +223,6 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr,
 #if defined(XIM_t)
 #define NAMEDNODENAME "/tmp/.XIM-pipe/XIM"
 #endif
-#if defined(FS_t)
-#define NAMEDNODENAME	"/tmp/.font-pipe/fs"
-#endif
 
 
 #ifdef LOCAL_TRANS_NAMED
diff --git a/os/Xtranssock.c b/os/Xtranssock.c
index 28857d137..8181726d3 100644
--- a/os/Xtranssock.c
+++ b/os/Xtranssock.c
@@ -238,10 +238,6 @@ is_numeric (const char *str)
 #define UNIX_PATH "/tmp/.XIM-unix/XIM"
 #define UNIX_DIR "/tmp/.XIM-unix"
 #endif /* XIM_t */
-#if defined(FS_t)
-#define UNIX_PATH "/tmp/.font-unix/fs"
-#define UNIX_DIR "/tmp/.font-unix"
-#endif /* FS_t */
 
 #endif /* UNIXCONN */
 
@@ -400,7 +396,7 @@ TRANS(SocketOpen) (int i, int type)
                        Sockettrans2devtab[i].protocol);
 
 #ifndef WIN32
-#if (defined(X11_t) && !defined(USE_POLL)) || defined(FS_t)
+#if (defined(X11_t) && !defined(USE_POLL))
     if (ciptr->fd >= sysconf(_SC_OPEN_MAX))
     {
 	prmsg (2, "SocketOpen: socket() returned out of range fd %d\n",