diff --git a/tools/qwaq/Makefile b/tools/qwaq/Makefile
index 89fd873e7..ebb06bbb1 100644
--- a/tools/qwaq/Makefile
+++ b/tools/qwaq/Makefile
@@ -21,7 +21,7 @@ $(EXE): $(OBJ) $(LIBS)
 	$(CC) $(LDFLAGS) -o $@ $^ -lQFgamecode -lQFutil
 
 $(EXE).dat: progs.src *.qc
-	qfcc --warn=error --debug
+	qfcc --warn=error --code=debug
 
 clean:
 	rm -f $(EXE) *.o *.d core *.dat *.sym progdefs.h
diff --git a/tools/qwaq/main.qc b/tools/qwaq/main.qc
index 32f8811ef..9e4ba3f0f 100644
--- a/tools/qwaq/main.qc
+++ b/tools/qwaq/main.qc
@@ -3,17 +3,11 @@
 #define NIT_TELEPORTER       131072 //CH Teleporter
 #define PC_ENGINEER_TF_ITEMS NIT_TESLA | NIT_SECURITY_CAMERA | NIT_TELEPORTER
 
-//float messed_or = PC_ENGINEER_TF_ITEMS;
-float foo = 1;
-float bar = 1;
-float snafu = 2;
-float negative = - - - - - - -2;
-
 void () eek;
 float (float a, float b) boing;
 
 float () main =
-{/*
+{
 	local float messed_or;
 	local integer handle;
 	local string buffer;
@@ -34,112 +28,5 @@ float () main =
 		print (buffer);
 	} while (read_result == 1024);
 	close (handle);
-	eek ();
-	traceon();
-	local float foo = 0;
-	foo += 1;
-	foo *= 3;
-	foo -= 5;
-	foo &= 11;
-	foo /= 3;
-	foo ^= 1;
-	foo |= 7;
-	foo <<= 3;
-	foo >>= 1;
-	local integer bar;
-	bar = 12 % 5;
-	bar %= 3;
-	foo %= 5;
-	return foo;*/
-	traceon ();
-	boing (boing (1, 2), boing (3, 4));
-	boing (boing (0, 2), boing (3, -3));
 	return 0;
 };
-
-float () baz =
-{
-	return foo + bar;
-};
-
-void (float x) test =
-{
-	//local string str;
-	local integer urk = 0;
-
-	if (urk) {
-		urk = foo || snafu;
-	} else {
-		print ("owie");
-	}
-};
-
-void () blarg =
-{
-	local float foo = -1;
-	local float bar;
-	local entity te;
-	while (te) {
-		if (bar)
-			bar = 0;
-	}
-	do {
-		foo = 1;
-	} while (foo);
-	if (bar = foo);
-	foo = 2;
-	while (foo) {
-		bar = foo;
-	}
-};
-
-float (float a, float b) boing =
-{
-	return a ? a + b : b;
-};
-
-float (float baz) test_int =
-{
-	return 1;
-};
-
-.entity owner;
-entity sent;
-void () eek =
-{
-	local string bop = "";
-	local vector v = '1 2 3';
-	local float expr = v * '0 1 0';
-
-	traceon();
-	if (sent && sent.owner != self )
-		self.origin = '0 0 0';
-	self.origin = self.origin + '1 2 3';
-	test_int (1);
-	if (bop)
-		traceoff();
-	printf ("%v\n", v);
-	v = ~2 * v;
-	printf ("%v\n", v);
-	v = v * ~2;
-	printf ("%v\n", v);
-	v = -v;
-	printf ("%v\n", v);
-	printf ("%f %f %f\n", expr, expr ^ 3, ~expr);
-};
-
-void () assign = {
-	local float foo;
-	local float bar;
-
-	foo = bar;
-	foo = bar = 1;
-	foo = bar = bar + 1;
-	foo = self.nextthink = self.nextthink + 1.0;
-	self.frame = self.nextthink = self.nextthink + 1.0;
-	foo = self.nextthink = foo + 1.0;
-	self.nextthink = foo = foo + 1.0;
-	self.frame = self.nextthink = foo + 1.0;
-	foo = self.nextthink = foo;
-	self.frame = self.nextthink = foo;
-};