diff --git a/evennia/server/amp.py b/evennia/server/amp.py
index 9ea82d5570..b5be0a94fc 100644
--- a/evennia/server/amp.py
+++ b/evennia/server/amp.py
@@ -38,6 +38,7 @@ class DummySession(object):
 DUMMYSESSION = DummySession()
 
 # communication bits
+# (chr(9) and chr(10) are \t and \n, so skipping them)
 
 PCONN = chr(1)        # portal session connect
 PDISCONN = chr(2)     # portal session disconnect
@@ -47,8 +48,8 @@ SDISCONN = chr(5)     # server session disconnect
 SDISCONNALL = chr(6)  # server session disconnect all
 SSHUTD = chr(7)       # server shutdown
 SSYNC = chr(8)        # server session sync
-SCONN = chr(9)        # server creating new connection (for irc/imc2 bots etc)
-PCONNSYNC = chr(10)   # portal post-syncing a session
+SCONN = chr(11)        # server creating new connection (for irc/imc2 bots etc)
+PCONNSYNC = chr(12)   # portal post-syncing a session
 AMP_MAXLEN = amp.MAX_VALUE_LENGTH    # max allowed data length in AMP protocol (cannot be changed)
 
 BATCH_RATE = 250    # max commands/sec before switching to batch-sending
@@ -429,7 +430,7 @@ class AMPProtocol(amp.AMP):
 
         Args:
             sessid (int): Unique Session id.
-            msg (str): Message to send over the wire.
+            text (str): Message to send over the wire.
             kwargs (any, optional): Optional data.
 
         Returns:
@@ -493,7 +494,7 @@ class AMPProtocol(amp.AMP):
         elif operation == PDISCONN:  # portal_session_disconnect
             # session closed from portal side
             session = server_sessionhandler[sessid]
-            self.factory.server.sessions.portal_disconnect(session)
+            self.factory.server.sessions.disconnect(session)
 
         elif operation == PSYNC:  # portal_session_sync
             # force a resync of sessions when portal reconnects to
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index 82526dd432..54c38fb319 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -46,8 +46,8 @@ SDISCONN = chr(5)     # server session disconnect
 SDISCONNALL = chr(6)  # server session disconnect all
 SSHUTD = chr(7)       # server shutdown
 SSYNC = chr(8)        # server session sync
-SCONN = chr(9)        # server portal connection (for bots)
-PCONNSYNC = chr(10)   # portal post-syncing session
+SCONN = chr(11)        # server portal connection (for bots)
+PCONNSYNC = chr(12)   # portal post-syncing session
 
 # i18n
 from django.utils.translation import ugettext as _
@@ -193,20 +193,6 @@ class ServerSessionHandler(SessionHandler):
             # protocol_flags etc)
             session.load_sync_data(portalsessiondata)
 
-    def portal_disconnect(self, sessid):
-        """
-        Called by Portal when portal reports a closing of a session
-        from the portal side.
-
-        Args:
-            sessid (int): Session id.
-
-        """
-        session = self.get(sessid, None)
-        if not session:
-            return
-        self.disconnect(session)
-
     def portal_sessions_sync(self, portalsessionsdata):
         """
         Syncing all session ids of the portal with the ones of the