diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 5d74f212cc..3d12e28ab3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -137,7 +137,6 @@ char nxagentDialogName[256];
 char nxagentSessionId[256] = {0};
 char *nxagentOptionFile;
 
-Bool nxagentFullGeneration = False;
 int nxagentDefaultClass = TrueColor;
 Bool nxagentUserDefaultClass = False;
 int nxagentDefaultDepth;
@@ -410,11 +409,6 @@ int ddxProcessArgument(int argc, char *argv[], int i)
     return 1;
   }
 
-  if (!strcmp(argv[i], "-full")) {
-    nxagentFullGeneration = True;
-    return 1;
-  }
-
   if (!strcmp(argv[i], "-class")) {
     if (++i < argc) {
       if (!strcmp(argv[i], "StaticGray")) {
@@ -2081,7 +2075,6 @@ void ddxUseMsg()
 {
   ErrorF("-display string        display name of the real server\n");
   ErrorF("-sync                  synchronize with the real server\n");
-  ErrorF("-full                  utilize full regeneration\n");
   ErrorF("-class string          default visual class\n");
   ErrorF("-depth int             default depth\n");
   ErrorF("-geometry WxH+X+Y      window size and position\n");
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.h b/nx-X11/programs/Xserver/hw/nxagent/Args.h
index 09d0455142..ef06d8d5fa 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.h
@@ -60,7 +60,6 @@ extern char nxagentDialogName[];
 
 extern Bool nxagentSynchronize;
 extern Bool nxagentRealWindowProp;
-extern Bool nxagentFullGeneration;
 extern int nxagentDefaultClass;
 extern Bool nxagentUserDefaultClass;
 extern int nxagentDefaultDepth;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index c764f50ae3..5aacc94e5e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -1126,8 +1126,6 @@ void nxagentOpenDisplay(int argc, char *argv[])
 {
   int i;
 
-  if (!nxagentDoFullGeneration) return;
-
   #ifdef NXAGENT_TIMESTAMP
 
   startTime = GetTimeInMillis();
@@ -1744,21 +1742,17 @@ void nxagentSetDefaultDrawables()
 void nxagentCloseDisplay()
 {
   #ifdef TEST
-  fprintf(stderr, "nxagentCloseDisplay: Called with full generation [%d] and display [%p].\n",
-              nxagentDoFullGeneration, (void *) nxagentDisplay);
+  fprintf(stderr, "nxagentCloseDisplay: Called with display [%p].\n", (void *) nxagentDisplay);
   #endif
 
-  if (nxagentDoFullGeneration == 0 ||
-          nxagentDisplay == NULL)
+  if (nxagentDisplay == NULL)
   {
     return;
   }
 
   /*
-   * If nxagentDoFullGeneration is true, all
-   * the X resources will be destroyed upon
-   * closing the display connection, so there
-   * is no real need to generate additional
+   * All the X resources will be destroyed upon closing the display
+   * connection, so there is no real need to generate additional
    * traffic
    */
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c
index f9c6827655..a2ab334cbb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Font.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c
@@ -167,8 +167,7 @@ static struct _nxagentFailedToReconnectFonts
 } nxagentFailedToReconnectFonts = {NULL, NULL, 0, 0};
 
 /*
- * This is used if nxagentFullGeneration is true
- * in CloseDisplay().
+ * This is used in CloseDisplay().
  */
 
 void nxagentFreeFontCache(void)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index a35e3d5a81..dec5249789 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -169,22 +169,6 @@ FIXME: These, if not removed, should at least
 int nxagentBackingStore;
 int nxagentSaveUnder;
 
-/*
- * This is true at startup and set to the value of
- * nxagentFullGeneration at the end of InitInput.
- *
- *   InitOutput
- *      nxagentOpenDisplay (if nxagentDoFullGeneration)
- *         nxagentCloseDisplay (if (nxagentDoFullGeneration && nxagentDisplay))
- *            nxagentFree*
- *      nxagentListRemoteFonts
- *      AddScreen
- *         nxagentOpenScreen
- *   InitInput
- */
-
-int nxagentDoFullGeneration = 1;
-
  /*
  * 1 if agent running as X2goAgent
  * 0 if NX Agent
@@ -404,8 +388,6 @@ FIXME: These variables, if not removed at all because have probably
 
   nxagentAllocateGraphicContexts();
 
-  nxagentDoFullGeneration = nxagentFullGeneration;
-
   /*
    * Use a solid black root window
    * background.
@@ -475,8 +457,6 @@ void InitInput(argc, argv)
 
 void AbortDDX()
 {
-  nxagentDoFullGeneration = True;
-
   nxagentCloseDisplay();
 
   /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.h b/nx-X11/programs/Xserver/hw/nxagent/Init.h
index 34a17067fd..f8b6dc2aff 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.h
@@ -40,8 +40,6 @@ is" without express or implied warranty.
 #ifndef __Init_H__
 #define __Init_H__
 
-extern int nxagentDoFullGeneration;
-
 extern int nxagentBackingStore;
 extern int nxagentSaveUnder;
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 1c3e765809..01d3150c50 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -1660,8 +1660,7 @@ N/A
   nxagentPrintAgentGeometry(NULL, "nxagentOpenScreen:");
   #endif
 
-  if (nxagentDoFullGeneration == 1 ||
-          nxagentReconnectTrap == 1)
+  if (nxagentReconnectTrap == 1)
   {
     valuemask = CWBackPixel | CWEventMask | CWColormap |
                     (nxagentOption(AllScreens) == 1 ? CWOverrideRedirect : 0);