Index: uspace/srv/fs/exfat/exfat_ops.c
===================================================================
--- uspace/srv/fs/exfat/exfat_ops.c	(revision 8d58fcaa7e5744b458fcb7645e5a20ddd6eb8092)
+++ uspace/srv/fs/exfat/exfat_ops.c	(revision 40d36048e86ffeff77321040925d02ecede6b780)
@@ -1204,5 +1204,7 @@
 
 	if (info != NULL) {
-//		str_cpy(info->label, FS_LABEL_MAXLEN + 1, label);
+#if 0
+		str_cpy(info->label, FS_LABEL_MAXLEN + 1, label);
+#endif
 	}
 
Index: uspace/srv/net/tcp/conn.c
===================================================================
--- uspace/srv/net/tcp/conn.c	(revision 8d58fcaa7e5744b458fcb7645e5a20ddd6eb8092)
+++ uspace/srv/net/tcp/conn.c	(revision 40d36048e86ffeff77321040925d02ecede6b780)
@@ -1422,5 +1422,7 @@
 	if (tcp_conn_lb == tcp_lb_segment) {
 		/* Loop back segment */
-//		tcp_ncsim_bounce_seg(sp, seg);
+#if 0
+		tcp_ncsim_bounce_seg(sp, seg);
+#endif
 
 		/* Reverse the identification */
Index: uspace/srv/net/tcp/service.c
===================================================================
--- uspace/srv/net/tcp/service.c	(revision 8d58fcaa7e5744b458fcb7645e5a20ddd6eb8092)
+++ uspace/srv/net/tcp/service.c	(revision 40d36048e86ffeff77321040925d02ecede6b780)
@@ -567,5 +567,7 @@
 	}
 
-//	tcp_uc_close(cconn->conn);
+#if 0
+	tcp_uc_close(cconn->conn);
+#endif
 	tcp_clistener_destroy(clst);
 	return EOK;
Index: uspace/srv/net/udp/service.c
===================================================================
--- uspace/srv/net/udp/service.c	(revision 8d58fcaa7e5744b458fcb7645e5a20ddd6eb8092)
+++ uspace/srv/net/udp/service.c	(revision 40d36048e86ffeff77321040925d02ecede6b780)
@@ -87,10 +87,5 @@
 	rqe->cassoc = cassoc;
 
-//	fibril_mutex_lock(&assoc->lock);
 	list_append(&rqe->link, &cassoc->client->crcv_queue);
-//	fibril_mutex_unlock(&assoc->lock);
-
-//	fibril_condvar_broadcast(&assoc->rcv_queue_cv);
-
 	return EOK;
 }