diff --git a/.github/workflows/php-cs-on-changes.yml b/.github/workflows/php-cs-on-changes.yml
index 94b82d7be..fedc8577c 100644
--- a/.github/workflows/php-cs-on-changes.yml
+++ b/.github/workflows/php-cs-on-changes.yml
@@ -16,7 +16,7 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        php: [7.4, 8.2]
+        php: [7.4, 8.3]
     name: Code sniff (PHP ${{ matrix.php }}, WP Latest)
     permissions:
       contents: read
diff --git a/.github/workflows/php-unit-tests.yml b/.github/workflows/php-unit-tests.yml
index dc1bec91e..a37abe4a6 100644
--- a/.github/workflows/php-unit-tests.yml
+++ b/.github/workflows/php-unit-tests.yml
@@ -30,7 +30,7 @@ jobs:
       WP_TESTS_DIR: "/tmp/wordpress/tests/phpunit"
     strategy:
       matrix:
-        php: [7.4, 8.0, 8.1, 8.2]
+        php: [7.4, 8.3]
         wp-version: [latest]
 
     steps:
diff --git a/changelog.txt b/changelog.txt
index 8f45f24ea..d52ab8f8a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,9 @@
 *** Facebook for WooCommerce Changelog ***
 
+= 3.2.0 - 2024-05-01 =
+* Tweak - PHP8.3 to GitHub PHPCS and Unit Tests workflows.
+* Update - Remove the sunsetted Messenger Chat feature.
+
 = 3.1.15 - 2024-04-16 =
 * Tweak - Replace the middleware URL from connect.woocommerce.com to api.woocommerce.com/integrations.
 * Tweak - Test environment setup to resolve notice.
diff --git a/class-wc-facebookcommerce.php b/class-wc-facebookcommerce.php
index 8602692d4..7c0c07159 100644
--- a/class-wc-facebookcommerce.php
+++ b/class-wc-facebookcommerce.php
@@ -181,7 +181,6 @@ public function init() {
 			include_once 'facebook-commerce.php';
 
 			require_once __DIR__ . '/includes/fbproductfeed.php';
-			require_once __DIR__ . '/facebook-commerce-messenger-chat.php';
 
 			$this->heartbeat = new Heartbeat( WC()->queue() );
 			$this->heartbeat->init();
diff --git a/facebook-commerce-messenger-chat.php b/facebook-commerce-messenger-chat.php
deleted file mode 100755
index 426234258..000000000
--- a/facebook-commerce-messenger-chat.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-// phpcs:ignoreFile
-/**
- * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
- *
- * This source code is licensed under the license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @package FacebookCommerce
- */
-
-use WooCommerce\Facebook\Locale;
-
-if ( ! class_exists( 'WC_Facebookcommerce_MessengerChat' ) ) :
-
-	if ( ! class_exists( 'WC_Facebookcommerce_Utils' ) ) {
-		include_once 'includes/fbutils.php';
-	}
-
-	/**
-	 * Messenger chat handler class.
-	 */
-	class WC_Facebookcommerce_MessengerChat {
-
-		/** @var string Facebook Page ID. */
-		private $page_id;
-
-		/** @var string|null JS SDK Version. */
-		private $jssdk_version;
-
-		/**
-		 * Class constructor.
-		 *
-		 * @param array $settings FB page settings array.
-		 */
-		public function __construct( $settings ) {
-
-			$this->page_id = isset( $settings['fb_page_id'] )
-				? $settings['fb_page_id']
-				: '';
-
-			$this->jssdk_version = isset( $settings['facebook_jssdk_version'] )
-				? $settings['facebook_jssdk_version']
-				: '';
-
-			add_action( 'wp_footer', array( $this, 'inject_messenger_chat_plugin' ) );
-		}
-
-		/**
-		 * __get method for backward compatibility.
-		 *
-		 * @param string $key property name
-		 * @return mixed
-		 * @since 3.0.32
-		 */
-		public function __get( $key ) {
-			// Add warning for private properties.
-			if ( in_array( $key, array( 'page_id', 'jssdk_version' ), true ) ) {
-				/* translators: %s property name. */
-				_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The %s property is private and should not be accessed outside its class.', 'facebook-for-woocommerce' ), esc_html( $key ) ), '3.0.32' );
-				return $this->$key;
-			}
-
-			return null;
-		}
-
-		/**
-		 * Outputs the Facebook Messenger chat script.
-		 *
-		 * @internal
-		 */
-		public function inject_messenger_chat_plugin() {
-
-			if ( facebook_for_woocommerce()->get_integration()->is_messenger_enabled() ) :
-
-				printf(
-					"
-					<div
-						attribution=\"fbe_woocommerce\"
-						class=\"fb-customerchat\"
-						page_id=\"%s\"
-					></div>
-					<!-- Facebook JSSDK -->
-					<script>
-					  window.fbAsyncInit = function() {
-					    FB.init({
-					      appId            : '',
-					      autoLogAppEvents : true,
-					      xfbml            : true,
-					      version          : '%s'
-					    });
-					  };
-
-					  (function(d, s, id){
-					      var js, fjs = d.getElementsByTagName(s)[0];
-					      if (d.getElementById(id)) {return;}
-					      js = d.createElement(s); js.id = id;
-					      js.src = 'https://connect.facebook.net/%s/sdk/xfbml.customerchat.js';
-					      fjs.parentNode.insertBefore(js, fjs);
-					    }(document, 'script', 'facebook-jssdk'));
-					</script>
-					<div></div>
-					",
-					esc_attr( $this->page_id ),
-					esc_js( $this->jssdk_version ?: 'v5.0' ),
-					esc_js( facebook_for_woocommerce()->get_integration()->get_messenger_locale() ?: 'en_US' )
-				);
-
-			endif;
-		}
-
-	}
-
-endif;
diff --git a/facebook-commerce.php b/facebook-commerce.php
index ca358cd6f..81113a46b 100644
--- a/facebook-commerce.php
+++ b/facebook-commerce.php
@@ -185,9 +185,6 @@ class WC_Facebookcommerce_Integration extends WC_Integration {
 	/** @var WC_Facebookcommerce_EventsTracker instance. */
 	private $events_tracker;
 
-	/** @var WC_Facebookcommerce_MessengerChat instance. */
-	private $messenger_chat;
-
 	/** @var WC_Facebookcommerce_Background_Process instance. */
 	private $background_processor;
 
@@ -360,14 +357,6 @@ public function __construct( WC_Facebookcommerce $facebook_for_woocommerce ) {
 			$this->events_tracker = new WC_Facebookcommerce_EventsTracker( $user_info, $aam_settings );
 		}
 
-		// Initialize the messenger chat features.
-		$this->messenger_chat = new WC_Facebookcommerce_MessengerChat(
-			array(
-				'fb_page_id'             => $this->get_facebook_page_id(),
-				'facebook_jssdk_version' => $this->get_js_sdk_version(),
-			)
-		);
-
 		// Update products on change of status.
 		add_action(
 			'transition_post_status',
@@ -400,7 +389,7 @@ public function __construct( WC_Facebookcommerce $facebook_for_woocommerce ) {
 	 */
 	public function __get( $key ) {
 		// Add warning for private properties.
-		if ( in_array( $key, array( 'events_tracker', 'messenger_chat', 'background_processor' ), true ) ) {
+		if ( in_array( $key, array( 'events_tracker', 'background_processor' ), true ) ) {
 			/* translators: %s property name. */
 			_doing_it_wrong( __FUNCTION__, sprintf( esc_html__( 'The %s property is private and should not be accessed outside its class.', 'facebook-for-woocommerce' ), esc_html( $key ) ), '3.0.32' );
 			return $this->$key;
@@ -717,7 +706,7 @@ public function load_assets() {
 		<script>
 			window.facebookAdsToolboxConfig = {
 				hasGzipSupport: '<?php echo extension_loaded( 'zlib' ) ? 'true' : 'false'; ?>',
-				enabledPlugins: ['MESSENGER_CHAT','INSTAGRAM_SHOP', 'PAGE_SHOP'],
+				enabledPlugins: ['INSTAGRAM_SHOP', 'PAGE_SHOP'],
 				enableSubscription: '<?php echo class_exists( 'WC_Subscriptions' ) ? 'true' : 'false'; ?>',
 				popupOrigin: '<?php echo isset( $_GET['url'] ) ? esc_js( sanitize_text_field( wp_unslash( $_GET['url'] ) ) ) : 'https://www.facebook.com/'; // phpcs:ignore WordPress.Security.NonceVerification.Recommended ?>',
 				feedWasDisabled: 'true',
@@ -2499,62 +2488,43 @@ public function get_product_description_mode() {
 	 * Gets the configured Facebook messenger locale.
 	 *
 	 * @since 1.10.0
+	 * @deprecated 3.2.0
 	 *
 	 * @return string
 	 */
 	public function get_messenger_locale() {
-		/**
-		 * Filters the configured Facebook messenger locale.
-		 *
-		 * @since 1.10.0
-		 *
-		 * @param string $locale the configured Facebook messenger locale
-		 * @param \WC_Facebookcommerce_Integration $integration the integration instance
-		 */
-		return (string) apply_filters( 'wc_facebook_messenger_locale', get_option( self::SETTING_MESSENGER_LOCALE, 'en_US' ), $this );
+		$this->messenger_doing_it_wrong();
+		return 'en_US';
 	}
 
 	/**
 	 * Gets the configured Facebook messenger greeting.
 	 *
 	 * @since 1.10.0
+	 * @deprecated 3.2.0
 	 *
 	 * @return string
 	 */
 	public function get_messenger_greeting() {
-		/**
-		 * Filters the configured Facebook messenger greeting.
-		 *
-		 * @since 1.10.0
-		 *
-		 * @param string $greeting the configured Facebook messenger greeting
-		 * @param \WC_Facebookcommerce_Integration $integration the integration instance
-		 */
-		$greeting = (string) apply_filters( 'wc_facebook_messenger_greeting', get_option( self::SETTING_MESSENGER_GREETING, __( "Hi! We're here to answer any questions you may have.", 'facebook-for-woocommerce' ) ), $this );
-		return Helper::str_truncate( $greeting, $this->get_messenger_greeting_max_characters(), '' );
+		$this->messenger_doing_it_wrong();
+		return Helper::str_truncate(
+			__( "Hi! We're here to answer any questions you may have.", 'facebook-for-woocommerce' ),
+			$this->get_messenger_greeting_max_characters(),
+			''
+		);
 	}
 
 	/**
 	 * Gets the maximum number of characters allowed in the messenger greeting.
 	 *
 	 * @since 1.10.0
+	 * @deprecated 3.2.0
 	 *
 	 * @return int
 	 */
 	public function get_messenger_greeting_max_characters() {
-		$default = 80;
-
-		/**
-		 * Filters the maximum number of characters allowed in the messenger greeting.
-		 *
-		 * @since 1.10.0
-		 *
-		 * @param int $max the maximum number of characters allowed in the messenger greeting
-		 * @param \WC_Facebookcommerce_Integration $integration the integration instance
-		 */
-		$max = (int) apply_filters( 'wc_facebook_messenger_greeting_max_characters', $default, $this );
-
-		return $max < 1 ? $default : $max;
+		$this->messenger_doing_it_wrong();
+		return 80;
 	}
 
 	/**
@@ -2563,19 +2533,13 @@ public function get_messenger_greeting_max_characters() {
 	 * This is used to style the messenger UI.
 	 *
 	 * @since 1.10.0
+	 * @deprecated 3.2.0
 	 *
 	 * @return string
 	 */
 	public function get_messenger_color_hex() {
-		/**
-		 * Filters the configured Facebook messenger color hex.
-		 *
-		 * @since 1.10.0
-		 *
-		 * @param string $hex the configured Facebook messenger color hex
-		 * @param \WC_Facebookcommerce_Integration $integration the integration instance
-		 */
-		return (string) apply_filters( 'wc_facebook_messenger_color_hex', get_option( self::SETTING_MESSENGER_COLOR_HEX, '#0084ff' ), $this );
+		$this->messenger_doing_it_wrong();
+		return '#0084ff';
 	}
 
 	/** Setter methods ************************************************************************************************/
@@ -2746,19 +2710,26 @@ public function is_legacy_feed_file_generation_enabled() {
 	 * Determines whether the Facebook messenger is enabled.
 	 *
 	 * @since 1.10.0
+	 * @deprecated 3.2.0
 	 *
 	 * @return bool
 	 */
 	public function is_messenger_enabled() {
-		/**
-		 * Filters whether the Facebook messenger is enabled.
-		 *
-		 * @since 1.10.0
-		 *
-		 * @param bool $is_enabled whether the Facebook messenger is enabled
-		 * @param \WC_Facebookcommerce_Integration $integration the integration instance
-		 */
-		return (bool) apply_filters( 'wc_facebook_is_messenger_enabled', 'yes' === get_option( self::SETTING_ENABLE_MESSENGER ), $this );
+		$this->messenger_doing_it_wrong();
+		return false;
+	}
+
+	/**
+	 * Show _doing_it_wrong for any deprecated public Messenger-related methods.
+	 *
+	 * @since 3.2.0
+	 */
+	private function messenger_doing_it_wrong() {
+		_doing_it_wrong(
+			__FUNCTION__,
+			esc_html__( 'The Facebook Messenger chat plugin was deprecated in May 2024.', 'facebook-for-woocommerce' ),
+			'3.2.0'
+		);
 	}
 
 	/**
diff --git a/facebook-for-woocommerce.php b/facebook-for-woocommerce.php
index bd7803b81..cf73b0548 100644
--- a/facebook-for-woocommerce.php
+++ b/facebook-for-woocommerce.php
@@ -11,7 +11,7 @@
  * Description: Grow your business on Facebook! Use this official plugin to help sell more of your products using Facebook. After completing the setup, you'll be ready to create ads that promote your products and you can also create a shop section on your Page where customers can browse your products on Facebook.
  * Author: Facebook
  * Author URI: https://www.facebook.com/
- * Version: 3.1.15
+ * Version: 3.2.0
  * Requires at least: 5.6
  * Text Domain: facebook-for-woocommerce
  * Tested up to: 6.5
@@ -44,7 +44,7 @@ class WC_Facebook_Loader {
 	/**
 	 * @var string the plugin version. This must be in the main plugin file to be automatically bumped by Woorelease.
 	 */
-	const PLUGIN_VERSION = '3.1.15'; // WRCS: DEFINED_VERSION.
+	const PLUGIN_VERSION = '3.2.0'; // WRCS: DEFINED_VERSION.
 
 	// Minimum PHP version required by this plugin.
 	const MINIMUM_PHP_VERSION = '7.4.0';
@@ -85,13 +85,11 @@ class WC_Facebook_Loader {
 	protected function __construct() {
 
 		register_activation_hook( __FILE__, array( $this, 'activation_check' ) );
-		register_deactivation_hook( __FILE__, array( $this, 'maybe_remove_messenger_deprecation_notice' ) );
 
 		add_action( 'admin_init', array( $this, 'check_environment' ) );
 
 		add_action( 'admin_notices', array( $this, 'add_plugin_notices' ) ); // admin_init is too early for the get_current_screen() function.
 		add_action( 'admin_notices', array( $this, 'admin_notices' ), 15 );
-		add_action( 'admin_notices', array( $this, 'maybe_show_messenger_deprecation_notice' ), 14 );
 
 		// If the environment check fails, initialize the plugin.
 		if ( $this->is_environment_compatible() ) {
@@ -298,36 +296,6 @@ public function add_plugin_notices() {
 
 	}
 
-	/**
-	 * Adds warning notice that Facebook Messenger will be deprecated if the setting is enabled.
-	 *
-	 * @since 3.1.13
-	 */
-	public function maybe_show_messenger_deprecation_notice() {
-		// Display the notice on the Facebook for WooCommerce settings pages (except Messenger settings, which has a static notice).
-		$notice_slug                   = 'facebook_messenger_deprecation_warning';
-		$is_facebook_admin             = isset( $_GET['page'] ) && 'wc-facebook' === $_GET['page'];
-		$is_messenger_settings         = isset( $_GET['tab'] ) && 'messenger' === $_GET['tab'];
-		$has_deprecation_notice_queued = class_exists( 'WC_Admin_Notices' ) && \WC_Admin_Notices::has_notice( $notice_slug );
-
-		if( $is_facebook_admin && ! $is_messenger_settings &&  $has_deprecation_notice_queued ) {
-			\WC_Admin_Notices::output_custom_notices();
-		}
-	}
-
-	/**
-	 * Removes facebook_messenger_deprecation_warning notice if it exists.
-	 *
-	 * @since 3.1.14
-	 * @return void
-	 */
-	public function maybe_remove_messenger_deprecation_notice() {
-		$notice_slug = 'facebook_messenger_deprecation_warning';
-		if( class_exists( 'WC_Admin_Notices' ) && \WC_Admin_Notices::has_notice( $notice_slug ) ) {
-			\WC_Admin_Notices::remove_notice( $notice_slug );
-		}
-	}
-
 
 	/**
 	 * Determines if the required plugins are compatible.
diff --git a/includes/API.php b/includes/API.php
index d301c43ef..d61a9fc40 100644
--- a/includes/API.php
+++ b/includes/API.php
@@ -279,22 +279,6 @@ public function get_business_configuration( $external_business_id ) {
 		return $this->perform_request( $request );
 	}
 
-
-	/**
-	 * Updates the messenger configuration.
-	 *
-	 * @param string                          $external_business_id external business ID
-	 * @param API\FBE\Configuration\Messenger $configuration messenger configuration
-	 * @return API\Response|API\FBE\Configuration\Update\Response
-	 * @throws ApiException
-	 */
-	public function update_messenger_configuration( string $external_business_id, API\FBE\Configuration\Messenger $configuration ): API\FBE\Configuration\Update\Response {
-		$request = new API\FBE\Configuration\Update\Request( $external_business_id );
-		$request->set_messenger_configuration( $configuration );
-		$this->set_response_handler( API\FBE\Configuration\Update\Response::class );
-		return $this->perform_request( $request );
-	}
-
 	/**
 	 * Updates the plugin version configuration.
 	 *
diff --git a/includes/API/FBE/Configuration/Messenger.php b/includes/API/FBE/Configuration/Messenger.php
deleted file mode 100644
index eff65e1cc..000000000
--- a/includes/API/FBE/Configuration/Messenger.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
- *
- * This source code is licensed under the license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @package FacebookCommerce
- */
-
-namespace WooCommerce\Facebook\API\FBE\Configuration;
-
-defined( 'ABSPATH' ) || exit;
-
-/**
- * The messenger configuration object.
- *
- * @linlk https://developers.facebook.com/docs/facebook-business-extension/fbe/reference#FBEMessengerChatConfigData
- */
-class Messenger {
-
-
-	/** @var bool whether messenger is enabled */
-	private $enabled;
-
-	/** @var string default locale */
-	private $default_locale;
-
-	/** @var string[] approved domains */
-	private $domains = array();
-
-
-	/**
-	 * Messenger constructor.
-	 *
-	 * @param array $data configuration data
-	 */
-	public function __construct( array $data = array() ) {
-
-		$data = wp_parse_args(
-			$data,
-			array(
-				'enabled'        => false,
-				'default_locale' => '',
-				'domains'        => array(),
-			)
-		);
-
-		$this->set_enabled( $data['enabled'] );
-		$this->set_default_locale( $data['default_locale'] );
-		$this->set_domains( $data['domains'] );
-	}
-
-
-	/**
-	 * Determines if messenger is enabled.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @return bool
-	 */
-	public function is_enabled() {
-
-		return $this->enabled;
-	}
-
-
-	/**
-	 * Gets the default locale.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @return string
-	 */
-	public function get_default_locale() {
-
-		return $this->default_locale;
-	}
-
-
-	/**
-	 * Gets the domains that messenger is configured for.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @return string[]
-	 */
-	public function get_domains() {
-
-		if ( is_array( $this->domains ) ) {
-			$domains = array_map( 'trailingslashit', $this->domains );
-		} else {
-			$domains = array();
-		}
-
-		return $domains;
-	}
-
-
-	/**
-	 * Sets whether messenger is enabled.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @param bool $is_enabled whether messenger is enabled
-	 */
-	public function set_enabled( $is_enabled ) {
-
-		$this->enabled = (bool) $is_enabled;
-	}
-
-
-	/**
-	 * Sets the default locale.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @param string $locale default locale
-	 */
-	public function set_default_locale( $locale ) {
-
-		$this->default_locale = (string) $locale;
-	}
-
-
-	/**
-	 * Adds a domain to the list of approved domains.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @param string $domain domain to add
-	 */
-	public function add_domain( $domain ) {
-
-		$domains = is_array( $this->domains ) ? $this->domains : array();
-
-		$domains[] = $domain;
-
-		$this->set_domains( $domains );
-	}
-
-
-	/**
-	 * Sets the list of approved domains.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @param string[] $domains list of domains
-	 */
-	public function set_domains( array $domains ) {
-
-		$this->domains = array_unique( array_filter( $domains, 'wc_is_valid_url' ) );
-	}
-
-
-}
diff --git a/includes/API/FBE/Configuration/Read/Response.php b/includes/API/FBE/Configuration/Read/Response.php
index f5af09639..5e4884e45 100644
--- a/includes/API/FBE/Configuration/Read/Response.php
+++ b/includes/API/FBE/Configuration/Read/Response.php
@@ -11,14 +11,6 @@
  * FBE Configuration API read response object.
  */
 class Response extends API\Response {
-	/**
-	 * Gets the messenger configuration object.
-	 *
-	 * @return API\FBE\Configuration\Messenger
-	 */
-	public function get_messenger_configuration(): API\FBE\Configuration\Messenger {
-		return new API\FBE\Configuration\Messenger( $this->response_data['messenger_chat'] ?? [] );
-	}
 
 	/**
 	 * Is Instagram Shopping enabled?
diff --git a/includes/API/FBE/Configuration/Update/Request.php b/includes/API/FBE/Configuration/Update/Request.php
index d15c472f2..a3c76af72 100644
--- a/includes/API/FBE/Configuration/Update/Request.php
+++ b/includes/API/FBE/Configuration/Update/Request.php
@@ -36,23 +36,6 @@ public function __construct( $external_business_id ) {
 	}
 
 
-	/**
-	 * Sets the messenger configuration.
-	 *
-	 * Only the enabled and domains values are able to accept updates right now.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @param Configuration\Messenger $configuration messenger configuration object
-	 */
-	public function set_messenger_configuration( Configuration\Messenger $configuration ) {
-
-		$this->data['messenger_chat'] = array(
-			'enabled' => $configuration->is_enabled(),
-			'domains' => $configuration->get_domains(),
-		);
-	}
-
 	/**
 	 * Sets the plugin version for configuration update request.
 	 *
diff --git a/includes/Admin/Settings.php b/includes/Admin/Settings.php
index dd709f37e..9e34b4aa9 100644
--- a/includes/Admin/Settings.php
+++ b/includes/Admin/Settings.php
@@ -78,7 +78,6 @@ private function build_menu_item_array( bool $is_connected ): array {
 		$screens = array(
 			Settings_Screens\Product_Sync::ID => new Settings_Screens\Product_Sync(),
 			Settings_Screens\Product_Sets::ID => new Settings_Screens\Product_Sets(),
-			Settings_Screens\Messenger::ID    => new Settings_Screens\Messenger(),
 		);
 
 		return array_merge( array_merge( $first, $screens ), $last );
@@ -183,9 +182,6 @@ private function connect_to_enhanced_admin( $screen_id ) {
 					case Connection::ID:
 						$crumbs[] = __( 'Connection', 'facebook-for-woocommerce' );
 						break;
-					case Settings_Screens\Messenger::ID:
-						$crumbs[] = __( 'Messenger', 'facebook-for-woocommerce' );
-						break;
 					case Settings_Screens\Product_Sync::ID:
 						$crumbs[] = __( 'Product sync', 'facebook-for-woocommerce' );
 						break;
diff --git a/includes/Admin/Settings_Screens/Messenger.php b/includes/Admin/Settings_Screens/Messenger.php
deleted file mode 100644
index b4e62bf21..000000000
--- a/includes/Admin/Settings_Screens/Messenger.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-// phpcs:ignoreFile
-/**
- * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
- *
- * This source code is licensed under the license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @package FacebookCommerce
- */
-
-namespace WooCommerce\Facebook\Admin\Settings_Screens;
-
-defined( 'ABSPATH' ) or exit;
-
-use WooCommerce\Facebook\Admin\Abstract_Settings_Screen;
-use WooCommerce\Facebook\Framework\Api\Exception as ApiException;
-use WooCommerce\Facebook\Framework\Helper;
-use WooCommerce\Facebook\Framework\Plugin\Exception as PluginException;
-use WooCommerce\Facebook\Locale;
-
-/**
- * The Messenger settings screen object.
- */
-class Messenger extends Abstract_Settings_Screen {
-
-
-	/** @var string screen ID */
-	const ID = 'messenger';
-
-
-	/**
-	 * Connection constructor.
-	 */
-	public function __construct() {
-		$this->id          = self::ID;
-		$this->label       = __( 'Messenger', 'facebook-for-woocommerce' );
-		$this->title       = __( 'Messenger', 'facebook-for-woocommerce' );
-		$this->description = $this->get_deprecation_warning();
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ) );
-		add_action( 'woocommerce_admin_field_messenger_locale', array( $this, 'render_locale_field' ) );
-		add_action( 'woocommerce_admin_field_messenger_greeting', array( $this, 'render_greeting_field' ) );
-	}
-
-
-	/**
-	 * Enqueues the assets.
-	 *
-	 * @internal
-	 *
-	 * @since 2.0.0
-	 */
-	public function enqueue_assets() {
-		// TODO: empty for now, until we add more robust Messenger settings {CW 2020-06-17}
-	}
-
-
-	/**
-	 * Renders the custom locale field.
-	 *
-	 * @internal
-	 *
-	 * @since 2.0.0
-	 *
-	 * @param array $field field data
-	 */
-	public function render_locale_field( $field ) {
-
-		$configured_locale = get_option( \WC_Facebookcommerce_Integration::SETTING_MESSENGER_LOCALE, '' );;
-		$supported_locales = Locale::get_supported_locales();
-		if ( ! empty( $supported_locales[ $configured_locale ] ) ) {
-			$configured_locale = $supported_locales[ $configured_locale ];
-		}
-		?>
-		<tr valign="top">
-			<th scope="row" class="titledesc">
-				<label for="<?php echo esc_attr( $field['id'] ); ?>"><?php echo esc_html( $field['title'] ); ?></label>
-			</th>
-			<td class="forminp forminp-<?php echo esc_attr( sanitize_title( $field['type'] ) ); ?>">
-				<p>
-					<?php echo esc_html( $configured_locale ); ?>
-				</p>
-			</td>
-		</tr>
-		<?php
-	}
-
-
-	/**
-	 * Renders the custom greeting field.
-	 *
-	 * @internal
-	 *
-	 * @since 2.0.0
-	 *
-	 * @param array $field field data
-	 */
-	public function render_greeting_field( $field ) {
-		?>
-		<tr valign="top">
-			<th scope="row" class="titledesc">
-				<label for="<?php echo esc_attr( $field['id'] ); ?>"><?php echo esc_html( $field['title'] ); ?></label>
-			</th>
-			<td class="forminp forminp-<?php echo esc_attr( sanitize_title( $field['type'] ) ); ?>">
-				<p>
-					<?php
-					printf(
-						/* translators: Placeholders: %1$s - <a> tag, %2$s - </a> tag */
-						esc_html__( '%1$sClick here%2$s to manage your Messenger greeting and colors.', 'facebook-for-woocommerce' ),
-						'<a href="' . esc_url( facebook_for_woocommerce()->get_connection_handler()->get_manage_url() ) . '" target="_blank">',
-						'</a>'
-					);
-					?>
-				</p>
-			</td>
-		</tr>
-		<?php
-	}
-
-
-	/**
-	 * Gets the screen settings.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @return array
-	 */
-	public function get_settings() {
-		$is_enabled = get_option( \WC_Facebookcommerce_Integration::SETTING_ENABLE_MESSENGER, 'no' );
-		$settings = array(
-			array(
-				'title' => __( 'Messenger', 'facebook-for-woocommerce' ),
-				'type'  => 'title',
-			),
-			array(
-				'id'      => \WC_Facebookcommerce_Integration::SETTING_ENABLE_MESSENGER,
-				'title'   => __( 'Enable Messenger', 'facebook-for-woocommerce' ),
-				'type'    => 'checkbox',
-				'desc'    => __( 'Enable and customize Facebook Messenger on your store', 'facebook-for-woocommerce' ),
-				'default' => 'no',
-				'value'   => $is_enabled,
-			),
-		);
-		// only add the static configuration display if messenger is enabled
-		if ( 'yes' === $is_enabled ) {
-			$settings[] = array(
-				'title' => __( 'Language', 'facebook-for-woocommerce' ),
-				'type'  => 'messenger_locale',
-			);
-			$settings[] = array(
-				'title' => __( 'Greeting & Colors', 'facebook-for-woocommerce' ),
-				'type'  => 'messenger_greeting',
-			);
-		}
-		$settings[] = array( 'type' => 'sectionend' );
-		return $settings;
-	}
-
-
-	/**
-	 * Gets the upcoming deprecation warning notice.
-	 *
-	 * @since 3.1.13
-	 *
-	 * @return string
-	 */
-	public function get_deprecation_warning() {
-		return '<div class="notice notice-warning"><p>' . self::get_deprecation_message() . '</p></div>';
-	}
-
-	/**
-	 * Gets the upcoming deprecation warning message with documentation link.
-	 *
-	 * @since 3.1.13
-	 *
-	 * @return string
-	 */
-	public static function get_deprecation_message() {
-		return sprintf(
-			/* translators: Placeholders: %1$s - <a> tag, %2$s - </a> tag */
-			__( '️<strong>Facebook for WooCommerce</strong>: Since %1$sMeta plans to discontinue the Chat Plugin%2$s, the Messenger feature will be removed by May, 2024.', 'facebook-for-woocommerce' ),
-			'<a href="https://www.facebook.com/business/help/1661027437357021" target="_blank">',
-			'</a>'
-		);
-	}
-
-
-	/**
-	 * Gets the "disconnected" message.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @return string
-	 */
-	public function get_disconnected_message() {
-		return sprintf(
-			/* translators: Placeholders: %1$s - <a> tag, %2$s - </a> tag */
-			__( 'Please %1$sconnect to Facebook%2$s to enable and manage Facebook Messenger.', 'facebook-for-woocommerce' ),
-			'<a href="' . esc_url( facebook_for_woocommerce()->get_connection_handler()->get_connect_url() ) . '">',
-			'</a>'
-		);
-	}
-
-	/**
-	 * Saves the settings.
-	 *
-	 * This is overridden to pull the latest from FBE and update that remotely via API
-	 *
-	 * @since 2.0.0
-	 *
-	 * @throws PluginException
-	 */
-	public function save() {
-		$plugin               = facebook_for_woocommerce();
-		$external_business_id = $plugin->get_connection_handler()->get_external_business_id();
-		try {
-			// first get the latest configuration details
-			$response = $plugin->get_api()->get_business_configuration( $external_business_id );
-			$configuration = $response->get_messenger_configuration();
-			if ( ! $configuration ) {
-				throw new ApiException( 'Could not retrieve latest messenger configuration' );
-			}
-			$update          = false;
-			$setting_enabled = wc_string_to_bool( Helper::get_posted_value( \WC_Facebookcommerce_Integration::SETTING_ENABLE_MESSENGER ) );
-			// only consider updating if the setting has changed
-			if ( $setting_enabled !== $configuration->is_enabled() ) {
-				$update = true;
-			}
-			// also consider updating if the site's URL was removed from approved URLs
-			if ( ! in_array( home_url( '/' ), $configuration->get_domains(), true ) ) {
-				$update = true;
-			}
-			// make the API call if settings have changed
-			if ( $update ) {
-				$configuration->set_enabled( $setting_enabled );
-				$configuration->add_domain( home_url( '/' ) );
-
-				try {
-					$plugin->get_api()->update_messenger_configuration( $external_business_id, $configuration );
-					update_option( \WC_Facebookcommerce_Integration::SETTING_ENABLE_MESSENGER, wc_bool_to_string( $configuration->is_enabled() ) );
-					if ( $default_locale = $configuration->get_default_locale() ) {
-						update_option( \WC_Facebookcommerce_Integration::SETTING_MESSENGER_LOCALE, $default_locale );
-					}
-				} catch ( ApiException $exception ) {
-					// always log this error, regardless of debug setting
-					$plugin->log( 'Could not display messenger settings. ' . $exception->getMessage() );
-				}
-
-				delete_transient( 'wc_facebook_business_configuration_refresh' );
-			}
-			// save any real settings
-			parent::save();
-		} catch ( ApiException $exception ) {
-			// always log this error, regardless of debug setting
-			$plugin->log( 'Could not update remote messenger settings. ' . $exception->getMessage() );
-			throw new PluginException( __( 'Please try again.', 'facebook-for-woocommerce' ) );
-		}
-	}
-}
diff --git a/includes/Admin/Settings_Screens/Product_Sync.php b/includes/Admin/Settings_Screens/Product_Sync.php
index 670860430..57bc7d862 100644
--- a/includes/Admin/Settings_Screens/Product_Sync.php
+++ b/includes/Admin/Settings_Screens/Product_Sync.php
@@ -20,7 +20,7 @@
 use WooCommerce\Facebook\Products\Sync;
 
 /**
- * The Messenger settings screen object.
+ * The Product Sync settings screen object.
  */
 class Product_Sync extends Abstract_Settings_Screen {
 
diff --git a/includes/Handlers/Connection.php b/includes/Handlers/Connection.php
index 551dd6bbe..263e9b0b6 100644
--- a/includes/Handlers/Connection.php
+++ b/includes/Handlers/Connection.php
@@ -901,15 +901,6 @@ private function get_connect_parameters_extras() {
 		if ( $external_merchant_settings_id = facebook_for_woocommerce()->get_integration()->get_external_merchant_settings_id() ) {
 			$parameters['setup']['merchant_settings_id'] = $external_merchant_settings_id;
 		}
-		// if messenger was previously enabled
-		if ( facebook_for_woocommerce()->get_integration()->is_messenger_enabled() ) {
-			$parameters['business_config']['messenger_chat'] = array(
-				'enabled' => true,
-				'domains' => array(
-					home_url( '/' ),
-				),
-			);
-		}
 		return $parameters;
 	}
 
diff --git a/includes/Lifecycle.php b/includes/Lifecycle.php
index 2789e31ff..e6410dc3d 100644
--- a/includes/Lifecycle.php
+++ b/includes/Lifecycle.php
@@ -41,7 +41,8 @@ public function __construct( Framework\Plugin $plugin ) {
 			'2.0.4',
 			'2.4.0',
 			'2.5.0',
-			'3.1.13'
+			'3.1.13',
+			'3.2.0'
 		);
 	}
 
@@ -322,4 +323,24 @@ protected function upgrade_to_3_1_13() {
 
 		}
 	}
+
+	/**
+	 * Removes the messenger deprecation notice on upgrade to 3.2.0.
+	 *
+	 * @since 3.2.0
+	 */
+	protected function upgrade_to_3_2_0() {
+		// Remove the Messenger deprecation notice.
+		$notice_slug = 'facebook_messenger_deprecation_warning';
+		if( class_exists( 'WC_Admin_Notices' ) && \WC_Admin_Notices::has_notice( $notice_slug ) ) {
+			\WC_Admin_Notices::remove_notice( $notice_slug );
+		}
+
+		// Delete all messenger options
+		delete_option( \WC_Facebookcommerce_Integration::SETTING_ENABLE_MESSENGER );
+		delete_option( \WC_Facebookcommerce_Integration::SETTING_MESSENGER_LOCALE );
+		delete_option( \WC_Facebookcommerce_Integration::SETTING_MESSENGER_GREETING );
+		delete_option( \WC_Facebookcommerce_Integration::SETTING_MESSENGER_COLOR_HEX );
+	}
+
 }
diff --git a/includes/Utilities/Tracker.php b/includes/Utilities/Tracker.php
index 9d38e55bc..9d19d1832 100644
--- a/includes/Utilities/Tracker.php
+++ b/includes/Utilities/Tracker.php
@@ -120,8 +120,6 @@ public function add_tracker_data( array $data = [] ) {
 		 */
 		$product_sync_enabled = facebook_for_woocommerce()->get_integration()->is_product_sync_enabled();
 		$data['extensions']['facebook-for-woocommerce']['product-sync-enabled'] = wc_bool_to_string( $product_sync_enabled );
-		$messenger_enabled = facebook_for_woocommerce()->get_integration()->is_messenger_enabled();
-		$data['extensions']['facebook-for-woocommerce']['messenger-enabled'] = wc_bool_to_string( $messenger_enabled );
 
 		/**
 		 * How long did the last feed generation take (or did it fail - 0)? This counts just the time when the batches have been generated.
diff --git a/package-lock.json b/package-lock.json
index ab995cdd1..9dd8c3cb7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "facebook-for-woocommerce",
-  "version": "3.1.15",
+  "version": "3.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index a2a89a9ef..ab88ee00e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "facebook-for-woocommerce",
-  "version": "3.1.15",
+  "version": "3.2.0",
   "author": "Facebook",
   "homepage": "https://woo.com/products/facebook/",
   "license": "GPL-2.0",
diff --git a/readme.txt b/readme.txt
index 4b7f81af3..1215f77a6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: facebook, automattic, woothemes
 Tags: facebook, woocommerce, marketing, product catalog feed, pixel
 Requires at least: 4.4
 Tested up to: 6.5
-Stable tag: 3.1.15
+Stable tag: 3.2.0
 Requires PHP: 5.6 or greater
 MySQL: 5.6 or greater
 License: GPLv2 or later
@@ -40,6 +40,10 @@ When opening a bug on GitHub, please give us as many details as possible.
 
 == Changelog ==
 
+= 3.2.0 - 2024-05-01 =
+* Tweak - PHP8.3 to GitHub PHPCS and Unit Tests workflows.
+* Update - Remove the sunsetted Messenger Chat feature.
+
 = 3.1.15 - 2024-04-16 =
 * Tweak - Replace the middleware URL from connect.woocommerce.com to api.woocommerce.com/integrations.
 * Tweak - Test environment setup to resolve notice.
diff --git a/tests/Unit/ApiTest.php b/tests/Unit/ApiTest.php
index 559db7f56..961483d8c 100644
--- a/tests/Unit/ApiTest.php
+++ b/tests/Unit/ApiTest.php
@@ -2,7 +2,6 @@
 declare( strict_types=1 );
 
 use WooCommerce\Facebook\API;
-use WooCommerce\Facebook\API\FBE\Configuration\Messenger;
 use WooCommerce\Facebook\Framework\Api\Exception as ApiException;
 
 /**
@@ -208,7 +207,7 @@ public function test_get_business_configuration_returns_business_configuration_r
 			$this->assertEquals( 'GET', $parsed_args['method'] );
 			$this->assertEquals( "{$this->endpoint}{$this->version}/fbe_business?fbe_external_business_id={$external_business_id}", $url );
 			return [
-				'body'     => '{"business":{"name":"WordPress-Facebook"},"catalogs":[{"feature_instance_id":"562415265365817","enabled":true}],"catalog_feed_scheduled":{"enabled":false},"fb_shops":[{"feature_instance_id":"554457382898066","enabled":true}],"ig_cta":{"enabled":false},"ig_shopping":{"enabled":false},"messenger_chat":{"enabled":false},"messenger_chats":[{"enabled":false}],"messenger_menu":{"enabled":false},"page_card":{"enabled":false},"page_cta":{"enabled":false},"page_post":{"enabled":false},"page_shop":{"enabled":false},"pixels":[{"feature_instance_id":"762898101511280","enabled":true}],"thread_intent":{"enabled":false}}',
+				'body'     => '{"business":{"name":"WordPress-Facebook"},"catalogs":[{"feature_instance_id":"562415265365817","enabled":true}],"catalog_feed_scheduled":{"enabled":false},"fb_shops":[{"feature_instance_id":"554457382898066","enabled":true}],"ig_cta":{"enabled":false},"ig_shopping":{"enabled":false},"page_card":{"enabled":false},"page_cta":{"enabled":false},"page_post":{"enabled":false},"page_shop":{"enabled":false},"pixels":[{"feature_instance_id":"762898101511280","enabled":true}],"thread_intent":{"enabled":false}}',
 				'response' => [
 					'code'    => 200,
 					'message' => 'OK',
@@ -219,48 +218,10 @@ public function test_get_business_configuration_returns_business_configuration_r
 
 		$response = $this->api->get_business_configuration( $external_business_id );
 
-		$configuration = $response->get_messenger_configuration();
-
-		$this->assertFalse( $configuration->is_enabled() );
 		$this->assertFalse( $response->is_ig_shopping_enabled() );
 		$this->assertFalse( $response->is_ig_cta_enabled() );
 	}
 
-	/**
-	 * Tests update messenger configuration sends data to Facebook.
-	 *
-	 * @return void
-	 * @throws ApiException In case of network request error.
-	 */
-	public function test_update_messenger_configuration_sends_message_configuration_update_request() {
-		$external_business_id = 'wordpress-facebook-62c3f1add134a';
-		$configuration        = new Messenger(
-			[
-				'enabled'        => true,
-				'default_locale' => '',
-				'domains'        => [ 'https://wordpress-facebook.ddev.site/' ],
-			]
-		);
-
-		$response = function( $result, $parsed_args, $url ) use ( $external_business_id ) {
-			$this->assertEquals( 'POST', $parsed_args['method'] );
-			$this->assertEquals( "{$this->endpoint}{$this->version}/fbe_business?fbe_external_business_id={$external_business_id}", $url );
-			$this->assertEquals( '{"fbe_external_business_id":"' . $external_business_id . '","messenger_chat":{"enabled":true,"domains":["https:\/\/wordpress-facebook.ddev.site\/"]}}', $parsed_args['body'] );
-			return [
-				'body'     => '{"success":true}',
-				'response' => [
-					'code'    => 200,
-					'message' => 'OK',
-				],
-			];
-		};
-		add_filter( 'pre_http_request', $response, 10, 3 );
-
-		$response = $this->api->update_messenger_configuration( $external_business_id, $configuration );
-
-		$this->assertTrue( $response->success );
-	}
-
 	/**
 	 * Tests send item updates sends updates to Facebook.
 	 *
diff --git a/tests/Unit/WCFacebookCommerceIntegrationTest.php b/tests/Unit/WCFacebookCommerceIntegrationTest.php
index cabb9837e..0dcc65317 100644
--- a/tests/Unit/WCFacebookCommerceIntegrationTest.php
+++ b/tests/Unit/WCFacebookCommerceIntegrationTest.php
@@ -2447,211 +2447,6 @@ function ( $mode ) {
 		$this->assertEquals( WC_Facebookcommerce_Integration::PRODUCT_DESCRIPTION_MODE_STANDARD, $mode );
 	}
 
-	/**
-	 * Tests get messenger locale returns default locale.
-	 *
-	 * @return void
-	 */
-	public function test_get_messenger_locale_no_filter_no_options() {
-		remove_all_filters( 'wc_facebook_messenger_locale' );
-		delete_option( WC_Facebookcommerce_Integration::SETTING_MESSENGER_LOCALE );
-
-		$locale = $this->integration->get_messenger_locale();
-
-		$this->assertEquals( 'en_US', $locale );
-	}
-
-	/**
-	 * Tests get messenger locale no filter, returns option value.
-	 *
-	 * @return void
-	 */
-	public function test_get_messenger_locale_no_filter() {
-		remove_all_filters( 'wc_facebook_messenger_locale' );
-		add_option( WC_Facebookcommerce_Integration::SETTING_MESSENGER_LOCALE, 'fr-FR' );
-
-		$locale = $this->integration->get_messenger_locale();
-
-		$this->assertEquals( 'fr-FR', $locale );
-	}
-
-	/**
-	 * Tests get messenger locale with filter.
-	 *
-	 * @return void
-	 */
-	public function test_get_messenger_locale_with_filter() {
-		add_filter(
-			'wc_facebook_messenger_locale',
-			function ( $locale ) {
-				return 'es-ES';
-			}
-		);
-		add_option( WC_Facebookcommerce_Integration::SETTING_MESSENGER_LOCALE, 'fr-FR' );
-
-		$locale = $this->integration->get_messenger_locale();
-
-		$this->assertEquals( 'es-ES', $locale );
-	}
-
-	/**
-	 * Tests get messenger greeting with no filters and no options set, returns
-	 * default greeting text which is also not truncated @see WC_Facebookcommerce_Integration::get_messenger_greeting_max_characters()
-	 *
-	 * @return void
-	 */
-	public function test_get_messenger_greeting_no_filter_no_options() {
-		remove_all_filters( 'wc_facebook_messenger_greeting' );
-		delete_option( WC_Facebookcommerce_Integration::SETTING_MESSENGER_GREETING );
-
-		$greeting = $this->integration->get_messenger_greeting();
-
-		$this->assertEquals( 'Hi! We\'re here to answer any questions you may have.', $greeting );
-	}
-
-	/**
-	 * Tests get messenger greeting with no filters but the message exceeds characters
-	 * limit so is truncated to the default 80 characters in length @see WC_Facebookcommerce_Integration::get_messenger_greeting_max_characters()
-	 *
-	 * @return void
-	 */
-	public function test_get_messenger_greeting_truncated_no_filter() {
-		remove_all_filters( 'wc_facebook_messenger_greeting' );
-		add_option(
-			WC_Facebookcommerce_Integration::SETTING_MESSENGER_GREETING,
-			'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum pulvinar sit amet sit.'
-		);
-
-		$greeting = $this->integration->get_messenger_greeting();
-
-		$this->assertEquals( 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum pulvinar sit', $greeting );
-	}
-
-	/**
-	 * Tests get messenger greeting with filter.
-	 *
-	 * @return void
-	 */
-	public function test_get_messenger_greeting_truncated_with_filter() {
-		add_filter(
-			'wc_facebook_messenger_greeting',
-			function ( $greeting ) {
-				return 'Updated with filter. ' . $greeting;
-			}
-		);
-		add_option(
-			WC_Facebookcommerce_Integration::SETTING_MESSENGER_GREETING,
-			'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum pulvinar sit amet sit.'
-		);
-
-		$greeting = $this->integration->get_messenger_greeting();
-
-		$this->assertEquals( 'Updated with filter. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ve', $greeting );
-	}
-
-	/**
-	 * Tests get messenger greeting max characters returns default value when no filter is set.
-	 *
-	 * @return void
-	 */
-	public function test_get_messenger_greeting_max_characters_no_filter() {
-		remove_all_filters( 'wc_facebook_messenger_greeting_max_characters' );
-
-		$length = $this->integration->get_messenger_greeting_max_characters();
-
-		$this->assertEquals( 80, $length );
-	}
-
-	/**
-	 * Tests get messenger greeting max character with filter which falls back to default
-	 * if returned filter value is less than 1.
-	 *
-	 * @return void
-	 */
-	public function test_get_messenger_greeting_max_characters_with_filter_falls_back_to_default() {
-		add_filter(
-			'wc_facebook_messenger_greeting_max_characters',
-			function ( $length ) {
-				return 0;
-			}
-		);
-
-		$length = $this->integration->get_messenger_greeting_max_characters();
-
-		$this->assertEquals( 80, $length );
-	}
-
-	/**
-	 * Tests get messenger greeting max character with filter.
-	 *
-	 * @return void
-	 */
-	public function test_get_messenger_greeting_max_characters_with_filter() {
-		add_filter(
-			'wc_facebook_messenger_greeting_max_characters',
-			function ( $length ) {
-				return 120;
-			}
-		);
-
-		$length = $this->integration->get_messenger_greeting_max_characters();
-
-		$this->assertEquals( 120, $length );
-	}
-
-	/**
-	 * Tests get messenger color hex when no filters nor options are set.
-	 *
-	 * @return void
-	 */
-	public function test_get_messenger_color_hex_no_filter_no_options() {
-		remove_all_filters( 'wc_facebook_messenger_color_hex' );
-		delete_option( WC_Facebookcommerce_Integration::SETTING_MESSENGER_COLOR_HEX );
-
-		$hex = $this->integration->get_messenger_color_hex();
-
-		$this->assertEquals( '#0084ff', $hex );
-	}
-
-	/**
-	 * Tests get messenger color hex returns option value when no filter is set.
-	 *
-	 * @return void
-	 */
-	public function test_get_messenger_color_hex_no_filter() {
-		remove_all_filters( 'wc_facebook_messenger_color_hex' );
-		add_option(
-			WC_Facebookcommerce_Integration::SETTING_MESSENGER_COLOR_HEX,
-			'#red'
-		);
-
-		$hex = $this->integration->get_messenger_color_hex();
-
-		$this->assertEquals( '#red', $hex );
-	}
-
-	/**
-	 * Tests get messenger color hex uses filter.
-	 *
-	 * @return void
-	 */
-	public function test_get_messenger_color_hex_with_filter() {
-		add_filter(
-			'wc_facebook_messenger_color_hex',
-			function ( $hex ) {
-				return '#green';
-			}
-		);
-		add_option(
-			WC_Facebookcommerce_Integration::SETTING_MESSENGER_COLOR_HEX,
-			'#red'
-		);
-
-		$hex = $this->integration->get_messenger_color_hex();
-
-		$this->assertEquals( '#green', $hex );
-	}
-
 	/**
 	 * Tests product catalog id option update with valid catalog id value.
 	 *
@@ -2976,58 +2771,15 @@ public function test_is_legacy_feed_file_generation_enabled_with_option() {
 	}
 
 	/**
-	 * Tests is messenger enabled returns default value.
+	 * Tests is messenger enabled returns the doing it wrong message
 	 *
-	 * @return void
+	 * @expectedIncorrectUsage messenger_doing_it_wrong
 	 */
-	public function test_is_messenger_enabled_no_filter_no_option() {
-		remove_all_filters( 'wc_facebook_is_messenger_enabled' );
-		delete_option( WC_Facebookcommerce_Integration::SETTING_ENABLE_MESSENGER );
-
+	public function test_is_messenger_enabled_doing_it_wrong() {
 		$result = $this->integration->is_messenger_enabled();
-
 		$this->assertFalse( $result );
 	}
 
-	/**
-	 * Tests is messenger enabled no filter but with option set.
-	 *
-	 * @return void
-	 */
-	public function test_is_messenger_enabled_no_filter() {
-		remove_all_filters( 'wc_facebook_is_messenger_enabled' );
-		add_option(
-			WC_Facebookcommerce_Integration::SETTING_ENABLE_MESSENGER,
-			'yes'
-		);
-
-		$result = $this->integration->is_messenger_enabled();
-
-		$this->assertTrue( $result );
-	}
-
-	/**
-	 * Tests is messenger enabled no filter but with filter.
-	 *
-	 * @return void
-	 */
-	public function test_is_messenger_enabled_with_filter() {
-		add_filter(
-			'wc_facebook_is_messenger_enabled',
-			function ( $is_enabled ) {
-				return true;
-			}
-		);
-		add_option(
-			WC_Facebookcommerce_Integration::SETTING_ENABLE_MESSENGER,
-			'no'
-		);
-
-		$result = $this->integration->is_messenger_enabled();
-
-		$this->assertTrue( $result );
-	}
-
 	/**
 	 * Tests is debug mode enabled returns default value.
 	 *