diff --git a/source/src/cube.h b/source/src/cube.h
index 603b4181..5d56b2ac 100644
--- a/source/src/cube.h
+++ b/source/src/cube.h
@@ -459,11 +459,6 @@ enum
     SV_SENDMAP, SV_RECVMAP, SV_SERVMSG, SV_ITEMLIST, SV_WEAPCHANGE,
     SV_MODELSKIN,
     SV_FLAGPICKUP, SV_FLAGDROP, SV_FLAGRETURN, SV_FLAGSCORE, SV_FLAGINFO, SV_FLAGS, //EDIT: AH
-    // Added by Rick: Bot specific messages
-    SV_BOTSOUND, SV_BOTDIS, SV_BOTDIED, SV_CLIENT2BOTDMG, SV_BOT2BOTDMG,
-    SV_BOTFRAGS, SV_ADDBOT, SV_BOTUPDATE, SV_BOTCOMMAND,
-    // End add    
-    SV_BOTITEMPICKUP, SV_BOT2CLIENTDMG, SV_DIEDBYBOT,
 	SV_GETMASTER, SV_MASTERCMD,
 	SV_PWD,
     SV_EXT,
diff --git a/source/src/main.cpp b/source/src/main.cpp
index 0ebd5493..55f429a6 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -77,6 +77,8 @@ static void bar(float bar, int w, int o, float r, float g, float b)
 
 void show_out_of_renderloop_progress(float bar1, const char *text1, float bar2, const char *text2)   // also used during loading
 {
+    c2skeepalive();
+
     int w = scr_w, h = scr_h;
 
     glDisable(GL_DEPTH_TEST);
diff --git a/source/src/protos.h b/source/src/protos.h
index cd25c1ec..5e8624b7 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -102,7 +102,6 @@ extern char *getclientmap();
 extern const char *modestr(int n);
 extern void zapplayer(playerent *&d);
 extern playerent *getclient(int cn);
-extern botent *getbot(int cn); // Added by Rick
 extern void timeupdate(int timeremain);
 extern void fixplayer1range();
 extern void respawnself(); // EDIT: AH
@@ -225,7 +224,6 @@ extern void playsound(int n, vec *loc = 0);
 extern void playsoundc(int n);
 extern void initsound();
 extern void cleansound();
-extern void botplaysound(int n, botent *b); // Added by Rick
 extern void music(char *name);
 
 // rendermodel
diff --git a/source/src/serverutil.cpp b/source/src/serverutil.cpp
index 50ba9b29..910d9b7c 100644
--- a/source/src/serverutil.cpp
+++ b/source/src/serverutil.cpp
@@ -94,11 +94,6 @@ char msgsizesl[] =               // size inclusive message token, 0 for variable
     SV_SENDMAP, 0, SV_RECVMAP, 1, SV_SERVMSG, 0, SV_ITEMLIST, 0, SV_WEAPCHANGE, 2,
     SV_MODELSKIN, 2,
     SV_FLAGPICKUP, 2, SV_FLAGDROP, 2, SV_FLAGRETURN, 2, SV_FLAGSCORE, 2, SV_FLAGINFO, 0, SV_FLAGS, 2, // EDIT: AH
-    // Added by Rick: Bot specific messages
-    SV_BOTSOUND, 3, SV_BOTDIS, 2, SV_BOTDIED, 4, SV_CLIENT2BOTDMG, 4, SV_BOT2BOTDMG, 2,
-    SV_BOTFRAGS, 3, SV_ADDBOT, 5, SV_BOTUPDATE, 12, SV_BOTCOMMAND, 0,
-    // End add
-    SV_BOTITEMPICKUP, 3, SV_BOT2CLIENTDMG, 5, SV_DIEDBYBOT, 2,
 	SV_GETMASTER, 0, SV_MASTERCMD, 3,
 	SV_PWD, 0,
     SV_EXT, 0,