diff --git a/SPPServer.cpp b/SPPServer.cpp
index eb1c47cf..8bc3a09f 100755
--- a/SPPServer.cpp
+++ b/SPPServer.cpp
@@ -20,7 +20,7 @@
 //#define EXTRADEBUG // Uncomment to get even more debugging data
 //#define PRINTREPORT // Uncomment to print the report sent to the Arduino
 
-SPPServer::SPPServer(BTD *p, const char *name, const char *pin, bool pair, uint8_t *addr) :
+SPPServer::SPPServer(BTD *p, const char *name, const char *pin) :
 SPPBase(p)
 {
         if(pBtd)
@@ -29,12 +29,6 @@ SPPBase(p)
         pBtd->btdName = name;
         pBtd->btdPin = pin;
 
-        if (addr) // Make sure address is set
-            pBtd->pairWithOtherDevice = pair;
-
-        for (uint8_t i = 0; i < 6; i++)
-            pBtd->remote_bdaddr[i] = addr[5 - i];
-
         /* Set device cid for the SDP and RFCOMM channelse */
         sdp_dcid[0] = 0x50; // 0x0050
         sdp_dcid[1] = 0x00;
diff --git a/SPPServer.h b/SPPServer.h
index 390d77d5..f544a51e 100755
--- a/SPPServer.h
+++ b/SPPServer.h
@@ -31,10 +31,8 @@ public:
          * @param  p     Pointer to BTD class instance.
          * @param  name  Set the name to BTD#btdName. If argument is omitted, then "Arduino" will be used.
          * @param  pin   Write the pin to BTD#btdPin. If argument is omitted, then "0000" will be used.
-         * @param  pair  Set this to true if you want to pair with a device.
-         * @param  addr  Set this to the address you want to connect to.
          */
-        SPPServer(BTD *p, const char *name = "Arduino", const char *pin = "0000", bool pair = false, uint8_t *addr = NULL);
+        SPPServer(BTD *p, const char *name = "Arduino", const char *pin = "0000");
 
         /** @name SPPBase implementation */
         /**