diff --git a/headers/private/kernel/vm_priv.h b/headers/private/kernel/vm_priv.h
index d197b85cce..664464713d 100644
--- a/headers/private/kernel/vm_priv.h
+++ b/headers/private/kernel/vm_priv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007, Haiku. All rights reserved.
+ * Copyright 2002-2008, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -12,21 +12,6 @@
 #include <vm_types.h>
 
 
-/* should make these scale with the system */
-#define DEFAULT_KERNEL_WORKING_SET  1024
-#define DEFAULT_WORKING_SET         256
-#define DEFAULT_MAX_WORKING_SET     65536
-#define DEFAULT_MIN_WORKING_SET     64
-
-#define WORKING_SET_INCREMENT       32
-#define WORKING_SET_DECREMENT       32
-
-#define PAGE_DAEMON_INTERVAL 500000
-#define PAGE_SCAN_QUANTUM 500
-#define WORKING_SET_ADJUST_INTERVAL 5000000
-#define MAX_FAULTS_PER_SECOND 100
-#define MIN_FAULTS_PER_SECOND 10
-
 #define WRITE_COUNT 1024
 #define READ_COUNT 1
 
diff --git a/headers/private/kernel/vm_types.h b/headers/private/kernel/vm_types.h
index 7a3ed561ba..22ff0f6d82 100644
--- a/headers/private/kernel/vm_types.h
+++ b/headers/private/kernel/vm_types.h
@@ -1,5 +1,5 @@
-/* 
- * Copyright 2002-2007, Axel Dörfler, axeld@pinc-software.de.
+/*
+ * Copyright 2002-2008, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -236,11 +236,6 @@ struct vm_address_space {
 	int32				ref_count;
 	int32				fault_count;
 	int32				state;
-	addr_t				scan_va;
-	addr_t				working_set_size;
-	addr_t				max_working_set;
-	addr_t				min_working_set;
-	bigtime_t			last_working_set_adjust;
 	struct vm_address_space *hash_next;
 };
 
diff --git a/src/system/kernel/vm/vm_address_space.cpp b/src/system/kernel/vm/vm_address_space.cpp
index e44e3936c8..bfa3e3871a 100644
--- a/src/system/kernel/vm/vm_address_space.cpp
+++ b/src/system/kernel/vm/vm_address_space.cpp
@@ -43,7 +43,6 @@ _dump_aspace(vm_address_space *aspace)
 	dprintf("id: 0x%lx\n", aspace->id);
 	dprintf("ref_count: %ld\n", aspace->ref_count);
 	dprintf("fault_count: %ld\n", aspace->fault_count);
-	dprintf("working_set_size: 0x%lx\n", aspace->working_set_size);
 	dprintf("translation_map: %p\n", &aspace->translation_map);
 	dprintf("base: 0x%lx\n", aspace->base);
 	dprintf("size: 0x%lx\n", aspace->size);
@@ -301,12 +300,6 @@ vm_create_address_space(team_id id, addr_t base, addr_t size,
 	addressSpace->ref_count = 1;
 	addressSpace->state = VM_ASPACE_STATE_NORMAL;
 	addressSpace->fault_count = 0;
-	addressSpace->scan_va = base;
-	addressSpace->working_set_size = kernel
-		? DEFAULT_KERNEL_WORKING_SET : DEFAULT_WORKING_SET;
-	addressSpace->max_working_set = DEFAULT_MAX_WORKING_SET;
-	addressSpace->min_working_set = DEFAULT_MIN_WORKING_SET;
-	addressSpace->last_working_set_adjust = system_time();
 
 	// initialize the corresponding translation map
 	status = arch_vm_translation_map_init_map(&addressSpace->translation_map,