From 952f6f5029a79780b7679e75d94c8f560e9ac496 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Thu, 30 Oct 2025 19:01:48 -0500
Subject: [PATCH] simplify

---
 esphome/components/climate/climate.cpp | 2 --
 esphome/components/climate/climate.h   | 8 ++------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/esphome/components/climate/climate.cpp b/esphome/components/climate/climate.cpp
index a9d42523d8..dc5b411eaf 100644
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -297,8 +297,6 @@ const optional<ClimateMode> &ClimateCall::get_mode() const { return this->mode_;
 const optional<ClimateFanMode> &ClimateCall::get_fan_mode() const { return this->fan_mode_; }
 const optional<ClimateSwingMode> &ClimateCall::get_swing_mode() const { return this->swing_mode_; }
 const optional<ClimatePreset> &ClimateCall::get_preset() const { return this->preset_; }
-const char *ClimateCall::get_custom_fan_mode() const { return this->custom_fan_mode_; }
-const char *ClimateCall::get_custom_preset() const { return this->custom_preset_; }
 
 optional<std::string> ClimateCall::get_custom_fan_mode() const {
   if (this->custom_fan_mode_ != nullptr) {
diff --git a/esphome/components/climate/climate.h b/esphome/components/climate/climate.h
index 49ea2a47a8..7f1ac0a4aa 100644
--- a/esphome/components/climate/climate.h
+++ b/esphome/components/climate/climate.h
@@ -110,12 +110,8 @@ class ClimateCall {
   const optional<ClimateFanMode> &get_fan_mode() const;
   const optional<ClimateSwingMode> &get_swing_mode() const;
   const optional<ClimatePreset> &get_preset() const;
-  const char *get_custom_fan_mode() const;
-  const char *get_custom_preset() const;
-  /// @deprecated Use get_custom_fan_mode() (returns const char*) instead (since 2025.11.0)
-  optional<std::string> get_custom_fan_mode_optional() const;
-  /// @deprecated Use get_custom_preset() (returns const char*) instead (since 2025.11.0)
-  optional<std::string> get_custom_preset_optional() const;
+  optional<std::string> get_custom_fan_mode() const;
+  optional<std::string> get_custom_preset() const;
 
  protected:
   void validate_();