diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 8f824157..8b52ac7f 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -450,11 +450,6 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
             players[cn]->flagscore = getint(p);
             break;
         };
-        
-		case SV_NOP:
-		{
-			getint(p); break;
-		};
                
         // End add
 
diff --git a/source/src/cube.h b/source/src/cube.h
index 117b2c42..603b4181 100644
--- a/source/src/cube.h
+++ b/source/src/cube.h
@@ -466,7 +466,6 @@ enum
     SV_BOTITEMPICKUP, SV_BOT2CLIENTDMG, SV_DIEDBYBOT,
 	SV_GETMASTER, SV_MASTERCMD,
 	SV_PWD,
-	SV_NOP,
     SV_EXT,
 };     
 
diff --git a/source/src/server.cpp b/source/src/server.cpp
index 65f3a3f5..e10a8afa 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -1052,7 +1052,7 @@ void initserver(bool dedicated, int uprate, char *sdesc, char *ip, char *master,
         if(!serverhost) fatal("could not create server host\n");
         loopi(maxclients) serverhost->peers[i].data = (void *)-1;
 		if(!maprot || !maprot[0]) maprot = newstring("config/maprot.cfg");
-        readscfg(path(maprot)); // EDIT: AH
+        readscfg(path(maprot));
 		if(masterpwd && masterpwd[0]) masterpasswd = masterpwd;
     };
 
diff --git a/source/src/serverutil.cpp b/source/src/serverutil.cpp
index 818ae1a5..50ba9b29 100644
--- a/source/src/serverutil.cpp
+++ b/source/src/serverutil.cpp
@@ -101,7 +101,6 @@ char msgsizesl[] =               // size inclusive message token, 0 for variable
     SV_BOTITEMPICKUP, 3, SV_BOT2CLIENTDMG, 5, SV_DIEDBYBOT, 2,
 	SV_GETMASTER, 0, SV_MASTERCMD, 3,
 	SV_PWD, 0,
-	SV_NOP, 1,
     SV_EXT, 0,
     -1
 };