Index: uspace/lib/sysman/src/sysman.c
===================================================================
--- uspace/lib/sysman/src/sysman.c	(revision 24b30e17ed4d5ffba3e8af9945bbe2aa8bcd016a)
+++ uspace/lib/sysman/src/sysman.c	(revision 01e68af0a29fd321d8c5515fbf6f3ef75bf916c9)
@@ -35,5 +35,4 @@
 async_exch_t *sysman_exchange_begin(sysman_interface_t iface)
 {
-	// TODO need special session for each iface!
 	if (sysman_sess[iface] == NULL) {
 		// TODO serialize vs parallel
Index: uspace/srv/sysman/connection_broker.c
===================================================================
--- uspace/srv/sysman/connection_broker.c	(revision 24b30e17ed4d5ffba3e8af9945bbe2aa8bcd016a)
+++ uspace/srv/sysman/connection_broker.c	(revision 01e68af0a29fd321d8c5515fbf6f3ef75bf916c9)
@@ -40,8 +40,8 @@
 	sysman_log(LVL_DEBUG2, "%s", __func__);
 	async_answer_0(iid, EOK);
-	/* TODO implement
-	 *  What exactly? Similar behavior that has locsrv with servers,
-	 *  so that subsequent calls can be assigned to broker. Still that
-	 *  makes sense only when brokers will somehow scope unit/exposee
+	/*
+	 *  What exactly do here? Similar behavior that has locsrv with
+	 *  servers, so that subsequent calls can be assigned to broker. Still
+	 *  that makes sense only when brokers will somehow scope unit/exposee
 	 *  names. Why I wanted this registration?
 	 */
Index: uspace/srv/sysman/job.c
===================================================================
--- uspace/srv/sysman/job.c	(revision 24b30e17ed4d5ffba3e8af9945bbe2aa8bcd016a)
+++ uspace/srv/sysman/job.c	(revision 01e68af0a29fd321d8c5515fbf6f3ef75bf916c9)
@@ -217,5 +217,4 @@
 		break;
 	default:
-		// TODO implement other states?
 		assert(false);
 	}
Index: uspace/srv/sysman/job_queue.c
===================================================================
--- uspace/srv/sysman/job_queue.c	(revision 24b30e17ed4d5ffba3e8af9945bbe2aa8bcd016a)
+++ uspace/srv/sysman/job_queue.c	(revision 01e68af0a29fd321d8c5515fbf6f3ef75bf916c9)
@@ -261,6 +261,4 @@
  * be queued after this job_queue_process call.
  *
- * TODO Write down rules from where this function can be called, to avoid stack
- *      overflow.
  */
 void job_queue_process(void)
Index: uspace/srv/sysman/unit.c
===================================================================
--- uspace/srv/sysman/unit.c	(revision 24b30e17ed4d5ffba3e8af9945bbe2aa8bcd016a)
+++ uspace/srv/sysman/unit.c	(revision 01e68af0a29fd321d8c5515fbf6f3ef75bf916c9)
@@ -98,7 +98,5 @@
 	UNIT_VMT(unit)->destroy(unit);
 	/* TODO:
-	 * 	edges,
-	 * 	check it's not an active unit,
-	 * 	other resources to come
+	 * 	edges
 	 */
 	free(unit->name);
Index: uspace/srv/sysman/units/unit_mnt.c
===================================================================
--- uspace/srv/sysman/units/unit_mnt.c	(revision 24b30e17ed4d5ffba3e8af9945bbe2aa8bcd016a)
+++ uspace/srv/sysman/units/unit_mnt.c	(revision 01e68af0a29fd321d8c5515fbf6f3ef75bf916c9)
@@ -196,5 +196,4 @@
 
 	
-	// TODO think about unit's lifecycle (is STOPPED only acceptable?)
 	assert(unit->state == STATE_STOPPED);
 
@@ -237,5 +236,4 @@
 
 	
-	// TODO think about unit's lifecycle (is STOPPED only acceptable?)
 	// note: we should never hit STATE_STARTING, since it'd mean there are
 	//       two jobs running at once (unless job cancellation is implemented)
Index: uspace/srv/sysman/units/unit_svc.c
===================================================================
--- uspace/srv/sysman/units/unit_svc.c	(revision 24b30e17ed4d5ffba3e8af9945bbe2aa8bcd016a)
+++ uspace/srv/sysman/units/unit_svc.c	(revision 01e68af0a29fd321d8c5515fbf6f3ef75bf916c9)
@@ -82,5 +82,4 @@
 
 	
-	// TODO think about unit's lifecycle (is STOPPED only acceptable?)
 	assert(unit->state == STATE_STOPPED);
 
@@ -118,5 +117,4 @@
 
 	
-	// TODO think about unit's lifecycle (is STOPPED only acceptable?)
 	// note: May change when job cancellation is possible.
 	assert(unit->state == STATE_STARTED);
Index: uspace/srv/sysman/units/unit_tgt.c
===================================================================
--- uspace/srv/sysman/units/unit_tgt.c	(revision 24b30e17ed4d5ffba3e8af9945bbe2aa8bcd016a)
+++ uspace/srv/sysman/units/unit_tgt.c	(revision 01e68af0a29fd321d8c5515fbf6f3ef75bf916c9)
@@ -80,5 +80,4 @@
 static void unit_tgt_fail(unit_t *unit)
 {
-	// TODO define semantics and implement
 }