diff --git a/examples/chef/common/clusters/keypad-input/KeypadInputManager.cpp b/examples/chef/common/clusters/keypad-input/KeypadInputManager.cpp
index 770df80b4ad9f7..8a3d82cb5aef18 100644
--- a/examples/chef/common/clusters/keypad-input/KeypadInputManager.cpp
+++ b/examples/chef/common/clusters/keypad-input/KeypadInputManager.cpp
@@ -23,6 +23,7 @@
 #include <app/util/config.h>
 
 using namespace chip;
+using namespace chip::app;
 using namespace chip::app::Clusters::KeypadInput;
 
 void KeypadInputManager::HandleSendKey(CommandResponseHelper<SendKeyResponseType> & helper, const CecKeyCodeType & keycCode)
@@ -101,11 +102,6 @@ void KeypadInputManager::HandleSendKey(CommandResponseHelper<SendKeyResponseType
 
 uint32_t KeypadInputManager::GetFeatureMap(chip::EndpointId endpoint)
 {
-    if (endpoint >= EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT)
-    {
-        return mDynamicEndpointFeatureMap;
-    }
-
     uint32_t featureMap = 0;
     Attributes::FeatureMap::Get(endpoint, &featureMap);
     return featureMap;
diff --git a/examples/chef/common/clusters/keypad-input/KeypadInputManager.h b/examples/chef/common/clusters/keypad-input/KeypadInputManager.h
index 66d43ed7ec8c6f..816adb9d896a51 100644
--- a/examples/chef/common/clusters/keypad-input/KeypadInputManager.h
+++ b/examples/chef/common/clusters/keypad-input/KeypadInputManager.h
@@ -20,19 +20,15 @@
 
 #include <app/clusters/keypad-input-server/keypad-input-server.h>
 
-using chip::app::CommandResponseHelper;
-using KeypadInputDelegate = chip::app::Clusters::KeypadInput::Delegate;
-using SendKeyResponseType = chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::Type;
-using CecKeyCodeType      = chip::app::Clusters::KeypadInput::CECKeyCodeEnum;
 
-class KeypadInputManager : public KeypadInputDelegate
+class KeypadInputManager : public chip::app::Clusters::KeypadInput::Delegate
 {
+using SendKeyResponseType = chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::Type;
+using CecKeyCodeType      = chip::app::Clusters::KeypadInput::CECKeyCodeEnum;
 public:
-    void HandleSendKey(CommandResponseHelper<SendKeyResponseType> & helper, const CecKeyCodeType & keyCode) override;
+    void HandleSendKey(chip::app::CommandResponseHelper<SendKeyResponseType> & helper, const CecKeyCodeType & keyCode) override;
 
     uint32_t GetFeatureMap(chip::EndpointId endpoint) override;
 
 private:
-    // TODO: set this based upon meta data from app
-    uint32_t mDynamicEndpointFeatureMap = 7;
 };