diff --git a/main/extra/userInfo.php b/main/extra/userInfo.php
index 716c71fa39..c3d60eaf34 100644
--- a/main/extra/userInfo.php
+++ b/main/extra/userInfo.php
@@ -331,7 +331,7 @@ if ($displayMode == "viewDefEdit") {
             }
         }
     } else {
-        Display :: display_normal_message(get_lang('ThisStudentIsSubscribeThroughASession'));
+        Display::return_message(get_lang('ThisStudentIsSubscribeThroughASession'));
     }
 } elseif ($displayMode == "viewContentList") {
     // default display
diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index 9cf8853d06..c2297d359d 100755
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -464,91 +464,6 @@ class Display
         $table->display();
     }
 
-    /**
-     * Displays a normal message. It is recommended to use this public function
-     * to display any normal information messages.
-     *
-     * @param string $message
-     * @param bool   $filter      (true) or not (false)
-     * @param bool   $returnValue
-     *
-     * @deprecated Use <code>Display::addFlash(Display::return_message($message, 'normal'));</code>
-     *  Or <code>echo Display::return_message($message, 'normal')</code>
-     */
-    public static function display_normal_message(
-        $message,
-        $filter = true,
-        $returnValue = false
-    ) {
-        $message = self::return_message($message, 'normal', $filter);
-        if ($returnValue) {
-            return $message;
-        } else {
-            echo $message;
-        }
-    }
-
-    /**
-     * Displays an warning message. Use this if you want to draw attention to something
-     * This can also be used for instance with the hint in the exercises.
-     *
-     * @deprecated use Display::addFlash(Display::return_message($message, 'warning'));
-     */
-    public static function display_warning_message(
-        $message,
-        $filter = true,
-        $returnValue = false
-    ) {
-        $message = self::return_message($message, 'warning', $filter);
-        if ($returnValue) {
-            return $message;
-        } else {
-            echo $message;
-        }
-    }
-
-    /**
-     * Displays an confirmation message. Use this if something has been done successfully.
-     *
-     * @param bool    Filter (true) or not (false)
-     *
-     * @deprecated use Display::addFlash(Display::return_message($message, 'confirm'));
-     */
-    public static function display_confirmation_message(
-        $message,
-        $filter = true,
-        $returnValue = false
-    ) {
-        $message = self::return_message($message, 'confirm', $filter);
-        if ($returnValue) {
-            return $message;
-        } else {
-            echo $message;
-        }
-    }
-
-    /**
-     * Displays an error message. It is recommended to use this public function if an error occurs.
-     *
-     * @param string $message - include any additional html
-     *                        tags if you need them
-     * @param bool    Filter (true) or not (false)
-     *
-     * @deprecated use Display::addFlash(Display::return_message($message, 'error'));
-     */
-    public static function display_error_message(
-        $message,
-        $filter = true,
-        $returnValue = false
-    ) {
-        $message = self::return_message($message, 'error', $filter);
-        if ($returnValue) {
-            return $message;
-        } else {
-            echo $message;
-        }
-    }
-
     /**
      * @param string $message
      * @param string $type
diff --git a/main/inc/lib/events.lib.php b/main/inc/lib/events.lib.php
index ac4f90dd1a..9b0471e48c 100644
--- a/main/inc/lib/events.lib.php
+++ b/main/inc/lib/events.lib.php
@@ -2303,7 +2303,7 @@ class Event
                 'action' => 'add_work_start_'.$workId,
                 'action_details' => $virtualTime,
                 'user_id' => $userId,
-                'current_id' => $uniqueId
+                'current_id' => $uniqueId,
             ];
             self::registerLog($logInfo);
 
@@ -2315,7 +2315,7 @@ class Event
                 'action' => 'add_work_end_'.$workId,
                 'action_details' => $virtualTime,
                 'user_id' => $userId,
-                'current_id' => $uniqueId
+                'current_id' => $uniqueId,
             ];
             self::registerLog($logInfo);
         }