diff --git a/include/l4/generic/capability.h b/include/l4/generic/capability.h
index b16feea..f25a44c 100644
--- a/include/l4/generic/capability.h
+++ b/include/l4/generic/capability.h
@@ -104,114 +104,4 @@ int cap_ipc_check(l4id_t to, l4id_t from,
 int cap_cap_check(struct ktcb *task, unsigned int req, unsigned int flags);
 int cap_mutex_check(unsigned long mutex_address, int mutex_op);
 
-#if 0
-/* Virtual memory space allocated to container */
-struct capability cap_virtmap = {
-	.capid = id_alloc(capids),
-	.resid = container_id,
-	.owner = pagerid,
-	.type = CAP_TYPE_VIRTMEM,
-	.access = 0, /* No access operations */
-	.start = 0xF0000000,
-	.end = 0xF1000000,
-	.size = 0x1000000
-};
-
-/* Physical memory space allocated to container */
-struct capability cap_physmap = {
-	.capid = id_alloc(capids),
-	.resid = container_id,
-	.owner = pagerid,
-	.type = CAP_TYPE_PHYSMEM,
-	.access = 0, /* No access operations */
-	.start = 0x0,
-	.end = 0x1000000,
-	.size = 0x1000000
-};
-
-/* IPC operations permitted on target thread */
-struct capability cap_ipc = {
-	.capid = id_alloc(capids),
-	.resid = target_tid,
-	.owner = tid,
-	.type = CAP_TYPE_IPC,
-	.access = CAP_IPC_SEND | CAP_IPC_RECV | CAP_IPC_FULL | CAP_IPC_SHORT | CAP_IPC_EXTENDED,
-	.start = 0xF0000000,
-	.end = 0xF1000000,
-	.size = 0x1000000
-};
-
-/* Thread control operations permitted on target thread */
-struct capability cap_thread_control = {
-	.capid = id_alloc(capids),
-	.resid = target_tid,
-	.owner = pagerid,
-	.type = CAP_TYPE_THREAD_CONTROL,
-	.access = CAP_THREAD_SUSPEND | CAP_THREAD_RUN | CAP_THREAD_RECYCLE | CAP_THREAD_CREATE | CAP_THREAD_DESTROY,
-	.start = 0,
-	.end = 0,
-	.size = 0,
-};
-
-/* Exregs operations permitted on target thread */
-struct capability cap_exregs = {
-	.capid = id_alloc(capids),
-	.resid = target_tid,
-	.owner = pagerid,
-	.type = CAP_TYPE_EXREGS,
-	.access = CAP_EXREGS_RW_PAGER | CAP_EXREGS_RW_SP | CAP_EXREGS_RW_PC | CAP_EXREGS_RW_UTCB | CAP_EXREGS_RW_OTHERS,
-	.start = 0,
-	.end = 0,
-	.size = 0
-};
-
-/* Number of threads allocated to container */
-struct capability cap_threads = {
-	.capid = id_alloc(capids),
-	.resid = container_id,
-	.owner = pagerid,
-	.type = CAP_TYPE_THREADS,
-	.access = 0,
-	.start = 0,
-	.end = 0,
-	.size = 256,
-};
-
-/* Number of spaces allocated to container */
-struct capability cap_spaces = {
-	.capid = id_alloc(capids),
-	.resid = container_id,
-	.owner = pagerid,
-	.type = CAP_TYPE_SPACES,
-	.access = 0,
-	.start = 0,
-	.end = 0,
-	.size = 128,
-};
-
-/* CPU time allocated to container */
-struct capability cap_cputime = {
-	.capid = id_alloc(capids),
-	.resid = container_id,
-	.owner = pagerid,
-	.type = CAP_TYPE_CPUTIME,
-	.access = 0,
-	.start = 0,
-	.end = 0,
-	.size = 55,	/* Percentage */
-};
-
-struct capability cap_cpuprio = {
-	.capid = id_alloc(capids),
-	.resid = container_id,
-	.owner = pagerid,
-	.type = CAP_TYPE_CPUPRIO,
-	.access = 0,
-	.start = 0,
-	.end = 0,
-	.size = 55,	/* Priority No */
-};
-
-#endif
-
 #endif /* __GENERIC_CAPABILITY_H__ */