diff --git a/source/duke3d/src/duke3d.h b/source/duke3d/src/duke3d.h
index ac42058fb..c3b8d8823 100644
--- a/source/duke3d/src/duke3d.h
+++ b/source/duke3d/src/duke3d.h
@@ -66,10 +66,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// increase by 3, because atomic GRP adds 1, and Shareware adds 2
#ifdef LUNATIC
// Lunatic
-# define BYTEVERSION_EDUKE32 324
+# define BYTEVERSION_EDUKE32 327
#else
// Non-Lua build
-# define BYTEVERSION_EDUKE32 324
+# define BYTEVERSION_EDUKE32 327
#endif
//#define BYTEVERSION_13 27
diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp
index 2d0b86045..44bf764b6 100644
--- a/source/duke3d/src/gamedef.cpp
+++ b/source/duke3d/src/gamedef.cpp
@@ -1155,15 +1155,12 @@ const memberlabel_t UserdefsLabels[]=
{ "overhead_on", USERDEFS_OVERHEAD_ON, 0, 0 },
{ "last_overhead", USERDEFS_LAST_OVERHEAD, 0, 0 },
{ "showweapons", USERDEFS_SHOWWEAPONS, 0, 0 },
-
{ "pause_on", USERDEFS_PAUSE_ON, 0, 0 },
{ "from_bonus", USERDEFS_FROM_BONUS, 0, 0 },
{ "camerasprite", USERDEFS_CAMERASPRITE, 0, 0 },
{ "last_camsprite", USERDEFS_LAST_CAMSPRITE, 0, 0 },
{ "last_level", USERDEFS_LAST_LEVEL, 0, 0 },
{ "secretlevel", USERDEFS_SECRETLEVEL, 0, 0 },
- { "playerbest", USERDEFS_PLAYERBEST, 0, 0 },
-
{ "const_visibility", USERDEFS_CONST_VISIBILITY, 0, 0 },
{ "uw_framerate", USERDEFS_UW_FRAMERATE, 0, 0 },
{ "camera_time", USERDEFS_CAMERA_TIME, 0, 0 },
@@ -1173,14 +1170,6 @@ const memberlabel_t UserdefsLabels[]=
{ "foly", USERDEFS_FOLY, 0, 0 },
{ "fola", USERDEFS_FOLA, 0, 0 },
{ "reccnt", USERDEFS_RECCNT, 0, 0 },
-
- { "m_origin_x", USERDEFS_M_ORIGIN_X, 0, 0 },
- { "m_origin_y", USERDEFS_M_ORIGIN_Y, 0, 0 },
-
- { "usevoxels", USERDEFS_USEVOXELS, 0, 0 },
- { "usehightile", USERDEFS_USEHIGHTILE, 0, 0 },
- { "usemodels", USERDEFS_USEMODELS, 0, 0 },
-
{ "entered_name", USERDEFS_ENTERED_NAME, 0, 0 },
{ "screen_tilting", USERDEFS_SCREEN_TILTING, 0, 0 },
{ "shadows", USERDEFS_SHADOWS, 0, 0 },
@@ -1245,7 +1234,13 @@ const memberlabel_t UserdefsLabels[]=
{ "weaponscale", USERDEFS_WEAPONSCALE, 0, 0 },
{ "textscale", USERDEFS_TEXTSCALE, 0, 0 },
{ "runkey_mode", USERDEFS_RUNKEY_MODE, 0, 0 },
+ { "m_origin_x", USERDEFS_M_ORIGIN_X, 0, 0 },
+ { "m_origin_y", USERDEFS_M_ORIGIN_Y, 0, 0 },
+ { "playerbest", USERDEFS_PLAYERBEST, 0, 0 },
{ "musictoggle", USERDEFS_MUSICTOGGLE, 0, 0 },
+ { "usevoxels", USERDEFS_USEVOXELS, 0, 0 },
+ { "usehightile", USERDEFS_USEHIGHTILE, 0, 0 },
+ { "usemodels", USERDEFS_USEMODELS, 0, 0 },
{ "gametypeflags", USERDEFS_GAMETYPEFLAGS, 0, 0 },
{ "m_gametypeflags", USERDEFS_M_GAMETYPEFLAGS, 0, 0 },
{ "globalflags", USERDEFS_GLOBALFLAGS, 0, 0 },
diff --git a/source/duke3d/src/gamedef.h b/source/duke3d/src/gamedef.h
index 0aceade91..97d33a623 100644
--- a/source/duke3d/src/gamedef.h
+++ b/source/duke3d/src/gamedef.h
@@ -458,7 +458,6 @@ enum UserdefsLabel_t
USERDEFS_SCREEN_SIZE,
USERDEFS_LOCKOUT,
USERDEFS_CROSSHAIR,
- USERDEFS_WCHOICE,
USERDEFS_PLAYERAI,
USERDEFS_RESPAWN_MONSTERS,
USERDEFS_RESPAWN_ITEMS,