2 files changed, 21 insertions, 23 deletions
diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index eacd9ee04..d8849ac44 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -184,3 +184,24 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
 	return true;
 }
 
+/** TODO: This creates a total mess of output and needs to really use irc::modestacker.
+ */
+bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque<std::string> &params)
+{
+	if (params.size() < 1)
+		return true;
+
+	Channel* c = Instance->FindChan(params[0]);
+
+	if (c)
+	{
+		for (char modeletter = 'A'; modeletter <= 'z'; modeletter++)
+		{
+			ModeHandler* mh = Instance->Modes->FindMode(modeletter, MODETYPE_CHANNEL);
+			if (mh)
+				mh->RemoveMode(c);
+		}
+	}
+	return true;
+}
+ 
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 7fbf9b4ad..beee39a56 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -50,25 +50,6 @@ bool TreeSocket::Error(std::deque<std::string> &params)
 	return false;
 }
 
-/** TODO: This creates a total mess of output and needs to really use irc::modestacker.
- */
-bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque<std::string> &params)
-{
-	if (params.size() < 1)
-		return true;
-	Channel* c = Instance->FindChan(params[0]);
-	if (c)
-	{
-		for (char modeletter = 'A'; modeletter <= 'z'; modeletter++)
-		{
-			ModeHandler* mh = Instance->Modes->FindMode(modeletter, MODETYPE_CHANNEL);
-			if (mh)
-				mh->RemoveMode(c);
-		}
-	}
-	return true;
-}
-
 bool TreeSocket::RemoteServer(const std::string &prefix, std::deque<std::string> &params)
 {
 	if (params.size() < 5)
@@ -627,10 +608,6 @@ bool TreeSocket::ProcessLine(std::string &line)
 			{
 				return this->MetaData(prefix,params);
 			}
-			else if (command == "REMSTATUS")
-			{
-				return this->RemoveStatus(prefix,params);
-			}
 			else if (command == "PING")
 			{
 				return this->LocalPing(prefix,params);