Cleaned some old code in BluetoothHandler and ConnectionService