diff --git a/libs/console/complete.c b/libs/console/complete.c
index cecffe1e2..0719ce1e7 100644
--- a/libs/console/complete.c
+++ b/libs/console/complete.c
@@ -43,8 +43,6 @@ static const char rcsid[] =
 #include "QF/console.h"
 #include "QF/cvar.h"
 
-//FIXME eww
-
 
 /*
   Con_BasicCompleteCommandLine
diff --git a/libs/gamecode/builtins/pr_cmds.c b/libs/gamecode/builtins/pr_cmds.c
index b44247de8..7fb98c440 100644
--- a/libs/gamecode/builtins/pr_cmds.c
+++ b/libs/gamecode/builtins/pr_cmds.c
@@ -267,7 +267,6 @@ PF_cvar_set (progs_t *pr)
 	if (!var)
 		var = Cvar_FindAlias (var_name);
 	if (!var) {
-		// FIXME: make Con_DPrint?
 		Sys_Printf ("PF_cvar_set: variable %s not found\n", var_name);
 		return;
 	}
diff --git a/libs/video/renderer/r_light.c b/libs/video/renderer/r_light.c
index 6f3060724..819dfad33 100644
--- a/libs/video/renderer/r_light.c
+++ b/libs/video/renderer/r_light.c
@@ -334,7 +334,6 @@ loop:
 		return -1;						// didn't hit anything
 
 	// calculate mid point
-// FIXME: optimize for axial
 	plane = node->plane;
 	front = DotProduct (start, plane->normal) - plane->dist;
 	back = DotProduct (end, plane->normal) - plane->dist;
diff --git a/libs/video/targets/in_event.c b/libs/video/targets/in_event.c
index 6d4b0e523..e2fd88b28 100644
--- a/libs/video/targets/in_event.c
+++ b/libs/video/targets/in_event.c
@@ -155,7 +155,6 @@ IE_CallHandler (ie_handler handler, ie_event_t *event, float value)
 	static int depth = 0;
 	depth++;
 	if (depth > IE_MAX_DEPTH)
-		// FIXME: we may want to just issue a warning here
 		Sys_Error ("IE_CallHandler: max recursion depth hit");
 	else
 		handler (event, value);
diff --git a/libs/video/targets/vid_common_gl.c b/libs/video/targets/vid_common_gl.c
index fd9987026..64d182037 100644
--- a/libs/video/targets/vid_common_gl.c
+++ b/libs/video/targets/vid_common_gl.c
@@ -196,7 +196,6 @@ VID_SetPalette (unsigned char *palette)
 	d_8to24table[255] = 0;	// 255 is transparent
 
 	// JACK: 3D distance calcs - k is last closest, l is the distance.
-	// FIXME: Precalculate this and cache to disk.
 	if (palflag)
 		return;
 	palflag = true;
diff --git a/libs/video/targets/vid_svgalib.c b/libs/video/targets/vid_svgalib.c
index 7b748306b..9a88ff629 100644
--- a/libs/video/targets/vid_svgalib.c
+++ b/libs/video/targets/vid_svgalib.c
@@ -657,7 +657,7 @@ VID_SetCaption (const char *text)
 qboolean
 VID_SetGamma (double gamma)
 {
-	return false; //FIXME
+	return false;
 }
 
 #if defined(i386) && defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2))
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index 2b2f6f31e..973706e1c 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -187,7 +187,7 @@ CL_ClearState (void)
 
 	R_ClearEfrags ();
 	R_ClearDlights ();
-	R_ClearParticles (); // FIXME: for R_ClearFires
+	R_ClearParticles ();
 
 	for (i = 0; i < MAX_EDICTS; i++) {
 		cl_baselines[i].ent = &cl_entities[i];
diff --git a/nq/source/cl_view.c b/nq/source/cl_view.c
index 2cef1f25e..fd152590d 100644
--- a/nq/source/cl_view.c
+++ b/nq/source/cl_view.c
@@ -685,7 +685,6 @@ V_CalcRefdef (void)
 
 		steptime = cl.time - cl.oldtime;
 		if (steptime < 0)
-//FIXME		I_Error ("steptime < 0");
 			steptime = 0;
 
 		oldz += steptime * 80;
diff --git a/nq/source/host.c b/nq/source/host.c
index 18bbc9dd2..5f31c1722 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -291,7 +291,6 @@ Host_WriteConfiguration (void)
 	SV_ClientPrintf
 
 	Sends text across to be displayed
-	FIXME: make this just a stuffed echo
 */
 void
 SV_ClientPrintf (const char *fmt, ...)
diff --git a/nq/source/net_dgrm.c b/nq/source/net_dgrm.c
index 048a6ee71..c597c4523 100644
--- a/nq/source/net_dgrm.c
+++ b/nq/source/net_dgrm.c
@@ -1,4 +1,3 @@
-
 /*
 	net_dgrm.c
 
diff --git a/nq/source/pr_cmds.c b/nq/source/pr_cmds.c
index fb52a387f..c6b133e3d 100644
--- a/nq/source/pr_cmds.c
+++ b/nq/source/pr_cmds.c
@@ -156,10 +156,7 @@ SetMinMaxSize (progs_t *pr, edict_t *e, const vec3_t min, const vec3_t max,
 		if (min[i] > max[i])
 			PR_RunError (pr, "backwards mins/maxs");
 
-	rotate = false;						// FIXME: implement rotation properly 
-										// 
-	// 
-	// again
+	rotate = false;					// FIXME: implement rotation properly again
 
 	if (!rotate) {
 		VectorCopy (min, rmin);
diff --git a/nq/source/sbar.c b/nq/source/sbar.c
index 6945a4bcc..23216cfa4 100644
--- a/nq/source/sbar.c
+++ b/nq/source/sbar.c
@@ -94,17 +94,11 @@ void        Sbar_MiniDeathmatchOverlay (void);
 void        Sbar_DeathmatchOverlay (void);
 
 
-/*
-	Sbar_ColorForMap
-
-	I'm not exactly sure why this exists, but I'm not going to change it yet.
-*/
 int
 Sbar_ColorForMap (int m)
 {
 	return m + 8;						// FIXME: Might want this to be
-	// return (bound (0, m, 13) * 16) +
-	// 8;
+	// return (bound (0, m, 13) * 16) + 8;
 }
 
 
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index 243dfd8b1..841f130ac 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -409,7 +409,7 @@ CL_ClearState (void)
 
 	R_ClearEfrags ();
 	R_ClearDlights ();
-	R_ClearParticles (); // FIXME: for R_ClearFires in GL
+	R_ClearParticles ();
 
 	// wipe the entire cl structure
 	Info_Destroy (cl.serverinfo);
@@ -1750,12 +1750,6 @@ Host_Init (void)
 	CL_UpdateScreen (realtime);
 }
 
-/*
-	Host_Shutdown
-
-	FIXME: this is a callback from Sys_Quit and Sys_Error.  It would be better
-	to run quit through here before the final handoff to the sys code.
-*/
 void
 Host_Shutdown (void)
 {
diff --git a/qw/source/sv_ccmds.c b/qw/source/sv_ccmds.c
index 6a092ce8e..cfaa6defe 100644
--- a/qw/source/sv_ccmds.c
+++ b/qw/source/sv_ccmds.c
@@ -1110,9 +1110,8 @@ SV_InitOperatorCommands (void)
 	Cmd_AddCommand ("fraglogfile", SV_Fraglogfile_f, "Enables logging of kills "
 					"to frag_##.log");
 
-	Cmd_AddCommand ("snap", SV_Snap_f, "FIXME: Take a screenshot of userid? No "
-					"Description");
-	Cmd_AddCommand ("snapall", SV_SnapAll_f, "FIXME: No Description");
+	Cmd_AddCommand ("snap", SV_Snap_f, "Take a screenshot of userid");
+	Cmd_AddCommand ("snapall", SV_SnapAll_f, "Take a screenshot of all users");
 	Cmd_AddCommand ("kick", SV_Kick_f, "Remove a user from the server (kick "
 					"userid)");
 	Cmd_AddCommand ("status", SV_Status_f, "Report information on the current "