diff --git a/src/mm_machine.c b/src/mm_machine.c
index 146ec3b2..7d3fc30e 100644
--- a/src/mm_machine.c
+++ b/src/mm_machine.c
@@ -77,7 +77,7 @@ machine_create(char *name, machine_function_t function, void *arg)
 		}
 	}
 	mm_list_init(&machine->link);
-	mm_scheduler_init(&machine->scheduler, 2048 /* 16K */, machine);
+	mm_scheduler_init(&machine->scheduler, 2048 /* 16K */);
 	int rc;
 	rc = mm_loop_init(&machine->loop);
 	if (rc < 0) {
diff --git a/src/mm_scheduler.c b/src/mm_scheduler.c
index 78bf3278..c30a3189 100644
--- a/src/mm_scheduler.c
+++ b/src/mm_scheduler.c
@@ -22,7 +22,7 @@ mm_scheduler_main(void *arg)
 	mm_scheduler_yield(scheduler);
 }
 
-int mm_scheduler_init(mm_scheduler_t *scheduler, int size_stack, void *data)
+int mm_scheduler_init(mm_scheduler_t *scheduler, int size_stack)
 {
 	mm_list_init(&scheduler->list_ready);
 	mm_list_init(&scheduler->list_active);
@@ -32,7 +32,6 @@ int mm_scheduler_init(mm_scheduler_t *scheduler, int size_stack, void *data)
 	scheduler->count_active = 0;
 	scheduler->count_free   = 0;
 	scheduler->size_stack   = size_stack;
-	scheduler->data         = data;
 	mm_fiber_init(&scheduler->main);
 	scheduler->current      = &scheduler->main;
 	return 0;
diff --git a/src/mm_scheduler.h b/src/mm_scheduler.h
index 9c2fd4fa..ef533dce 100644
--- a/src/mm_scheduler.h
+++ b/src/mm_scheduler.h
@@ -20,7 +20,6 @@ struct mm_scheduler_t {
 	mm_list_t   list_free;
 	int         size_stack;
 	uint64_t    id_seq;
-	void       *data;
 };
 
 static inline mm_fiber_t*
@@ -33,7 +32,7 @@ mm_scheduler_online(mm_scheduler_t *scheduler) {
 	return scheduler->count_active + scheduler->count_ready;
 }
 
-int  mm_scheduler_init(mm_scheduler_t*, int, void*);
+int  mm_scheduler_init(mm_scheduler_t*, int);
 void mm_scheduler_free(mm_scheduler_t*);
 
 mm_fiber_t*