6 files changed, 2 insertions, 17 deletions
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 0df127159..165f87b37 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -34,7 +34,6 @@
 #include "gui/widgets/createwidget.h"
 
 #include "net/chathandler.h"
-#include "net/serverfeatures.h"
 
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 218f30333..7e0c2e988 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -267,12 +267,7 @@ void CharServerHandler::newCharacter(const std::string &name, const int slot,
     outMsg.writeInt8(static_cast<int8_t>(hairColor), "hair color");
     outMsg.writeInt8(0, "unused");
     outMsg.writeInt8(static_cast<int8_t>(hairstyle), "hair style");
-    if (serverFeatures->haveLookSelection())
-        outMsg.writeInt8(static_cast<int8_t>(look), "look");
-    else
-        outMsg.writeInt8(0, "unused");
-    if (serverFeatures->haveRaceSelection())
-        outMsg.writeInt8(race, "class");
+    outMsg.writeInt8(0, "unused");
 }
 
 void CharServerHandler::deleteCharacter(Net::Character *const character,
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 633815ac7..cff6241f9 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -33,8 +33,6 @@
 
 #include "listeners/arrowslistener.h"
 
-#include "net/serverfeatures.h"
-
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index f69151d9d..58a0be565 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -216,10 +216,7 @@ void LoginHandler::processServerVersion(Net::MessageIn &msg)
 
 int LoginHandler::supportedOptionalActions() const
 {
-    return serverFeatures->haveEmailOnRegister()
-        ? Net::RegistrationOptions::SetEmailOnRegister
-        | Net::RegistrationOptions::SetGenderOnRegister
-        : Net::RegistrationOptions::SetGenderOnRegister;
+    return Net::RegistrationOptions::SetGenderOnRegister;
 }
 
 void LoginHandler::sendVersion() const
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index efabfff2e..7007a20f1 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -28,8 +28,6 @@
 
 #include "gui/widgets/createwidget.h"
 
-#include "net/serverfeatures.h"
-
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 8f9a110df..c169b5763 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -32,8 +32,6 @@
 
 #include "gui/windows/tradewindow.h"
 
-#include "net/serverfeatures.h"
-
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"