diff --git a/includes/class-init.php b/includes/class-init.php
index 59a563c3..b7f0cda6 100644
--- a/includes/class-init.php
+++ b/includes/class-init.php
@@ -232,18 +232,6 @@ if ( ! class_exists( 'UM' ) ) {
 			}
 		}
 
-		/**
-		 * Loading UM textdomain.
-		 *
-		 * Note: 'ultimate-member' is a default textdomain.
-		 *
-		 * @since 2.8.5 WordPress native functions are used to make this function clear.
-		 * @deprecated 2.9.2 Ref. https://make.wordpress.org/core/2024/10/21/i18n-improvements-6-7/#Enhanced-support-for-only-using-PHP-translation-files
-		 */
-		public function localize() {
-			_deprecated_function( __METHOD__, '2.9.2', '' );
-		}
-
 		/**
 		 * Fallback to avoid fatal errors for users who still have UM extensions compatible with UM 1.3.x and install UM >= 2.0 version before these extensions update.
 		 * Doing 1.3.x active extensions deactivate for properly running 2.0.x AJAX upgrades.
@@ -847,30 +835,6 @@ if ( ! class_exists( 'UM' ) ) {
 			return $this->classes['admin_columns'];
 		}
 
-
-		/**
-		 * @since 2.0
-		 * @deprecated 2.7.0
-		 *
-		 * @return um\admin\Enqueue
-		 */
-		public function admin_enqueue() {
-			_deprecated_function( __METHOD__, '2.7.0', 'UM()->admin()->enqueue()' );
-			return $this->admin()->enqueue();
-		}
-
-		/**
-		 * @since 2.0
-		 * @deprecated 2.8.6
-		 *
-		 * @return um\frontend\Modal
-		 */
-		function modal() {
-			_deprecated_function( __METHOD__, '2.8.6', 'UM()->frontend()->modal()' );
-			return $this->frontend()->modal();
-		}
-
-
 		/**
 		 * @since 2.0
 		 *
@@ -1329,25 +1293,6 @@ if ( ! class_exists( 'UM' ) ) {
 			return $this->classes['mail'];
 		}
 
-
-		/**
-		 * @deprecated 2.1.0
-		 *
-		 * @since 2.0
-		 *
-		 * @return um\core\Members
-		 */
-		function members() {
-			um_deprecated_function( 'UM()->members()', '2.1.0', 'UM()->member_directory()' );
-
-			if ( empty( $this->classes['members'] ) ) {
-				$this->classes['members'] = new um\core\Members();
-			}
-
-			return $this->classes['members'];
-		}
-
-
 		/**
 		 * @since 2.0
 		 *
@@ -1476,15 +1421,58 @@ if ( ! class_exists( 'UM' ) ) {
 
 		}
 
-
 		/**
 		 * Init UM widgets
 		 *
 		 * @since 2.0
 		 */
-		function widgets_init() {
+		public function widgets_init() {
 			register_widget( 'um\widgets\UM_Search_Widget' );
 		}
+
+		/**
+		 * @since 2.0
+		 * @deprecated 2.7.0
+		 *
+		 * @return um\admin\Enqueue
+		 */
+		public function admin_enqueue() {
+			_deprecated_function( __METHOD__, '2.7.0', 'UM()->admin()->enqueue()' );
+			return $this->admin()->enqueue();
+		}
+
+		/**
+		 * @since 2.0
+		 * @deprecated 2.8.6
+		 *
+		 * @return um\frontend\Modal
+		 */
+		public function modal() {
+			_deprecated_function( __METHOD__, '2.8.6', 'UM()->frontend()->modal()' );
+			return $this->frontend()->modal();
+		}
+
+		/**
+		 * Loading UM textdomain.
+		 *
+		 * Note: 'ultimate-member' is a default textdomain.
+		 *
+		 * @since 2.8.5 WordPress native functions are used to make this function clear.
+		 * @deprecated 2.9.2 Ref. https://make.wordpress.org/core/2024/10/21/i18n-improvements-6-7/#Enhanced-support-for-only-using-PHP-translation-files
+		 */
+		public function localize() {
+			_deprecated_function( __METHOD__, '2.9.2' );
+		}
+
+		/**
+		 * @since 2.0
+		 * @deprecated 2.1.0
+		 * @return um\core\Member_Directory | um\core\Member_Directory_Meta
+		 */
+		public function members() {
+			_deprecated_function( __METHOD__, '2.1.0', 'UM()->member_directory()' );
+			return UM()->member_directory();
+		}
 	}
 }
 
diff --git a/includes/core/class-files.php b/includes/core/class-files.php
index a288c45b..3722d962 100644
--- a/includes/core/class-files.php
+++ b/includes/core/class-files.php
@@ -1447,24 +1447,6 @@ if ( ! class_exists( 'um\core\Files' ) ) {
 			}
 		}
 
-
-		/**
-		 * New user upload
-		 *
-		 * @param $user_id
-		 * @param $source
-		 * @param $key
-		 *
-		 * @deprecated 2.1.0
-		 *
-		 * @return string
-		 */
-		function new_user_upload( $user_id, $source, $key ) {
-			um_deprecated_function( 'new_user_upload', '2.1.0', '' );
-			return '';
-		}
-
-
 		/**
 		 * Remove a directory
 		 *
@@ -1525,20 +1507,6 @@ if ( ! class_exists( 'um\core\Files' ) ) {
 			return $removed_files;
 		}
 
-		/**
-		 * Format Bytes
-		 *
-		 * @deprecated 2.8.7
-		 * @param $size
-		 * @param int $precision
-		 *
-		 * @return string
-		 */
-		public function format_bytes( $size, $precision = 1 ) {
-			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->filesystem()->format_bytes()' );
-			return UM()->common()->filesystem()::format_bytes( $size, $precision );
-		}
-
 		/**
 		 * Get the list of profile/cover sizes
 		 *
@@ -1569,6 +1537,34 @@ if ( ! class_exists( 'um\core\Files' ) ) {
 			return $sizes;
 		}
 
+		/**
+		 * New user upload
+		 *
+		 * @param $user_id
+		 * @param $source
+		 * @param $key
+		 *
+		 * @deprecated 2.1.0
+		 *
+		 * @return string
+		 */
+		public function new_user_upload( $user_id, $source, $key ) {
+			_deprecated_function( __METHOD__, '2.1.0' );
+			return '';
+		}
 
+		/**
+		 * Format Bytes
+		 *
+		 * @deprecated 2.8.7
+		 * @param $size
+		 * @param int $precision
+		 *
+		 * @return string
+		 */
+		public function format_bytes( $size, $precision = 1 ) {
+			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->filesystem()->format_bytes()' );
+			return UM()->common()->filesystem()::format_bytes( $size, $precision );
+		}
 	}
 }
diff --git a/includes/core/class-user.php b/includes/core/class-user.php
index 9d9ec9f8..f8d70584 100644
--- a/includes/core/class-user.php
+++ b/includes/core/class-user.php
@@ -1478,28 +1478,6 @@ if ( ! class_exists( 'um\core\User' ) ) {
 			update_user_meta( $this->id, '_um_last_login', current_time( 'mysql', true ) );
 		}
 
-		/**
-		 * Set user's account status
-		 *
-		 * @deprecated 2.8.7
-		 *
-		 * @param string $status
-		 */
-		public function set_status( $status ) {
-			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->set_status()' );
-			UM()->common()->users()->set_status( $status, um_user( 'ID' ) );
-		}
-
-		/**
-		 * Set user's hash
-		 *
-		 * @deprecated 2.8.7
-		 */
-		public function assign_secretkey() {
-			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->assign_secretkey()' );
-			UM()->common()->users()->assign_secretkey( um_user( 'ID' ) );
-		}
-
 		/**
 		 * @param \WP_User $userdata
 		 *
@@ -1542,56 +1520,6 @@ if ( ! class_exists( 'um\core\User' ) ) {
 			}
 		}
 
-
-		/**
-		 * This method approves a user membership and sends them an optional welcome/approval email.
-		 * @param bool $repeat @deprecated
-		 * @deprecated 2.8.7
-		 */
-		public function approve( $repeat = true ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.Found -- deprecated function
-			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->approve()' );
-			UM()->common()->users()->approve( um_user( 'ID' ), $repeat );
-		}
-
-		/**
-		 * Pending email
-		 * @deprecated 2.8.7
-		 */
-		public function email_pending() {
-			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->send_activation()' );
-			UM()->common()->users()->send_activation( um_user( 'ID' ) );
-		}
-
-		/**
-		 * This method puts a user under manual review by administrator and sends them an optional email.
-		 * @deprecated 2.8.7
-		 * @return void
-		 */
-		public function pending() {
-			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->set_as_pending()' );
-			UM()->common()->users()->set_as_pending( um_user( 'ID' ) );
-		}
-
-		/**
-		 * This method rejects a user membership and sends them an optional email.
-		 * @deprecated 2.8.7
-		 * @return void
-		 */
-		public function reject() {
-			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->reject()' );
-			UM()->common()->users()->reject( um_user( 'ID' ) );
-		}
-
-		/**
-		 * This method deactivates a user membership and sends them an optional email.
-		 * @deprecated 2.8.7
-		 * @return void
-		 */
-		public function deactivate() {
-			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->deactivate()' );
-			UM()->common()->users()->deactivate( um_user( 'ID' ) );
-		}
-
 		/**
 		 * Delete user
 		 *
@@ -1867,18 +1795,6 @@ if ( ! class_exists( 'um\core\User' ) ) {
 			return false;
 		}
 
-
-		/**
-		 * Update files
-		 *
-		 * @param $changes
-		 *
-		 * @deprecated 2.1.0
-		 */
-		function update_files( $changes ) {
-			um_deprecated_function( 'update_files', '2.1.0', '' );
-		}
-
 		/**
 		 * Update profile
 		 *
@@ -2058,21 +1974,6 @@ if ( ! class_exists( 'um\core\User' ) ) {
 			return false;
 		}
 
-
-		/**
-		 * This method checks if a user exists or not in your site based on the user ID.
-		 *
-		 * @deprecated 2.8.7
-		 *
-		 * @param int $user_id A user ID must be passed to check if the user exists
-		 *
-		 * @return bool|int
-		 */
-		public function user_exists_by_id( $user_id ) {
-			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()::user_exists' );
-			return UM()->common()->users()::user_exists( $user_id ) ? $user_id : false;
-		}
-
 		/**
 		 * @param string $hash
 		 *
@@ -2234,5 +2135,101 @@ if ( ! class_exists( 'um\core\User' ) ) {
 			$replace_placeholders[] = um_user( 'account_activation_link' );
 			return $replace_placeholders;
 		}
+
+		/**
+		 * Set user's account status
+		 *
+		 * @deprecated 2.8.7
+		 *
+		 * @param string $status
+		 */
+		public function set_status( $status ) {
+			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->set_status()' );
+			UM()->common()->users()->set_status( $status, um_user( 'ID' ) );
+		}
+
+		/**
+		 * Set user's hash
+		 *
+		 * @deprecated 2.8.7
+		 */
+		public function assign_secretkey() {
+			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->assign_secretkey()' );
+			UM()->common()->users()->assign_secretkey( um_user( 'ID' ) );
+		}
+
+		/**
+		 * Update files
+		 *
+		 * @param $changes
+		 *
+		 * @deprecated 2.1.0
+		 */
+		public function update_files( $changes ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.Found -- deprecated function
+			_deprecated_function( __METHOD__, '2.1.0' );
+		}
+
+		/**
+		 * This method checks if a user exists or not in your site based on the user ID.
+		 *
+		 * @deprecated 2.8.7
+		 *
+		 * @param int $user_id A user ID must be passed to check if the user exists
+		 *
+		 * @return bool|int
+		 */
+		public function user_exists_by_id( $user_id ) {
+			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()::user_exists' );
+			return UM()->common()->users()::user_exists( $user_id ) ? $user_id : false;
+		}
+
+		/**
+		 * This method approves a user membership and sends them an optional welcome/approval email.
+		 * @param bool $repeat @deprecated
+		 * @deprecated 2.8.7
+		 */
+		public function approve( $repeat = true ) {
+			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->approve()' );
+			UM()->common()->users()->approve( um_user( 'ID' ), $repeat );
+		}
+
+		/**
+		 * Pending email
+		 * @deprecated 2.8.7
+		 */
+		public function email_pending() {
+			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->send_activation()' );
+			UM()->common()->users()->send_activation( um_user( 'ID' ) );
+		}
+
+		/**
+		 * This method puts a user under manual review by administrator and sends them an optional email.
+		 * @deprecated 2.8.7
+		 * @return void
+		 */
+		public function pending() {
+			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->set_as_pending()' );
+			UM()->common()->users()->set_as_pending( um_user( 'ID' ) );
+		}
+
+		/**
+		 * This method rejects a user membership and sends them an optional email.
+		 * @deprecated 2.8.7
+		 * @return void
+		 */
+		public function reject() {
+			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->reject()' );
+			UM()->common()->users()->reject( um_user( 'ID' ) );
+		}
+
+		/**
+		 * This method deactivates a user membership and sends them an optional email.
+		 * @deprecated 2.8.7
+		 * @return void
+		 */
+		public function deactivate() {
+			_deprecated_function( __METHOD__, '2.8.7', 'UM()->common()->users()->deactivate()' );
+			UM()->common()->users()->deactivate( um_user( 'ID' ) );
+		}
 	}
 }