diff --git a/runtime/Makefile b/runtime/Makefile
index 9efc6db..bf961e0 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -19,10 +19,8 @@ CFLAGS += -D_GNU_SOURCE
 #CFLAGS += -DUSE_HTTP_UVIO #-DUSE_HTTP_SYNC
 #CFLAGS += -DUSE_SYSCALL
 #CFLAGS += -DPREEMPT_DISABLE
-CACHE_LINESIZE := $(shell getconf LEVEL1_DCACHE_LINESIZE)
 NCORES_CONF := $(shell getconf _NPROCESSORS_CONF)
 #todo:cross-compile
-CFLAGS += -DCACHELINE_SIZE=${CACHE_LINESIZE}
 CFLAGS += -DNCORES=${NCORES_CONF}
 #CFLAGS += -DNCORES=4
 CFLAGS += -DPAGE_SIZE=$(shell getconf PAGESIZE)
diff --git a/runtime/include/types.h b/runtime/include/types.h
index 4430110..a0f8af8 100644
--- a/runtime/include/types.h
+++ b/runtime/include/types.h
@@ -23,16 +23,11 @@
 #define INLINE __attribute__((always_inline))
 #define WEAK   __attribute__((weak))
 
-#ifndef CACHELINE_SIZE
-#define CACHELINE_SIZE 32
-#endif
-
 #ifndef PAGE_SIZE
 #define PAGE_SIZE (1 << 12)
 #endif
 
-#define CACHE_ALIGNED __attribute__((aligned(CACHELINE_SIZE)))
-#define PAGE_ALIGNED  __attribute__((aligned(PAGE_SIZE)))
+#define PAGE_ALIGNED __attribute__((aligned(PAGE_SIZE)))
 
 /* For this family of macros, do NOT pass zero as the pow2 */
 #define round_to_pow2(x, pow2)    (((unsigned long)(x)) & (~((pow2)-1)))
@@ -90,15 +85,6 @@ typedef void (*mod_mem_fn_t)(void);
 typedef void (*mod_tbl_fn_t)(void);
 typedef void (*mod_libc_fn_t)(i32, i32);
 
-typedef enum
-{
-	MOD_ARG_MODPATH = 0,
-	MOD_ARG_MODPORT,
-	MOD_ARG_MODNAME,
-	MOD_ARG_MODNARGS,
-	MOD_ARG_MAX,
-} mod_argindex_t;
-
 /**
  * debuglog is a macro that behaves based on the macros DEBUG and LOG_TO_FILE
  * If DEBUG is not set, debuglog does nothing