diff --git a/Samples/CustomCapability/Service/Interface/RpcInterface.Idl b/Samples/CustomCapability/Service/Interface/RpcInterface.Idl
index 1b4b74ccd4..2c4f1d12a0 100644
--- a/Samples/CustomCapability/Service/Interface/RpcInterface.Idl
+++ b/Samples/CustomCapability/Service/Interface/RpcInterface.Idl
@@ -12,7 +12,7 @@
 import "oaidl.idl";
 import "unknwn.idl";
 
-[uuid (906B0CE0-C70B-1067-B317-00DD010662DA),
+[uuid (793F4B24-33C4-4378-BF77-52EC8172CBD4),
 version(1.0),
 pointer_default(unique),
 ]
diff --git a/Samples/CustomCapability/Service/Server/RpcServer.cpp b/Samples/CustomCapability/Service/Server/RpcServer.cpp
index 128f7f9b4a..e75ee3b61f 100644
--- a/Samples/CustomCapability/Service/Server/RpcServer.cpp
+++ b/Samples/CustomCapability/Service/Server/RpcServer.cpp
@@ -28,7 +28,6 @@ using namespace RpcServer;
 const WCHAR* CustomCapabilityName = L"microsoft.hsaTestCustomCapability_q536wpkpf5cy2";
 
 bool ShutdownRequested;
-static RPC_BINDING_VECTOR* BindingVector = nullptr;
 
 void FreeSidArray(__inout_ecount(cSIDs) PSID* pSIDs, ULONG cSIDs)
 {
@@ -184,24 +183,6 @@ DWORD RpcServerStart()
         goto end;
     }
 
-    hResult = RpcServerInqBindings(&BindingVector);
-
-    if (hResult != S_OK)
-    {
-        goto end;
-    }
-
-    hResult = RpcEpRegister(
-        RpcInterface_v1_0_s_ifspec,
-        BindingVector,
-        nullptr,
-        nullptr);
-
-    if (hResult != S_OK)
-    {
-        goto end;
-    }
-
     hResult = RpcServerListen(
         minCalls,
         RPC_C_LISTEN_MAX_CALLS_DEFAULT,
@@ -240,14 +221,6 @@ void RpcServerDisconnect()
     DWORD hResult = S_OK;
     ShutdownRequested = true;
     hResult = RpcServerUnregisterIf(RpcInterface_v1_0_s_ifspec, nullptr, 0);
-
-    RpcEpUnregister(RpcInterface_v1_0_s_ifspec, BindingVector, nullptr);
-
-    if (BindingVector != nullptr)
-    {
-        RpcBindingVectorFree(&BindingVector);
-        BindingVector = nullptr;
-    }
 }
 
 //