diff --git a/src/kits/bluetooth/CommandManager.cpp b/src/kits/bluetooth/CommandManager.cpp
index 4affbc95c0..41e25b41ae 100644
--- a/src/kits/bluetooth/CommandManager.cpp
+++ b/src/kits/bluetooth/CommandManager.cpp
@@ -311,11 +311,11 @@ const char* bluetoothManufacturers[] = {
 	"Red-M (Communications) Ltd",
 	"Commil Ltd",
 	"Computer Access Technology Corporation (CATC)",
-	"Eclipse (HQ Espana) S.L.",
+	"Eclipse (HQ España) S.L.",
 	"Renesas Technology Corp.",
 	"Mobilian Corporation",
 	"Terax",
-	"Integßrated System Solution Corp.",
+	"Integerated System Solution Corp.",
 	"Matsushita Electric Industrial Co., Ltd.",
 	"Gennum Corporation",
 	"Research In Motion",
@@ -325,7 +325,7 @@ const char* bluetoothManufacturers[] = {
 	"Seiko Epson Corporation",
 	"Integrated Silicon Solution Taiwain, Inc.",
 	"CONWISE Technology Corporation Ltd",
-	"PARROTß SA",
+	"PARROT SA",
 	"Socket Communications",
 	"Atheros Communications, Inc.",
 	"MediaTek, Inc.",
@@ -355,21 +355,21 @@ const char* linkControlCommands[] = {
 	"PIN Code Request Reply",
 	"PIN Code Request Negative Reply",
 	"Change Connection Packet Type",
-	"not on 2.1",
+	"Reserved", // not on 2.1",
 	"Authentication Requested",
-	"not on 2.1",
+	"Reserved", // not on 2.1",
 	"Set Connection Encryption",
-	"not on 2.1",
+	"Reserved", // not on 2.1",
 	"Change Connection Link Key",
-	"not on 2.1",
+	"Reserved", // not on 2.1",
 	"Master Link Key",
-	"not on 2.1",
+	"Reserved", // not on 2.1",
 	"Remote Name Request",
 	"Cancel Remote Name Request",
 	"Read Remote Supported Features",
 	"Read Remote Extended Features",
 	"Read Remote Version Information",
-	"not on 2.1",
+	"Reserved", // not on 2.1",
 	"Read Clock Offset",
 	"Read LMP Handle",
 	"Reserved",
diff --git a/src/kits/bluetooth/DeviceClass.cpp b/src/kits/bluetooth/DeviceClass.cpp
index 4ca0f3ec8e..ab3e81595c 100644
--- a/src/kits/bluetooth/DeviceClass.cpp
+++ b/src/kits/bluetooth/DeviceClass.cpp
@@ -1,27 +1,12 @@
 /*
  * Copyright 2007-2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
- *
  * All rights reserved. Distributed under the terms of the MIT License.
- *
  */
 
-//#include <bluetooth/DiscoveryAgent.h>
-//#include <bluetooth/DiscoveryListener.h>
-//#include <bluetooth/RemoteDevice.h>
 #include <bluetooth/DeviceClass.h>
-//#include <bluetooth/bluetooth_error.h>
-//#include <bluetooth/HCI/btHCI_command.h>
-//#include <bluetooth/HCI/btHCI_event.h>
-//
-//#include <bluetoothserver_p.h>
-//#include <CommandManager.h>
-//
-//
-//#include "KitSupport.h"
 
 namespace Bluetooth {
 
-
 void
 DeviceClass::GetServiceClass(BString& serviceClass)
 {