Index: uspace/app/stats/stats.c
===================================================================
--- uspace/app/stats/stats.c	(revision 3f56c9039c69ff40df4f5e663c166c26cbe31211)
+++ uspace/app/stats/stats.c	(revision ccca251bb0673718b534366ace0e22857d73804b)
@@ -265,5 +265,5 @@
 		/* Threads */
 		if ((off = arg_parse_short_long(argv[i], "-t", "--task=")) != -1) {
-			/* TODO: Support for 64b range */
+			// TODO: Support for 64b range
 			int tmp;
 			int ret = arg_parse_int(argc, argv, &i, &tmp, off);
Index: uspace/lib/net/generic/net_checksum.c
===================================================================
--- uspace/lib/net/generic/net_checksum.c	(revision 3f56c9039c69ff40df4f5e663c166c26cbe31211)
+++ uspace/lib/net/generic/net_checksum.c	(revision ccca251bb0673718b534366ace0e22857d73804b)
@@ -106,5 +106,5 @@
 				seed = (seed << 1) ^ ((uint32_t) CRC_DIVIDER_BE);
 			} else {
-				/* shift otherwise */
+				/* Shift otherwise */
 				seed <<= 1;
 			}
Index: uspace/lib/net/il/ip_client.c
===================================================================
--- uspace/lib/net/il/ip_client.c	(revision 3f56c9039c69ff40df4f5e663c166c26cbe31211)
+++ uspace/lib/net/il/ip_client.c	(revision ccca251bb0673718b534366ace0e22857d73804b)
@@ -123,6 +123,7 @@
 		return EOK;
 
-	/* TODO IPv6 */
-/*	case AF_INET6:
+	// TODO IPv6
+#if 0
+	case AF_INET6:
 		if (addrlen != sizeof(struct sockaddr_in6))
 			return EINVAL;
@@ -130,5 +131,5 @@
 		address_in6 = (struct sockaddr_in6 *) addr;
 		return EOK;
-*/
+#endif
 
 	default:
@@ -258,5 +259,5 @@
 		header_in->data_length = htons(data_length);
 		return EOK;
-	/* TODO IPv6 */
+	// TODO IPv6
 	} else {
 		return EINVAL;
Index: uspace/lib/net/include/ip_client.h
===================================================================
--- uspace/lib/net/include/ip_client.h	(revision 3f56c9039c69ff40df4f5e663c166c26cbe31211)
+++ uspace/lib/net/include/ip_client.h	(revision ccca251bb0673718b534366ace0e22857d73804b)
@@ -54,5 +54,5 @@
     socklen_t, struct sockaddr *, socklen_t, size_t, void **, size_t *);
 
-/* TODO ipopt manipulation */
+// TODO ipopt manipulation
 
 #endif
Index: uspace/lib/net/tl/socket_core.c
===================================================================
--- uspace/lib/net/tl/socket_core.c	(revision 3f56c9039c69ff40df4f5e663c166c26cbe31211)
+++ uspace/lib/net/tl/socket_core.c	(revision ccca251bb0673718b534366ace0e22857d73804b)
@@ -306,5 +306,5 @@
 		
 	case AF_INET6:
-		/* TODO IPv6 */
+		// TODO IPv6
 		break;
 	}
@@ -376,5 +376,7 @@
 
 	count = 0;
-//	socket_id = socket_globals.last_id;
+#if 0
+	socket_id = socket_globals.last_id;
+#endif
 	do {
 		if (count < SOCKET_ID_TRIES) {
@@ -388,8 +390,10 @@
 			if (socket_id < INT_MAX) {
 				++ socket_id;
-/*			} else if(socket_globals.last_id) {
-*				socket_globals.last_id = 0;
-*				socket_id = 1;
-*/			} else {
+#if 0
+			} else if(socket_globals.last_id) {
+				socket_globals.last_id = 0;
+				socket_id = 1;
+#endif
+			} else {
 				return ELIMIT;
 			}
Index: uspace/srv/hw/irc/apic/apic.c
===================================================================
--- uspace/srv/hw/irc/apic/apic.c	(revision 3f56c9039c69ff40df4f5e663c166c26cbe31211)
+++ uspace/srv/hw/irc/apic/apic.c	(revision ccca251bb0673718b534366ace0e22857d73804b)
@@ -56,5 +56,5 @@
 static int apic_enable_irq(sysarg_t irq)
 {
-	/* FIXME: TODO */
+	// FIXME: TODO
 	return ENOTSUP;
 }
Index: uspace/srv/net/il/ip/ip.c
===================================================================
--- uspace/srv/net/il/ip/ip.c	(revision 3f56c9039c69ff40df4f5e663c166c26cbe31211)
+++ uspace/srv/net/il/ip/ip.c	(revision ccca251bb0673718b534366ace0e22857d73804b)
@@ -365,5 +365,5 @@
 		
 		if (ip_netif->dhcp) {
-			/* TODO dhcp */
+			// TODO dhcp
 			net_free_settings(configuration, data);
 			return ENOTSUP;
@@ -398,5 +398,5 @@
 			}
 		} else {
-			/* TODO ipv6 in separate module */
+			// TODO ipv6 in separate module
 			net_free_settings(configuration, data);
 			return ENOTSUP;
@@ -517,5 +517,5 @@
 	    ip_netif->dhcp ? "dhcp" : "static");
 	
-	/* TODO ipv6 addresses */
+	// TODO ipv6 addresses
 	
 	char address[INET_ADDRSTRLEN];
@@ -946,5 +946,5 @@
 
 	/* Greatest multiple of 8 lower than content */
-	/* TODO even fragmentation? */
+	// TODO even fragmentation?
 	length = length & ~0x7;
 	
@@ -1212,5 +1212,5 @@
 	}
 	
-	/* Ff the local host is the destination */
+	/* If the local host is the destination */
 	if ((route->address.s_addr == dest->s_addr) &&
 	    (dest->s_addr != IPV4_LOCALHOST_ADDRESS)) {
@@ -1279,5 +1279,5 @@
 	in_addr_t destination;
 
-	/* TODO search set ipopt route? */
+	// TODO search set ipopt route?
 	destination.s_addr = header->destination_address;
 	return destination;
@@ -1321,5 +1321,5 @@
 	if ((header->flags & IPFLAG_MORE_FRAGMENTS) ||
 	    IP_FRAGMENT_OFFSET(header)) {
-		/* TODO fragmented */
+		// TODO fragmented
 		return ENOTSUP;
 	}
@@ -1437,5 +1437,5 @@
 		phone = ip_prepare_icmp_and_get_phone(0, packet, header);
 		if (phone >= 0) {
-			/* ttl exceeded ICMP */
+			/* TTL exceeded ICMP */
 			icmp_time_exceeded_msg(phone, ICMP_EXC_TTL, packet);
 		}
@@ -1777,5 +1777,5 @@
 		if ((type != ICMP_DEST_UNREACH) ||
 		    (code != ICMP_HOST_UNREACH)) {
-		    	/* No, something else */
+			/* No, something else */
 			break;
 		}
Index: uspace/srv/vfs/vfs_ops.c
===================================================================
--- uspace/srv/vfs/vfs_ops.c	(revision 3f56c9039c69ff40df4f5e663c166c26cbe31211)
+++ uspace/srv/vfs/vfs_ops.c	(revision ccca251bb0673718b534366ace0e22857d73804b)
@@ -611,5 +611,5 @@
 void vfs_open_node(ipc_callid_t rid, ipc_call_t *request)
 {
-	/* FIXME: check for sanity of the supplied fs, dev and index */
+	// FIXME: check for sanity of the supplied fs, dev and index
 	
 	/*