diff -r 0ba996a9b75d -r 613943a21004 bluetoothengine/bteng/inc/btengserver.h
--- a/bluetoothengine/bteng/inc/btengserver.h	Thu Aug 19 10:05:41 2010 +0300
+++ b/bluetoothengine/bteng/inc/btengserver.h	Tue Aug 31 15:25:10 2010 +0300
@@ -32,7 +32,6 @@
 class CBTEngSrvBBConnMgr;
 class CBTEngSrvKeyWatcher;
 class CBTEngSdpDbHandler;
-class CBTEngPairMan;
 class CPolicyServer;
 class TEComResolverParams;
 class CImplementationInformation;
@@ -150,14 +149,6 @@
     inline CBTEngSrvBBConnMgr* BasebandConnectionManager() const
             { return iBBConnMgr; }
 
-    /**
-     * Getter for pairing manager. Ownership is not transferred.
-     *
-     * @since Symbian^3
-     * @return Pointer to instance of baseband connection manager.
-     */
-    inline CBTEngPairMan* PairManager() const
-            { return iPairMan; }
 
     /**
      * Getter for socket server session.
@@ -170,16 +161,6 @@
             { return  iSocketServ; }
 
     /**
-     * Getter for registry server session.
-     * This handle can be used for creating subsessions.
-     *
-     * @since Symbian^3
-     * @return Reference to session with the registry server.
-     */
-    inline RBTRegServ& RegistrServer()
-            { return iBTRegServ; }
-
-    /**
      * Set Bluetooth on or off
      *
      * @since S60 v3.2
@@ -405,11 +386,6 @@
      * Callback for expiry of Simple Pairing debug mode.
      */
     TDeltaTimerEntry iDebugModeCallBack;
-
-    /**
-     * Pairing manager.
-     */
-    CBTEngPairMan* iPairMan;
     
     /**
     * Socket Server instance for this and other classes to access Bluetooth socket APIs.
@@ -417,11 +393,6 @@
     RSocketServ iSocketServ;
 
     /**
-    * Registry Server instance for bteng to access Bluetooth registry APIs.
-    */      
-    RBTRegServ iBTRegServ;
-
-    /**
      * Our state machine for handling power on/off.
      * Own.
      */