Index: uspace/app/hdisk/func_mbr.c
===================================================================
--- uspace/app/hdisk/func_mbr.c	(revision 8c95dff74a31d0b98e3e8fb115185a07e64c2ac2)
+++ uspace/app/hdisk/func_mbr.c	(revision f4a47e52b9d2a3642a58eb1b953d1e52d56a160a)
@@ -198,6 +198,4 @@
 	}
 	
-	printf("ST_LOGIC: %d, %hd\n", mbr_get_flag(p, ST_LOGIC), p->status);
-	
 	printf("Set type (0-255): ");
 	type = get_input_uint8(in);
Index: uspace/lib/gpt/libgpt.c
===================================================================
--- uspace/lib/gpt/libgpt.c	(revision 8c95dff74a31d0b98e3e8fb115185a07e64c2ac2)
+++ uspace/lib/gpt/libgpt.c	(revision f4a47e52b9d2a3642a58eb1b953d1e52d56a160a)
@@ -310,6 +310,4 @@
 		goto fini_fail;
 
-	//size_t bufpos = 0;
-	//size_t buflen = 0;
 	aoff64_t pos = ent_lba * block_size;
 
@@ -387,9 +385,7 @@
 	}
 	
-	printf("test1.0\n");
 	uint32_t e_size = uint32_t_le2host(label->gpt->header->entry_size);
-	printf("test1.025\n");
 	size_t fillries = label->parts->fill > GPT_MIN_PART_NUM ? label->parts->fill : GPT_MIN_PART_NUM;
-	printf("test1.05\n");
+	
 	if (e_size != sizeof(gpt_entry_t))
 		return ENOTSUP;
@@ -400,5 +396,5 @@
 	label->gpt->header->first_usable_lba = host2uint64_t_le(gpt_space);
 	label->gpt->header->last_usable_lba = host2uint64_t_le(n_blocks - gpt_space - 1);
-	printf("test1.5\n");
+	
 	/* Perform checks */
 	gpt_part_foreach (label, p) {
@@ -408,6 +404,4 @@
 		if (!check_encaps(p, n_blocks, gpt_space)) {
 			rc = ERANGE;
-			printf("encaps with: %" PRIuOFF64 ", %" PRIu64 ", %" PRIu64 "\n", 
-			    n_blocks, gpt_space, gpt_get_end_lba(p));
 			goto fail;
 		}
@@ -419,6 +413,4 @@
 			if (gpt_get_part_type(p) != GPT_PTE_UNUSED) {
 				if (check_overlap(p, q)) {
-					printf("overlap with: %" PRIu64 ", %" PRIu64 "\n", 
-					    gpt_get_start_lba(p), gpt_get_start_lba(q));
 					rc = ERANGE;
 					goto fail;
@@ -427,10 +419,10 @@
 		}
 	}
-	printf("test1.6\n");
+	
 	label->gpt->header->pe_array_crc32 = host2uint32_t_le(compute_crc32(
 	                               (uint8_t *) label->parts->part_array,
 	                               fillries * e_size));
 	
-	printf("test1.7\n");
+	
 	/* Write to backup GPT partition array location */
 	rc = block_write_direct(dev_handle, n_blocks - arr_blocks - 1, 
@@ -438,5 +430,5 @@
 	if (rc != EOK)
 		goto fail;
-	printf("test1.8\n");
+	
 	/* Write to main GPT partition array location */
 	rc = block_write_direct(dev_handle, uint64_t_le2host(label->gpt->header->entry_lba),
@@ -444,5 +436,5 @@
 	if (rc != EOK)
 		goto fail;
-	printf("test1.9\n");
+	
 	return gpt_write_header(label, dev_handle);
 	
@@ -626,9 +618,4 @@
 	
 	for (i = 0; gpt_ptypes[i].guid != NULL; i++) {
-		//printf("%x =?= %x\n", p->part_type[3], get_byte(gpt_ptypes[i].guid +0));
-		//printf("%x =?= %x\n", p->part_type[2], get_byte(gpt_ptypes[i].guid +2));
-		//printf("%x =?= %x\n", p->part_type[1], get_byte(gpt_ptypes[i].guid +4));
-		//printf("%x =?= %x\n", p->part_type[0], get_byte(gpt_ptypes[i].guid +6));
-		//getchar();
 		if (p->part_type[3] == get_byte(gpt_ptypes[i].guid +0) &&
 			p->part_type[2] == get_byte(gpt_ptypes[i].guid +2) &&