diff --git a/public/main/inc/ajax/social.ajax.php b/public/main/inc/ajax/social.ajax.php
index e4ce20ae07..eff98fb101 100644
--- a/public/main/inc/ajax/social.ajax.php
+++ b/public/main/inc/ajax/social.ajax.php
@@ -57,16 +57,6 @@ switch ($action) {
             exit;
         }
         break;
-    case 'delete_friend':
-        if (api_is_anonymous()) {
-            echo '';
-            break;
-        }
-        $my_delete_friend = (int) $_POST['delete_friend_id'];
-        if (isset($_POST['delete_friend_id'])) {
-            SocialManager::remove_user_rel_user($my_delete_friend);
-        }
-        break;
     case 'show_my_friends':
         if (api_is_anonymous()) {
             echo '';
diff --git a/public/main/inc/lib/message.lib.php b/public/main/inc/lib/message.lib.php
index 15289013bf..663c02cad5 100644
--- a/public/main/inc/lib/message.lib.php
+++ b/public/main/inc/lib/message.lib.php
@@ -146,7 +146,7 @@ class MessageManager
                     user_receiver_id = $receiverId AND
                     title = '$subject' AND
                     content = '$message' AND
-                    (msg_status = ".MESSAGE_STATUS_UNREAD." OR msg_status = ".MESSAGE_STATUS_NEW.")
+                    msg_type = ".Message::MESSAGE_TYPE_INBOX."
                 ";
         $result = Database::query($sql);
 
diff --git a/public/main/inc/lib/usermanager.lib.php b/public/main/inc/lib/usermanager.lib.php
index 3eec1130d9..f81a25958b 100644
--- a/public/main/inc/lib/usermanager.lib.php
+++ b/public/main/inc/lib/usermanager.lib.php
@@ -4195,89 +4195,6 @@ class UserManager
         return false;
     }
 
-    /**
-     * Deletes a contact.
-     *
-     * @param bool   $friend_id
-     * @param bool   $real_removed          true will delete ALL friends relationship
-     * @param string $with_status_condition
-     *
-     * @author isaac flores paz <isaac.flores@dokeos.com>
-     * @author Julio Montoya <gugli100@gmail.com> Cleaning code
-     */
-    public static function remove_user_rel_user(
-        $friend_id,
-        $real_removed = false,
-        $with_status_condition = ''
-    ) {
-        $tbl_my_friend = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
-        $tbl_my_message = Database::get_main_table(TABLE_MESSAGE);
-        $friend_id = (int) $friend_id;
-        $user_id = api_get_user_id();
-
-        if ($real_removed) {
-            $extra_condition = '';
-            if ('' != $with_status_condition) {
-                $extra_condition = ' AND relation_type = '.intval($with_status_condition);
-            }
-            $sql = 'DELETE FROM '.$tbl_my_friend.'
-                    WHERE
-                        relation_type <> '.USER_RELATION_TYPE_RRHH.' AND
-                        friend_user_id='.$friend_id.' '.$extra_condition;
-            Database::query($sql);
-            $sql = 'DELETE FROM '.$tbl_my_friend.'
-                   WHERE
-                    relation_type <> '.USER_RELATION_TYPE_RRHH.' AND
-                    user_id='.$friend_id.' '.$extra_condition;
-            Database::query($sql);
-        } else {
-            $sql = 'SELECT COUNT(*) as count FROM '.$tbl_my_friend.'
-                    WHERE
-                        user_id='.$user_id.' AND
-                        relation_type NOT IN('.USER_RELATION_TYPE_DELETED.', '.USER_RELATION_TYPE_RRHH.') AND
-                        friend_user_id='.$friend_id;
-            $result = Database::query($sql);
-            $row = Database::fetch_array($result, 'ASSOC');
-            if (1 == $row['count']) {
-                //Delete user rel user
-                $sql_i = 'UPDATE '.$tbl_my_friend.' SET relation_type='.USER_RELATION_TYPE_DELETED.'
-                          WHERE user_id='.$user_id.' AND friend_user_id='.$friend_id;
-
-                $sql_j = 'UPDATE '.$tbl_my_message.' SET msg_status='.MESSAGE_STATUS_INVITATION_DENIED.'
-                          WHERE
-                                user_receiver_id='.$user_id.' AND
-                                user_sender_id='.$friend_id.' AND update_date="0000-00-00 00:00:00" ';
-                // Delete user
-                $sql_ij = 'UPDATE '.$tbl_my_friend.'  SET relation_type='.USER_RELATION_TYPE_DELETED.'
-                           WHERE user_id='.$friend_id.' AND friend_user_id='.$user_id;
-                $sql_ji = 'UPDATE '.$tbl_my_message.' SET msg_status='.MESSAGE_STATUS_INVITATION_DENIED.'
-                           WHERE
-                                user_receiver_id='.$friend_id.' AND
-                                user_sender_id='.$user_id.' AND
-                                update_date="0000-00-00 00:00:00" ';
-                Database::query($sql_i);
-                Database::query($sql_j);
-                Database::query($sql_ij);
-                Database::query($sql_ji);
-            }
-        }
-
-        // Delete accepted invitations
-        $sql = "DELETE FROM $tbl_my_message
-                WHERE
-                    msg_status = ".MESSAGE_STATUS_INVITATION_ACCEPTED." AND
-                    (
-                        user_receiver_id = $user_id AND
-                        user_sender_id = $friend_id
-                    ) OR
-                    (
-                        user_sender_id = $user_id AND
-                        user_receiver_id = $friend_id
-                    )
-        ";
-        Database::query($sql);
-    }
-
     /**
      * @param int $userId
      *