diff --git a/src/goal_gui.cpp b/src/goal_gui.cpp
index 27e1e38872..135f7e493a 100644
--- a/src/goal_gui.cpp
+++ b/src/goal_gui.cpp
@@ -177,14 +177,7 @@ struct GoalListWindow : public Window {
 
 		resize->height = d.height;
 
-		uint num = 0;
-		for (const Goal *s : Goal::Iterate()) {
-			if (s->company == INVALID_COMPANY || s->company == this->window_number) {
-				num++;
-			}
-		}
-
-		d.height *= (5 + num);
+		d.height *= 5;
 		d.width += padding.width + WD_FRAMERECT_RIGHT + WD_FRAMERECT_LEFT;
 		d.height += padding.height + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
 		*size = maxdim(*size, d);
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 770ea62f07..b356a40c5f 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -1010,7 +1010,6 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::Receive_SERVER_COMMAND(Packet
 		IConsolePrintF(CC_ERROR, "WARNING: %s from server, dropping...", err);
 		return NETWORK_RECV_STATUS_MALFORMED_PACKET;
 	}
-	fprintf(stderr, "CMDDR %u %u %u\n", cp.cmd, cp.p1, cp.p2);
 	this->incoming_queue.Append(&cp);
 
 	return NETWORK_RECV_STATUS_OKAY;