diff --git a/sys/i386/syscall.c b/sys/i386/syscall.c
index 960a1c2..82cad2d 100644
--- a/sys/i386/syscall.c
+++ b/sys/i386/syscall.c
@@ -27,9 +27,6 @@
  */
 
 #include <ubixos/syscall.h>
-/*
- #include <ubixos/syscalls.h>
- */
 #include <ubixos/sched.h>
 #include <ubixos/exec.h>
 #include <sys/elf.h>
@@ -184,30 +181,3 @@
   }
   return (0);
 }
-
-/*
- int invalidCallINT(int sys_call) {
- kprintf("Invalid Sys Call: [%i]\n",sys_call);
- return(0);
- }
-
-
- int invalidCall() {
- int sys_call;
-
- asm(
- "nop"
- : "=a" (sys_call)
- :
- );
-
- kprintf("Invalid System Call #[%i].1\n",sys_call);
- kpanic("PID: %i, File: %s, Line: %i", _curent->id, _FILE_, _LINE_);
- return(0);
- }
- */
-
-/***
- END
- ***/
-
diff --git a/sys/i386/systemtask.c b/sys/i386/systemtask.c
index f4c5c27..948fcbb 100644
--- a/sys/i386/systemtask.c
+++ b/sys/i386/systemtask.c
@@ -44,8 +44,9 @@
 static unsigned char *videoBuffer = (unsigned char *) 0xB8000;
 
 void systemTask() {
+
   mpi_message_t myMsg;
-  uInt32 counter = 0x0;
+  uint32_t counter = 0x0;
   int i = 0x0;
   int *x = 0x0;
   kTask_t *tmpTask = 0x0;
diff --git a/sys/i386/trap.c b/sys/i386/trap.c
index 8af89b9..8f09ccf 100644
--- a/sys/i386/trap.c
+++ b/sys/i386/trap.c
@@ -43,10 +43,6 @@
   die_if_kernel(str, regs, error_code); \
 }
 
-/*
-  trap_end_task(str, regs, error_code); \ 
-*/
-
 TRAP_CODE(0, SIGFPE, "divide error", divide_error, _current)
 TRAP_CODE(3, SIGTRAP, "int3", int3, _current)
 TRAP_CODE(4, SIGSEGV, "overflow", overflow, _current)
@@ -61,25 +57,21 @@
 TRAP_CODE(15, SIGSEGV, "reserved", reserved, _current)
 TRAP_CODE(17, SIGSEGV, "alignment check", alignment_check, _current)
 
-static void trap_end_task(char *string, struct trapframe *regs, long error_code) {
-  kprintf("S: %s[0x%X]", string, error_code);
-}
-
 #define FIRST_TSS_ENTRY 6
 #define VM_MASK 0x00020000
 
 #define store_TR(n) \
-__asm__("str %%ax\n\t" \
-        "subl %2,%%eax\n\t" \
-        "shrl $4,%%eax" \
-        :"=a" (n) \
-        :"0" (0),"i" (FIRST_TSS_ENTRY<<3))
+  __asm__("str %%ax\n\t" \
+          "subl %2,%%eax\n\t" \
+          "shrl $4,%%eax" \
+          :"=a" (n) \
+          :"0" (0),"i" (FIRST_TSS_ENTRY<<3))
 
 #define get_seg_long(seg,addr) ({ \
-register unsigned long __res; \
-__asm__("push %%fs;mov %%ax,%%fs;movl %%fs:%2,%%eax;pop %%fs" \
-	:"=a" (__res):"0" (seg),"m" (*(addr))); \
-__res;})
+  register unsigned long __res; \
+  __asm__("push %%fs;mov %%ax,%%fs;movl %%fs:%2,%%eax;pop %%fs" \
+	          :"=a" (__res):"0" (seg),"m" (*(addr))); \
+          __res;})
 
 #define get_seg_byte(seg,addr) ({ \
 register char __res; \
@@ -127,41 +119,6 @@
     kprintf("%08lx ", get_seg_long(ss, stack++));
   }
 
-#ifdef _IGNORE
-
-  kprintf("\nCall Trace: ");
-  stack = (unsigned long *)esp;
-  i = 1;
-
-#define VMALLOC_OFFSET (8*1024*1024)
-#define MODULE_RANGE (8*1024*1024)
-
-  module_start = ((numPages + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1));
-  module_end = module_start + MODULE_RANGE;
-
-  //while (((long) stack & 4095) != 0) {
-  while (i < 12) {
-    addr = get_seg_long(ss, stack++);
-    /*
-     * If the address is either in the text segment of the
-     * kernel, or in the region which contains vmalloc'ed
-     * memory, it *may* be the address of a calling
-     * routine; if so, print it so that someone tracing
-     * down the cause of the crash will be able to figure
-     * out the call path that was taken.
-     */
-    if (((addr >= (unsigned long) &kmain) && (addr <= (unsigned long) &_etext)) || ((addr >= module_start) && (addr <= module_end))) {
-      if (i && ((i % 8) == 0))
-      kprintf("\n       ");
-      kprintf("[<%08lx>] ", addr);
-      i++;
-    }
-  }
-
-  for (i = 0; i < 20; i++)
-  kprintf("%02x ", 0xff & get_seg_byte(regs->tf_cs, (i+(char *)regs->tf_eip)));
-  kprintf("\n");
-#endif
 }
 
 void trap(struct trapframe *frame) {
@@ -186,24 +143,7 @@
   cr2 = rcr2();
   kprintf("trap_code: %i(0x%X), EIP: 0x%X, CR2: 0x%X\n", frame->tf_trapno, frame->tf_trapno, frame->tf_eip, cr2);
 
-  //kpanic("trap_code: %i(0x%X), EIP: 0x%X, CR2: 0x%X\n", frame->tf_trapno, frame->tf_trapno, frame->tf_eip, cr2);
   die_if_kernel("trapCode", frame, frame->tf_trapno);
   endTask(_current->id);
   sched_yield();
-
-  /*
-   switch (trap_code) {
-   case 0xC:
-   cr2 = rcr2();
-   kprintf("trap_code: %i(0x%X), EIP: 0x%X, CR2: 0x%X\n", frame->tf_trapno, frame->tf_trapno, frame->tf_eip, cr2);
-   asm("sti"); // Turn Back On Ints!
-   vmm_pageFault(frame, cr2);
-   kprintf("Called page Fault\n");
-   default:
-   break;
-   }
-
-   kprintf("GOTTA RETURN!\n");
-   while(1);
-   */
 }
diff --git a/sys/include/ubixos/syscalls.h b/sys/include/ubixos/syscalls.h
index c6956a2..387d3d8 100644
--- a/sys/include/ubixos/syscalls.h
+++ b/sys/include/ubixos/syscalls.h
@@ -56,18 +56,6 @@
 
 /*
  *
- * Revamped Calls To C Function Style
- *
- */
-
-/*
- * Delete
- */
-
-int sysFwrite();
-
-/*
- *
  * Old Style Calls Need Updates
  *
  */
@@ -103,9 +91,6 @@
 int sysMpiFetchMessage();
 int sysMpiSpam();
 
-/* MrOlsen (2016-01-11) TEMP: */
-int freebsd6_mmap();
-
 typedef int (*functionPTR)();
 
 extern int totalCalls_old;
@@ -115,7 +100,3 @@
 extern struct syscall_entry systemCalls[];
 
 #endif
-
-/***
- END
- ***/