Index: boot/arch/ia64/loader/main.c
===================================================================
--- boot/arch/ia64/loader/main.c	(revision f58321c4042bfd9cc85a70809296594c96a72565)
+++ boot/arch/ia64/loader/main.c	(revision ef5de6de5ee6aded0e5af29f536b20fd00228502)
@@ -80,8 +80,4 @@
 	bootinfo_t *bootinfo=&binfo;
 	
-	//for(ii=0;ii<KERNEL_SIZE;ii++) ((char *)(0x100000))[ii] = ((char *)KERNEL_START)[ii+1];
-	
-	
-	//((int *)(0x100000))[0]++;
 	
 
Index: kernel/arch/ia64/Makefile.inc
===================================================================
--- kernel/arch/ia64/Makefile.inc	(revision f58321c4042bfd9cc85a70809296594c96a72565)
+++ kernel/arch/ia64/Makefile.inc	(revision ef5de6de5ee6aded0e5af29f536b20fd00228502)
@@ -89,5 +89,4 @@
 	ARCH_SOURCES += arch/$(ARCH)/src/ski/ski.c 
 	DEFS += -DSKI
-#	BFD = elf64-ia64-little
 	BFD = binary
 endif
Index: kernel/arch/ia64/src/ia64.c
===================================================================
--- kernel/arch/ia64/src/ia64.c	(revision f58321c4042bfd9cc85a70809296594c96a72565)
+++ kernel/arch/ia64/src/ia64.c	(revision ef5de6de5ee6aded0e5af29f536b20fd00228502)
@@ -75,5 +75,4 @@
 	/* Setup usermode init tasks. */
 
-//#ifdef I460GX
 	unsigned int i;
 	
@@ -84,24 +83,4 @@
 		init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
 	}
-/*
-#else	
-	init.cnt = 8;
-	init.tasks[0].addr = INIT0_ADDRESS;
-	init.tasks[0].size = INIT0_SIZE;
-	init.tasks[1].addr = INIT0_ADDRESS + 0x400000;
-	init.tasks[1].size = INIT0_SIZE;
-	init.tasks[2].addr = INIT0_ADDRESS + 0x800000;
-	init.tasks[2].size = INIT0_SIZE;
-	init.tasks[3].addr = INIT0_ADDRESS + 0xc00000;
-	init.tasks[3].size = INIT0_SIZE;
-	init.tasks[4].addr = INIT0_ADDRESS + 0x1000000;
-	init.tasks[4].size = INIT0_SIZE;
-	init.tasks[5].addr = INIT0_ADDRESS + 0x1400000;
-	init.tasks[5].size = INIT0_SIZE;
-	init.tasks[6].addr = INIT0_ADDRESS + 0x1800000;
-	init.tasks[6].size = INIT0_SIZE;
-	init.tasks[7].addr = INIT0_ADDRESS + 0x1c00000;
-	init.tasks[7].size = INIT0_SIZE;
-#endif*/
 }
 
Index: kernel/arch/ia64/src/mm/frame.c
===================================================================
--- kernel/arch/ia64/src/mm/frame.c	(revision f58321c4042bfd9cc85a70809296594c96a72565)
+++ kernel/arch/ia64/src/mm/frame.c	(revision ef5de6de5ee6aded0e5af29f536b20fd00228502)
@@ -41,11 +41,4 @@
 #include <macros.h>
 
-/*
- * This is Ski-specific and certainly not sufficient
- * for real ia64 systems that provide memory map.
- */
-#define MEMORY_SIZE	(256 * 1024 * 1024)
-#define MEMORY_BASE	(0 * 64 * 1024 * 1024)
-
 #define KERNEL_RESERVED_AREA_BASE (0x4400000)
 #define KERNEL_RESERVED_AREA_SIZE (16*1024*1024)
@@ -84,6 +77,4 @@
 		}
 		
-		//zone_create(MEMORY_BASE >> FRAME_WIDTH, SIZE2FRAMES(MEMORY_SIZE), (MEMORY_SIZE) >> FRAME_WIDTH, 0);
-	
 		/*
 		* Blacklist ROM regions.
Index: kernel/arch/ia64/src/mm/tlb.c
===================================================================
--- kernel/arch/ia64/src/mm/tlb.c	(revision f58321c4042bfd9cc85a70809296594c96a72565)
+++ kernel/arch/ia64/src/mm/tlb.c	(revision ef5de6de5ee6aded0e5af29f536b20fd00228502)
@@ -136,30 +136,24 @@
 		break;
 	case 1: /*cnt 4-15*/
-		/*cnt=((cnt-1)/4)+1;*/
 		ps = PAGE_WIDTH+2;
 		va &= ~((1<<ps)-1);
 		break;
 	case 2: /*cnt 16-63*/
-		/*cnt=((cnt-1)/16)+1;*/
 		ps = PAGE_WIDTH+4;
 		va &= ~((1<<ps)-1);
 		break;
 	case 3: /*cnt 64-255*/
-		/*cnt=((cnt-1)/64)+1;*/
 		ps = PAGE_WIDTH+6;
 		va &= ~((1<<ps)-1);
 		break;
 	case 4: /*cnt 256-1023*/
-		/*cnt=((cnt-1)/256)+1;*/
 		ps = PAGE_WIDTH+8;
 		va &= ~((1<<ps)-1);
 		break;
 	case 5: /*cnt 1024-4095*/
-		/*cnt=((cnt-1)/1024)+1;*/
 		ps = PAGE_WIDTH+10;
 		va &= ~((1<<ps)-1);
 		break;
 	case 6: /*cnt 4096-16383*/
-		/*cnt=((cnt-1)/4096)+1;*/
 		ps = PAGE_WIDTH+12;
 		va &= ~((1<<ps)-1);
@@ -167,15 +161,12 @@
 	case 7: /*cnt 16384-65535*/
 	case 8: /*cnt 65536-(256K-1)*/
-		/*cnt=((cnt-1)/16384)+1;*/
 		ps = PAGE_WIDTH+14;
 		va &= ~((1<<ps)-1);
 		break;
 	default:
-		/*cnt=((cnt-1)/(16384*16))+1;*/
 		ps=PAGE_WIDTH+18;
 		va&=~((1<<ps)-1);
 		break;
 	}
-	/*cnt+=(page!=va);*/
 	for(; va<(page+cnt*(PAGE_SIZE)); va += (1<<ps))	{
 		asm volatile (
@@ -503,6 +494,4 @@
 			uint64_t io_page=(va &  ((1<<IO_PAGE_WIDTH)-1)) >> (USPACE_IO_PAGE_WIDTH);
 			if(is_io_page_accessible(io_page)){
-				//printf("Insert %llX\n",va);
-
 				uint64_t page,frame;
 
@@ -522,8 +511,8 @@
 				entry.pl = PL_USER;
 				entry.ar = AR_READ | AR_WRITE;
-				entry.ppn = frame >> PPN_SHIFT;    //MUSIM spocitat frame
+				entry.ppn = frame >> PPN_SHIFT;
 				entry.ps = USPACE_IO_PAGE_WIDTH;
 	
-				dtc_mapping_insert(page, TASK->as->asid, entry); //Musim zjistit ASID
+				dtc_mapping_insert(page, TASK->as->asid, entry);
 				return 1;
 			}else {
Index: kernel/arch/ia64/src/smp/smp.c
===================================================================
--- kernel/arch/ia64/src/smp/smp.c	(revision f58321c4042bfd9cc85a70809296594c96a72565)
+++ kernel/arch/ia64/src/smp/smp.c	(revision ef5de6de5ee6aded0e5af29f536b20fd00228502)
@@ -103,5 +103,4 @@
 	myeid=ia64_get_cpu_eid();
 
-	//printf("Sending ipi %d on %d\n",ipi,CPU->id);
 	for(id=0;id<256;id++)
 		for(eid=0;eid<256;eid++)
@@ -150,7 +149,4 @@
 		        	if(cpu_by_id_eid_list[id][eid]!=0){
 		    			if(cpu_by_id_eid_list[id][eid]==1){
-		    		
-			    			//config.cpu_count++;
-				    		//cpu_by_id_eid_list[id][eid]=2;
 				    		printf("Found Late CPU ID:%d EDI:%d Not added to system!!!\n",id,eid);
 				    		continue;