diff --git a/headers/private/input/kb_mouse_driver.h b/headers/private/input/kb_mouse_driver.h
index 6879b7d4a8..0f341d5b54 100644
--- a/headers/private/input/kb_mouse_driver.h
+++ b/headers/private/input/kb_mouse_driver.h
@@ -1,8 +1,6 @@
 //
 // kb_mouse_driver.h
 //
-
-
 #ifndef _KB_MOUSE_DRIVER_H
 #define _KB_MOUSE_DRIVER_H
 
@@ -13,10 +11,6 @@
 extern "C" {
 #endif
 
-
-
-// Be key numbers for various cool keys
-
 #define KEY_Scroll      0x0f
 #define KEY_Pause       0x10
 #define KEY_Num         0x22
@@ -42,9 +36,6 @@ extern "C" {
 
 #define KB_DEFAULT_CONTROL_ALT_DEL_TIMEOUT 4000000
 
-
-// ioctl codes
-
 enum {
 	KB_READ = B_DEVICE_OP_CODES_END,
 	KB_GET_KEYBOARD_ID,
@@ -56,7 +47,7 @@ enum {
 	KB_SET_KEY_REPEAT_DELAY,
 	KB_GET_KEY_REPEAT_DELAY,
 	KB_SET_CONTROL_ALT_DEL_TIMEOUT,
-	KB_RESERVED_1,						// was KB_ACKNOWLEDGE_CONTROL_ALT_DEL,
+	KB_RESERVED_1,
 	KB_CANCEL_CONTROL_ALT_DEL,
 	KB_DELAY_CONTROL_ALT_DEL,
 	
@@ -78,23 +69,20 @@ enum {
 };
 
 
-// structure passed to KB_READ
-
-typedef struct {                        // USB, ADB keyboards
+typedef struct {
 	bigtime_t       timestamp;
 	uint32          be_keycode;
 	bool            is_keydown;
 } raw_key_info;
 
-typedef struct {                        // AT keyboards
+
+typedef struct {
 	bigtime_t       timestamp;
-	uint8           scancode;       // high bit set for extended scancodes
+	uint8           scancode;
 	bool            is_keydown;
 } at_kbd_io;
 
 
-// structure passed to KB_SET_LEDS
-
 typedef struct {
 	bool    num_lock;
 	bool    caps_lock;
@@ -102,8 +90,6 @@ typedef struct {
 } led_info;
 
 
-#define mouse_settings_file "Mouse_settings"
-
 typedef struct {
   int32 	cookie;
   uint32 	buttons;
@@ -116,18 +102,6 @@ typedef struct {
   int32		wheel_xdelta;
 } mouse_movement;
 
-
-// On the Mac, the I-squared C bus is controlled by the Cuda microcontroller,
-// which also runs ADB.  Since we have not yet partitioned the driver into
-// a separate Cuda driver and a kb/mouse driver, the iic is controlled with
-// control calls to the kb_mouse driver.  Yuck.
-
-typedef struct {
-	char            device;
-	char            reg;
-	char            value;
-} iic_write;
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/headers/private/input/kb_mouse_settings.h b/headers/private/input/kb_mouse_settings.h
index 8e3801be19..513120875e 100644
--- a/headers/private/input/kb_mouse_settings.h
+++ b/headers/private/input/kb_mouse_settings.h
@@ -12,10 +12,6 @@
 extern "C" {
 #endif
 
-
-// keyboard settings info, as kept in settings file
-
-
 typedef struct {
 	bigtime_t       key_repeat_delay;
 	int32           key_repeat_rate;
@@ -23,12 +19,10 @@ typedef struct {
 
 #define kb_settings_file "Keyboard_settings"
 
-// mouse settings info
-
 typedef struct {
-	bool    enabled;        // Acceleration on / off
-	int32   accel_factor;   // accel factor: 256 = step by 1, 128 = step by 1/2
-	int32   speed;          // speed accelerator (1=1X, 2 = 2x)...
+	bool    enabled;
+	int32   accel_factor;
+	int32   speed;
 } mouse_accel;
 
 typedef struct {