diff --git a/src/client/cl_keys.c b/src/client/cl_keys.c
index 38bf5eaf1..695a529a7 100644
--- a/src/client/cl_keys.c
+++ b/src/client/cl_keys.c
@@ -1473,7 +1473,6 @@ void CL_KeyEvent(int key, qboolean down, unsigned time)
 	}
 
 	// most keys during demo playback will bring up the menu, but non-ascii
-
 	// keys can still be used for bound actions
 	if (down && (key < 128 || key == K_MOUSE1)
 	    && (clc.demoplaying || cls.state == CA_CINEMATIC) && !cls.keyCatchers)
@@ -1612,12 +1611,10 @@ void CL_KeyEvent(int key, qboolean down, unsigned time)
 	}
 	else if (cls.state == CA_DISCONNECTED)
 	{
-
 		if (!onlybinds)
 		{
 			Console_Key(key);
 		}
-
 	}
 	else
 	{
diff --git a/src/client/cl_main.c b/src/client/cl_main.c
index dd76db9d6..2088ead27 100644
--- a/src/client/cl_main.c
+++ b/src/client/cl_main.c
@@ -49,8 +49,13 @@ cvar_t *cl_nodelta;
 cvar_t *cl_debugMove;
 
 cvar_t *cl_noprint;
-cvar_t *cl_motd;
+
+// Auto-Update
 cvar_t *cl_autoupdate;
+cvar_t *cl_updateavailable;
+cvar_t *cl_updatefiles;
+
+cvar_t *cl_motd;
 
 cvar_t *rcon_client_password;
 cvar_t *rconAddress;
@@ -101,11 +106,6 @@ cvar_t *cl_missionStats;
 cvar_t *cl_language;
 cvar_t *cl_debugTranslation;
 
-// Auto-Update
-cvar_t *cl_updateavailable;
-cvar_t *cl_updatefiles;
-
-
 cvar_t *cl_profile;
 cvar_t *cl_defaultProfile;
 
@@ -168,8 +168,6 @@ void CL_LoadTranslations_f(void);
 void CL_WriteWaveClose(void);
 void CL_WavStopRecord_f(void);
 
-void CL_GetAndRegGUID(void);
-
 void CL_PurgeCache(void)
 {
 	cls.doCachePurge = qtrue;
@@ -585,7 +583,7 @@ typedef struct wav_hdr_s
 	unsigned int Format;        // big endian
 
 	unsigned int Subchunk1ID;   // big endian
-	unsigned int Subchunk1Size;   // little endian
+	unsigned int Subchunk1Size; // little endian
 	unsigned short AudioFormat; // little endian
 	unsigned short NumChannels; // little endian
 	unsigned int SampleRate;    // little endian
@@ -594,7 +592,7 @@ typedef struct wav_hdr_s
 	unsigned short BitsPerSample;   // little endian
 
 	unsigned int Subchunk2ID;   // big endian
-	unsigned int Subchunk2Size;     // little indian ;)
+	unsigned int Subchunk2Size; // little indian ;)
 
 	unsigned int NumSamples;
 } wav_hdr_t;
@@ -1088,7 +1086,7 @@ void CL_Disconnect(qboolean showMainMenu)
 
 	SCR_StopCinematic();
 	S_ClearSoundBuffer(qtrue);    // modified
-#if 1
+
 	// send a disconnect message to the server
 	// send it a few times in case one is dropped
 	if (cls.state >= CA_CONNECTED)
@@ -1098,7 +1096,7 @@ void CL_Disconnect(qboolean showMainMenu)
 		CL_WritePacket();
 		CL_WritePacket();
 	}
-#endif
+
 	CL_ClearState();
 
 	// wipe the client connection
diff --git a/src/client/cl_parse.c b/src/client/cl_parse.c
index 2966f9b2c..ddeff7be2 100644
--- a/src/client/cl_parse.c
+++ b/src/client/cl_parse.c
@@ -64,7 +64,6 @@ MESSAGE PARSING
 
 =========================================================================
 */
-#if 1
 
 int entLastVisible[MAX_CLIENTS];
 
@@ -187,8 +186,6 @@ qboolean isEntVisible(entityState_t *ent)
 	return qfalse;
 }
 
-#endif
-
 /*
 ==================
 CL_DeltaEntity
@@ -220,7 +217,6 @@ void CL_DeltaEntity(msg_t *msg, clSnapshot_t *frame, int newnum, entityState_t *
 		return;     // entity was delta removed
 	}
 
-#if 1
 	// Only draw clients if visible
 	if (clc.onlyVisibleClients)
 	{
@@ -240,7 +236,6 @@ void CL_DeltaEntity(msg_t *msg, clSnapshot_t *frame, int newnum, entityState_t *
 			}
 		}
 	}
-#endif
 
 	cl.parseEntitiesNum++;
 	frame->numEntities++;
@@ -604,8 +599,8 @@ void CL_SystemInfoChanged(void)
 	char       value[BIG_INFO_VALUE];
 
 	systemInfo = cl.gameState.stringData + cl.gameState.stringOffsets[CS_SYSTEMINFO];
+
 	// NOTE: when the serverId changes, any further messages we send to the server will use this new serverId
-	// show_bug.cgi?id=475
 	// in some cases, outdated cp commands might get sent with this news serverId
 	cl.serverId = atoi(Info_ValueForKey(systemInfo, "sv_serverid"));
 
diff --git a/src/game/g_client.c b/src/game/g_client.c
index 83fc62ce2..b77da698b 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -2887,7 +2887,6 @@ void ClientSpawn(gentity_t *ent, qboolean revived, qboolean teamChange, qboolean
 	// clear entity state values
 	BG_PlayerStateToEntityState(&client->ps, &ent->s, qtrue);
 
-	// show_bug.cgi?id=569
 	G_ResetMarkers(ent);
 
 	// start the scripting system
diff --git a/src/null/null_input.c b/src/null/null_input.c
index 9c6c76d36..90d917754 100644
--- a/src/null/null_input.c
+++ b/src/null/null_input.c
@@ -49,7 +49,6 @@ void Sys_SendKeyEvents(void)
 {
 }
 
-// TTimo: added for win32 dedicated
 void IN_MouseEvent(int mstate)
 {
 }
diff --git a/src/null/null_snddma.c b/src/null/null_snddma.c
index 90b73e933..5e81041b4 100644
--- a/src/null/null_snddma.c
+++ b/src/null/null_snddma.c
@@ -70,12 +70,11 @@ void S_ClearSoundBuffer(qboolean killStreaming)
 {
 }
 
-// TTimo: added for win32 dedicated
+// added for win32 dedicated
 void SNDDMA_Activate(void)
 {
 }
 
-// show_bug.cgi?id=574
 int S_GetSoundLength(sfxHandle_t sfxHandle)
 {
 	Com_Error(ERR_DROP, "null_snddma.c: S_GetSoundLength\n");
diff --git a/src/qcommon/cmd.c b/src/qcommon/cmd.c
index 7dd7d652b..c3c200314 100644
--- a/src/qcommon/cmd.c
+++ b/src/qcommon/cmd.c
@@ -351,7 +351,8 @@ void Cmd_Vstr_f(void)
 }
 
 /**
- * @brief Just prints the rest of the line to the console
+ * @brief Prints the rest of the line to the console
+ * and shows a notification if connected to a server.
  */
 void Cmd_Echo_f(void)
 {
@@ -518,9 +519,7 @@ char *Cmd_Cmd(void)
 /*
  * @brief Replaces command separators with space to prevent interpretation
  *
- * This is a hack to protect buggy qvms
- * https://bugzilla.icculus.org/show_bug.cgi?id=3593
- * https://bugzilla.icculus.org/show_bug.cgi?id=4769
+ * This prevents the infamous callvote hack.
  */
 void Cmd_Args_Sanitize(void)
 {
diff --git a/src/qcommon/files.c b/src/qcommon/files.c
index 498f7b23e..98e21c828 100644
--- a/src/qcommon/files.c
+++ b/src/qcommon/files.c
@@ -3393,8 +3393,8 @@ void FS_Shutdown(qboolean closemfp)
 /*
 ================
 FS_ReorderPurePaks
-NOTE TTimo: the reordering that happens here is not reflected in the cvars (\cvarlist *pak*)
-  this can lead to misleading situations, see show_bug.cgi?id=540
+NOTE: the reordering that happens here is not reflected in the cvars (\cvarlist *pak*)
+  this can lead to misleading situations
 ================
 */
 static void FS_ReorderPurePaks(void)
diff --git a/src/qcommon/msg.c b/src/qcommon/msg.c
index 7a86ab7c6..e812a1440 100644
--- a/src/qcommon/msg.c
+++ b/src/qcommon/msg.c
@@ -844,7 +844,7 @@ void MSG_ReadDeltaUsercmd(msg_t *msg, usercmd_t *from, usercmd_t *to)
 	to->angles[1] = MSG_ReadDelta(msg, from->angles[1], 16);
 	to->angles[2] = MSG_ReadDelta(msg, from->angles[2], 16);
 
-	// disallow moves of -128 - see https://bugzilla.icculus.org/show_bug.cgi?id=5273 patch by /dev/humancontroller
+	// disallow moves of -128 (speedhack)
 	to->forwardmove = MSG_ReadDelta(msg, from->forwardmove, 8);
 	if (to->forwardmove == -128)
 	{
@@ -941,7 +941,7 @@ void MSG_ReadDeltaUsercmdKey(msg_t *msg, int key, usercmd_t *from, usercmd_t *to
 		to->angles[1] = MSG_ReadDeltaKey(msg, key, from->angles[1], 16);
 		to->angles[2] = MSG_ReadDeltaKey(msg, key, from->angles[2], 16);
 
-		// disallow moves of -128 - see https://bugzilla.icculus.org/show_bug.cgi?id=5273 patch by /dev/humancontroller
+		// disallow moves of -128 (speedhack)
 		to->forwardmove = MSG_ReadDeltaKey(msg, key, from->forwardmove, 8);
 		if (to->forwardmove == -128)
 		{
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
index 5b65ce63d..7777a31a6 100644
--- a/src/qcommon/q_shared.h
+++ b/src/qcommon/q_shared.h
@@ -1283,7 +1283,8 @@ typedef enum
 // will occur
 
 // you can't add anything to this without modifying the code in msg.c
-// (unless it doesnt need transmitted over the network, in which case it should prolly go in the new pmext struct anyway)
+// (unless it doesnt need transmitted over the network, in which case it should
+// prolly go in the new pmext struct anyway)
 
 // playerState_t is a full superset of entityState_t as it is used by players,
 // so if a playerState_t is transmitted, the entityState_t can be fully derived
@@ -1301,7 +1302,7 @@ typedef struct playerState_s
 	vec3_t velocity;
 	int weaponTime;
 	int weaponDelay;            // for weapons that don't fire immediately when 'fire' is hit (grenades, venom, ...)
-	int grenadeTimeLeft;            // for delayed grenade throwing.  this is set to a #define for grenade
+	int grenadeTimeLeft;        // for delayed grenade throwing.  this is set to a #define for grenade
 	// lifetime when the attack button goes down, then when attack is released
 	// this is the amount of time left before the grenade goes off (or if it
 	// gets to 0 while in players hand, it explodes)
@@ -1331,7 +1332,7 @@ typedef struct playerState_s
 	int eventSequence;          // pmove generated events
 	int events[MAX_EVENTS];
 	int eventParms[MAX_EVENTS];
-	int oldEventSequence;           // so we can see which events have been added since we last converted to entityState_t
+	int oldEventSequence;       // so we can see which events have been added since we last converted to entityState_t
 
 	int externalEvent;          // events set on player from another source
 	int externalEventParm;
@@ -1396,7 +1397,7 @@ typedef struct playerState_s
 
 	// use the pmoveExt_t structure in bg_public.h to store this kind of data now (persistant on client, not network transmitted)
 
-	int ping;                   // server to game info for scoreboard
+	int ping;                       // server to game info for scoreboard
 	int pmove_framecount;
 	int entityEventSequence;
 
@@ -1410,12 +1411,14 @@ typedef struct playerState_s
 
 	qboolean releasedFire;
 
-	float aimSpreadScaleFloat;          // the server-side aimspreadscale that lets it track finer changes but still only
+	float aimSpreadScaleFloat;      // the server-side aimspreadscale that lets it track finer changes but still only
 	// transmit the 8bit int to the client
-	int aimSpreadScale;                 // 0 - 255 increases with angular movement      // Arnout : DOES get send over the network
-	int lastFireTime;                   // used by server to hold last firing frame briefly when randomly releasing trigger (AI)
-	int quickGrenTime;
-	int leanStopDebounceTime;
+	int aimSpreadScale;             // 0 - 255 increases with angular movement. DOES get send over the network
+	int lastFireTime;               // used by server to hold last firing frame briefly when randomly releasing trigger (AI)
+	                                // Set, but never used?
+
+	int quickGrenTime;              // unused
+	int leanStopDebounceTime;       // unused
 
 	// seems like heat and aimspread could be tied together somehow, however, they (appear to) change at different rates and
 	// I can't currently see how to optimize this to one server->client transmission "weapstatus" value.
@@ -1429,10 +1432,9 @@ typedef struct playerState_s
 
 //====================================================================
 
-//
 // usercmd_t->button bits, many of which are generated by the client system,
 // so they aren't game/cgame only definitions
-//
+
 #define BUTTON_ATTACK       1
 #define BUTTON_TALK         2           // displays talk balloon and disables actions
 //#define   BUTTON_USE_HOLDABLE 4       // obsolete/unused
@@ -1659,7 +1661,7 @@ typedef struct entityState_s
 	int eventParms[MAX_EVENTS];
 
 	// for players
-	int powerups;           // bit flags    // Arnout: used to store entState_t for non-player entities (so we know to draw them translucent clientsided)
+	int powerups;           // bit flags. Used to store entState_t for non-player entities (so we know to draw them translucent clientsided)
 	int weapon;             // determines weapon and flash model, etc
 	int legsAnim;           // mask off ANIM_TOGGLEBIT
 	int torsoAnim;          // mask off ANIM_TOGGLEBIT
diff --git a/src/renderer/tr_model.c b/src/renderer/tr_model.c
index b704e2725..406ad4656 100644
--- a/src/renderer/tr_model.c
+++ b/src/renderer/tr_model.c
@@ -2192,11 +2192,10 @@ void *R_Hunk_Begin(void)
 		// now if needed
 		membase = VirtualAlloc(NULL, maxsize, MEM_RESERVE, PAGE_NOACCESS);
 #else
-		// show_bug.cgi?id=440
 		// if not win32, then just allocate it now
 		// it is possible that we have been allocated already, in case we don't do anything
 		membase = malloc(maxsize);
-		// TTimo NOTE: initially, I was doing the memset even if we had an existing membase
+		// NOTE: initially, I was doing the memset even if we had an existing membase
 		// but this breaks some shaders (i.e. /map mp_beach, then go back to the main menu .. some shaders are missing)
 		// I assume the shader missing is because we don't clear memory either on win32
 		// meaning even on win32 we are using memory that is still reserved but was uncommited .. it works out of pure luck
diff --git a/src/renderer/tr_scene.c b/src/renderer/tr_scene.c
index 26988aa47..80be3d1cb 100644
--- a/src/renderer/tr_scene.c
+++ b/src/renderer/tr_scene.c
@@ -416,11 +416,12 @@ void RE_AddRefEntityToScene(const refEntity_t *ent)
 	{
 		return;
 	}
-	// show_bug.cgi?id=402
+
 	if (r_numentities >= ENTITYNUM_WORLD)
 	{
 		return;
 	}
+
 	if ((int)ent->reType < 0 || ent->reType >= RT_MAX_REF_ENTITY_TYPE)
 	{
 		ri.Error(ERR_DROP, "RE_AddRefEntityToScene: bad reType %i", ent->reType);
diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c
index 7c885e595..7e1f19f82 100644
--- a/src/sdl/sdl_glimp.c
+++ b/src/sdl/sdl_glimp.c
@@ -450,7 +450,9 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder)
 
 		SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
-#if 0 // See http://bugzilla.icculus.org/show_bug.cgi?id=3526
+#if 0
+		// TODO: SDL_GL_ACCELERATED_VISUAL is broken on ATI cards
+		//       This code can be enabled once we move to SDL >= 1.3
 		// If not allowing software GL, demand accelerated
 		if (!r_allowSoftwareGL->integer)
 		{
diff --git a/src/server/sv_main.c b/src/server/sv_main.c
index 9af3e4edc..345d8466b 100644
--- a/src/server/sv_main.c
+++ b/src/server/sv_main.c
@@ -793,7 +793,7 @@ void SVC_Info(netadr_t from)
 	Info_SetValueForKey(infostring, "friendlyFire", va("%i", sv_friendlyFire->integer));
 	Info_SetValueForKey(infostring, "maxlives", va("%i", sv_maxlives->integer ? 1 : 0));
 	Info_SetValueForKey(infostring, "needpass", va("%i", sv_needpass->integer ? 1 : 0));
-	Info_SetValueForKey(infostring, "gamename", GAMENAME_STRING); // Arnout: to be able to filter out Quake servers
+	Info_SetValueForKey(infostring, "gamename", GAMENAME_STRING);
 
 	antilag = Cvar_VariableString("g_antilag");
 	if (antilag)
diff --git a/src/server/sv_snapshot.c b/src/server/sv_snapshot.c
index 0e9c5fe12..43f9af3ff 100644
--- a/src/server/sv_snapshot.c
+++ b/src/server/sv_snapshot.c
@@ -653,7 +653,6 @@ static void SV_BuildClientSnapshot(client_t *client)
 	entityNumbers.numSnapshotEntities = 0;
 	memset(frame->areabits, 0, sizeof(frame->areabits));
 
-	// show_bug.cgi?id=62
 	frame->num_entities = 0;
 
 	clent = client->gentity;
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 35c2d8151..63232798e 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -7727,9 +7727,8 @@ void _UI_SetActiveMenu(uiMenuCommand_t menu)
 
 			trap_Cvar_VariableStringBuffer("com_errorMessage", buf, sizeof(buf));
 
-			// JPW NERVE stricmp() is silly but works, take a look at error.menu to see why.  I think this is bustified in q3ta
-			// NOTE TTimo - I'm not sure Q_stricmp is useful to anything anymore
-			// show_bug.cgi?id=507
+			// stricmp() is silly but works, take a look at error.menu to see why.
+			// NOTE: I'm not sure Q_stricmp is useful to anything anymore
 			// TTimo - improved and tweaked that area a whole bunch
 			if ((*buf) && (Q_stricmp(buf, ";")))
 			{
diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c
index 4c4a853c0..03151a059 100644
--- a/src/ui/ui_shared.c
+++ b/src/ui/ui_shared.c
@@ -3144,7 +3144,7 @@ qboolean Item_ListBox_HandleKey(itemDef_t *item, int key, qboolean down, qboolea
 			else
 			{
 				// select an item
-				// Arnout: can't select something that doesn't exist
+				// can't select something that doesn't exist
 				if (listPtr->cursorPos >= count)
 				{
 					listPtr->cursorPos = count - 1;