diff --git a/.upgradenotes/MDL-82284-2024062501562851.yml b/.upgradenotes/MDL-82284-2024062501562851.yml
new file mode 100644
index 00000000000..4e5a5e52082
--- /dev/null
+++ b/.upgradenotes/MDL-82284-2024062501562851.yml
@@ -0,0 +1,7 @@
+issueNumber: MDL-82284
+notes:
+  core:
+    - message: >-
+        Legacy constructors have been removed. These relate to PHP 4 and
+        earlier.
+      type: removed
diff --git a/public/auth/email/auth.php b/public/auth/email/auth.php
index 09805d9ee98..95e434e5a9e 100644
--- a/public/auth/email/auth.php
+++ b/public/auth/email/auth.php
@@ -30,7 +30,6 @@ require_once($CFG->libdir.'/authlib.php');
  * Email authentication plugin.
  */
 class auth_plugin_email extends auth_plugin_base {
-
     /**
      * Constructor.
      */
@@ -39,16 +38,6 @@ class auth_plugin_email extends auth_plugin_base {
         $this->config = get_config('auth_email');
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function auth_plugin_email() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.
@@ -255,5 +244,4 @@ class auth_plugin_email extends auth_plugin_base {
     function is_captcha_enabled() {
         return get_config("auth_{$this->authtype}", 'recaptcha');
     }
-
 }
diff --git a/public/auth/ldap/auth.php b/public/auth/ldap/auth.php
index 5c69242b94c..1d73075bf04 100644
--- a/public/auth/ldap/auth.php
+++ b/public/auth/ldap/auth.php
@@ -85,7 +85,6 @@ require_once($CFG->dirroot.'/auth/ldap/locallib.php');
  * LDAP authentication plugin.
  */
 class auth_plugin_ldap extends auth_plugin_base {
-
     /** @var string */
     protected $roleauth;
 
@@ -139,16 +138,6 @@ class auth_plugin_ldap extends auth_plugin_base {
         $this->init_plugin($this->authtype);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function auth_plugin_ldap() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.
diff --git a/public/auth/manual/auth.php b/public/auth/manual/auth.php
index 21a34d75099..9c5133057a6 100644
--- a/public/auth/manual/auth.php
+++ b/public/auth/manual/auth.php
@@ -53,16 +53,6 @@ class auth_plugin_manual extends auth_plugin_base {
         $this->config = (object)array_merge((array)$legacyconfig, (array)$config);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function auth_plugin_manual() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist. (Non-mnet accounts only!)
@@ -211,5 +201,3 @@ class auth_plugin_manual extends auth_plugin_base {
     }
 
 }
-
-
diff --git a/public/auth/nologin/auth.php b/public/auth/nologin/auth.php
index 34484fd8df0..3e18dcbec9f 100644
--- a/public/auth/nologin/auth.php
+++ b/public/auth/nologin/auth.php
@@ -30,8 +30,6 @@ require_once($CFG->libdir.'/authlib.php');
  * Plugin for no authentication - disabled user.
  */
 class auth_plugin_nologin extends auth_plugin_base {
-
-
     /**
      * Constructor.
      */
@@ -39,16 +37,6 @@ class auth_plugin_nologin extends auth_plugin_base {
         $this->authtype = 'nologin';
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function auth_plugin_nologin() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
     /**
      * Do not allow any login.
      *
@@ -131,5 +119,3 @@ class auth_plugin_nologin extends auth_plugin_base {
         ];
     }
 }
-
-
diff --git a/public/auth/none/auth.php b/public/auth/none/auth.php
index 75ea4349ebe..85e22d3113f 100644
--- a/public/auth/none/auth.php
+++ b/public/auth/none/auth.php
@@ -30,7 +30,6 @@ require_once($CFG->libdir.'/authlib.php');
  * Plugin for no authentication.
  */
 class auth_plugin_none extends auth_plugin_base {
-
     /**
      * Constructor.
      */
@@ -39,16 +38,6 @@ class auth_plugin_none extends auth_plugin_base {
         $this->config = get_config('auth_none');
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function auth_plugin_none() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
     /**
      * Returns true if the username and password work or don't exist and false
      * if the user exists and the password is wrong.
@@ -133,7 +122,4 @@ class auth_plugin_none extends auth_plugin_base {
     function can_be_manually_set() {
         return true;
     }
-
 }
-
-
diff --git a/public/auth/shibboleth/auth.php b/public/auth/shibboleth/auth.php
index 0c168e12fff..f1deed702f9 100644
--- a/public/auth/shibboleth/auth.php
+++ b/public/auth/shibboleth/auth.php
@@ -43,16 +43,6 @@ class auth_plugin_shibboleth extends auth_plugin_base {
         $this->config = get_config('auth_shibboleth');
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function auth_plugin_shibboleth() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.
diff --git a/public/auth/webservice/auth.php b/public/auth/webservice/auth.php
index 235ced05dc5..73fbe705d4b 100644
--- a/public/auth/webservice/auth.php
+++ b/public/auth/webservice/auth.php
@@ -40,16 +40,6 @@ class auth_plugin_webservice extends auth_plugin_base {
         $this->config = get_config('auth_webservice');
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function auth_plugin_webservice() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
     /**
      * Returns true if the username and password work and false if they are
      * wrong or don't exist.
diff --git a/public/backup/cc/cc_lib/gral_lib/cssparser.php b/public/backup/cc/cc_lib/gral_lib/cssparser.php
index 43c459628dc..62abbc65be1 100644
--- a/public/backup/cc/cc_lib/gral_lib/cssparser.php
+++ b/public/backup/cc/cc_lib/gral_lib/cssparser.php
@@ -25,16 +25,6 @@ class cssparser {
     $this->Clear();
   }
 
-  /**
-   * Old syntax of class constructor. Deprecated in PHP7.
-   *
-   * @deprecated since Moodle 3.1
-   */
-  public function cssparser($html = true) {
-      debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-      self::__construct($html);
-  }
-
   function finalize() {
     unset($this->css);
   }
diff --git a/public/course/moodleform_mod.php b/public/course/moodleform_mod.php
index 351d5fc3155..662cf8ee11a 100644
--- a/public/course/moodleform_mod.php
+++ b/public/course/moodleform_mod.php
@@ -127,16 +127,6 @@ abstract class moodleform_mod extends moodleform {
         parent::__construct('modedit.php');
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function moodleform_mod($current, $section, $cm, $course) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($current, $section, $cm, $course);
-    }
-
     /**
      * Get the current data for the form.
      * @return stdClass|null
diff --git a/public/filter/tex/latex.php b/public/filter/tex/latex.php
index 7c6b3665b05..e7cf8259784 100644
--- a/public/filter/tex/latex.php
+++ b/public/filter/tex/latex.php
@@ -23,16 +23,6 @@
             $this->temp_dir = make_request_directory();
         }
 
-        /**
-         * Old syntax of class constructor. Deprecated in PHP7.
-         *
-         * @deprecated since Moodle 3.1
-         */
-        public function latex() {
-            debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-            self::__construct();
-        }
-
         /**
          * Accessor function for support_platform field.
          * @return boolean value of supported_platform
diff --git a/public/grade/export/lib.php b/public/grade/export/lib.php
index d7f36b40548..f34647db4d4 100644
--- a/public/grade/export/lib.php
+++ b/public/grade/export/lib.php
@@ -645,16 +645,6 @@ class grade_export_update_buffer {
         $this->export_time = time();
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function grade_export_update_buffer() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
     public function flush($buffersize) {
         global $CFG, $DB;
 
diff --git a/public/grade/grading/form/guide/guideeditor.php b/public/grade/grading/form/guide/guideeditor.php
index 88763ecb8bc..9b1bac63a90 100644
--- a/public/grade/grading/form/guide/guideeditor.php
+++ b/public/grade/grading/form/guide/guideeditor.php
@@ -57,16 +57,6 @@ class moodlequickform_guideeditor extends HTML_QuickForm_input {
         parent::__construct($elementname, $elementlabel, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function moodlequickform_guideeditor($elementname=null, $elementlabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementname, $elementlabel, $attributes);
-    }
-
     /**
      * get html for help button
      *
diff --git a/public/grade/grading/form/rubric/rubriceditor.php b/public/grade/grading/form/rubric/rubriceditor.php
index 3d64b5fd5af..1b41caf71a2 100644
--- a/public/grade/grading/form/rubric/rubriceditor.php
+++ b/public/grade/grading/form/rubric/rubriceditor.php
@@ -64,16 +64,6 @@ class MoodleQuickForm_rubriceditor extends HTML_QuickForm_input {
         parent::__construct($elementName, $elementLabel, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_rubriceditor($elementName=null, $elementLabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-
     /**
      * get html for help button
      *
diff --git a/public/grade/lib.php b/public/grade/lib.php
index 1cf15f47732..f06ad8e0546 100644
--- a/public/grade/lib.php
+++ b/public/grade/lib.php
@@ -1128,16 +1128,6 @@ class grade_plugin_return {
         }
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function grade_plugin_return($params = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($params);
-    }
-
     /**
      * Returns return parameters as options array suitable for buttons.
      * @return array options
@@ -2346,16 +2336,6 @@ class grade_seq extends grade_structure {
         }
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function grade_seq($courseid, $category_grade_last=false, $nooutcomes=false) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($courseid, $category_grade_last, $nooutcomes);
-    }
-
     /**
      * Static recursive helper - makes the grade_item for category the last children
      *
@@ -2542,17 +2522,6 @@ class grade_tree extends grade_structure {
 
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function grade_tree($courseid, $fillers=true, $category_grade_last=false,
-                               $collapsed=null, $nooutcomes=false) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($courseid, $fillers, $category_grade_last, $collapsed, $nooutcomes);
-    }
-
     /**
      * Static recursive helper - removes items from collapsed categories
      *
diff --git a/public/lib/adminlib.php b/public/lib/adminlib.php
index 2aa10e88e9e..a3614853a7b 100644
--- a/public/lib/adminlib.php
+++ b/public/lib/adminlib.php
@@ -6096,16 +6096,6 @@ class admin_setting_special_gradelimiting extends admin_setting_configcheckbox {
             get_string('unlimitedgrades_help', 'grades'), '0', '1', '0');
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function admin_setting_special_gradelimiting() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
     /**
      * Force site regrading
      */
diff --git a/public/lib/componentlib.class.php b/public/lib/componentlib.class.php
index 50d16743a4d..6c018f1a767 100644
--- a/public/lib/componentlib.class.php
+++ b/public/lib/componentlib.class.php
@@ -206,16 +206,6 @@ class component_installer {
         $this->check_requisites();
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function component_installer($sourcebase, $zippath, $zipfilename, $md5filename='', $destpath='') {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($sourcebase, $zippath, $zipfilename, $md5filename, $destpath);
-    }
-
     /**
      * This function will check if everything is properly set to begin
      * one installation. Also, it will check for required settings
diff --git a/public/lib/environmentlib.php b/public/lib/environmentlib.php
index a6c5c03bc1e..e64133b4588 100644
--- a/public/lib/environmentlib.php
+++ b/public/lib/environmentlib.php
@@ -1312,16 +1312,6 @@ class environment_results {
         $this->restrict_str='';
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function environment_results($part) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($part);
-    }
-
     /**
      * Set the status
      *
diff --git a/public/lib/evalmath/evalmath.class.php b/public/lib/evalmath/evalmath.class.php
index a65f23d7164..e4ea4e6e194 100644
--- a/public/lib/evalmath/evalmath.class.php
+++ b/public/lib/evalmath/evalmath.class.php
@@ -127,16 +127,6 @@ class EvalMath {
         $this->allowimplicitmultiplication = $allowimplicitmultiplication;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function EvalMath($allowconstants = false, $allowimplicitmultiplication = false) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($allowconstants, $allowimplicitmultiplication);
-    }
-
     function e($expr) {
         return $this->evaluate($expr);
     }
diff --git a/public/lib/form/advcheckbox.php b/public/lib/form/advcheckbox.php
index 4b9a724cf98..6f0089561d6 100644
--- a/public/lib/form/advcheckbox.php
+++ b/public/lib/form/advcheckbox.php
@@ -91,16 +91,6 @@ class MoodleQuickForm_advcheckbox extends HTML_QuickForm_advcheckbox implements
         $this->_type = 'advcheckbox';
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_advcheckbox($elementName=null, $elementLabel=null, $text=null, $attributes=null, $values=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $text, $attributes, $values);
-    }
-
     /**
      * get html for help button
      *
diff --git a/public/lib/form/autocomplete.php b/public/lib/form/autocomplete.php
index 6cfa4e743de..d28a7148f15 100644
--- a/public/lib/form/autocomplete.php
+++ b/public/lib/form/autocomplete.php
@@ -106,16 +106,6 @@ class MoodleQuickForm_autocomplete extends MoodleQuickForm_select {
         $this->_type = 'autocomplete';
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_autocomplete($elementName=null, $elementLabel=null, $options=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $options, $attributes);
-    }
-
     /**
      * Returns HTML for select form element.
      *
diff --git a/public/lib/form/button.php b/public/lib/form/button.php
index b5a44aab17d..e1226d69daa 100644
--- a/public/lib/form/button.php
+++ b/public/lib/form/button.php
@@ -78,16 +78,6 @@ class MoodleQuickForm_button extends HTML_QuickForm_button implements templatabl
         $this->customclassoverride = $options['customclassoverride'] ?? null;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_button($elementName=null, $value=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $value, $attributes);
-    }
-
     /**
      * get html for help button
      *
diff --git a/public/lib/form/cancel.php b/public/lib/form/cancel.php
index b0465fcee6f..73f465e0f03 100644
--- a/public/lib/form/cancel.php
+++ b/public/lib/form/cancel.php
@@ -72,16 +72,6 @@ class MoodleQuickForm_cancel extends MoodleQuickForm_submit
         $this->updateAttributes(array('class' => $class . ' btn-cancel'));
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_cancel($elementName=null, $value=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $value, $attributes);
-    }
-
     /**
      * Called by HTML_QuickForm whenever form event is made on this element
      *
diff --git a/public/lib/form/checkbox.php b/public/lib/form/checkbox.php
index d76cb4856bc..7c79976c878 100644
--- a/public/lib/form/checkbox.php
+++ b/public/lib/form/checkbox.php
@@ -62,16 +62,6 @@ class MoodleQuickForm_checkbox extends HTML_QuickForm_checkbox implements templa
         parent::__construct($elementName, $elementLabel, $text, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_checkbox($elementName=null, $elementLabel=null, $text='', $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $text, $attributes);
-    }
-
     /**
      * get html for help button
      *
diff --git a/public/lib/form/dateselector.php b/public/lib/form/dateselector.php
index b45414b9346..9a2fada2db8 100644
--- a/public/lib/form/dateselector.php
+++ b/public/lib/form/dateselector.php
@@ -99,16 +99,6 @@ class MoodleQuickForm_date_selector extends MoodleQuickForm_group {
         }
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_date_selector($elementName = null, $elementLabel = null, $options = array(), $attributes = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $options, $attributes);
-    }
-
     /**
      * This will create date group element constisting of day, month and year.
      *
diff --git a/public/lib/form/datetimeselector.php b/public/lib/form/datetimeselector.php
index c94f8d36692..1a251d2b204 100644
--- a/public/lib/form/datetimeselector.php
+++ b/public/lib/form/datetimeselector.php
@@ -102,16 +102,6 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group {
         }
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_date_time_selector($elementName = null, $elementLabel = null, $options = array(), $attributes = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $options, $attributes);
-    }
-
     /**
      * This will create date group element constisting of day, month and year.
      *
diff --git a/public/lib/form/duration.php b/public/lib/form/duration.php
index 9f35c3d1048..f21cec34eb7 100644
--- a/public/lib/form/duration.php
+++ b/public/lib/form/duration.php
@@ -111,17 +111,6 @@ class MoodleQuickForm_duration extends MoodleQuickForm_group {
         }
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_duration($elementName = null, $elementLabel = null,
-            $options = [], $attributes = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $options, $attributes);
-    }
-
     /**
      * Returns time associative array of unit length.
      *
diff --git a/public/lib/form/editor.php b/public/lib/form/editor.php
index 8b178997322..c2ade3a502e 100644
--- a/public/lib/form/editor.php
+++ b/public/lib/form/editor.php
@@ -105,16 +105,6 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element implements templatab
         editors_head_setup();
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_editor($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes, $options);
-    }
-
     /**
      * Called by HTML_QuickForm whenever form event is made on this element
      *
diff --git a/public/lib/form/filemanager.php b/public/lib/form/filemanager.php
index c8422d94aa0..b98babe801d 100644
--- a/public/lib/form/filemanager.php
+++ b/public/lib/form/filemanager.php
@@ -84,16 +84,6 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element implements temp
         parent::__construct($elementName, $elementLabel, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_filemanager($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes, $options);
-    }
-
     /**
      * Called by HTML_QuickForm whenever form event is made on this element
      *
diff --git a/public/lib/form/filepicker.php b/public/lib/form/filepicker.php
index 8fee6b48aca..f5e30ad74e7 100644
--- a/public/lib/form/filepicker.php
+++ b/public/lib/form/filepicker.php
@@ -88,16 +88,6 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_input implements templat
         parent::__construct($elementName, $elementLabel, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_filepicker($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes, $options);
-    }
-
     /**
      * Returns html for help button.
      *
diff --git a/public/lib/form/grading.php b/public/lib/form/grading.php
index af379c7f8e5..181338ddd82 100644
--- a/public/lib/form/grading.php
+++ b/public/lib/form/grading.php
@@ -72,16 +72,6 @@ class MoodleQuickForm_grading extends HTML_QuickForm_input implements templatabl
         $this->gradingattributes = $attributes;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_grading($elementName=null, $elementLabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-
     /**
      * Helper function to retrieve gradingform_instance passed in element attributes
      *
diff --git a/public/lib/form/group.php b/public/lib/form/group.php
index 020f9e175a3..fd2abdfd190 100644
--- a/public/lib/form/group.php
+++ b/public/lib/form/group.php
@@ -76,16 +76,6 @@ class MoodleQuickForm_group extends HTML_QuickForm_group implements templatable
         parent::__construct($elementName, $elementLabel, $elements, $separator, $appendName, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_group($elementName=null, $elementLabel=null, $elements=null, $separator=null, $appendName = true) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $elements, $separator, $appendName);
-    }
-
     /** @var string template type, would cause problems with client side validation so will leave for now */
     //var $_elementTemplateType='fieldset';
 
diff --git a/public/lib/form/header.php b/public/lib/form/header.php
index da80feba789..58bd433db3e 100644
--- a/public/lib/form/header.php
+++ b/public/lib/form/header.php
@@ -52,16 +52,6 @@ class MoodleQuickForm_header extends HTML_QuickForm_header
         parent::__construct($elementName, $text);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_header($elementName = null, $text = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $text);
-    }
-
    /**
     * Accepts a renderer
     *
diff --git a/public/lib/form/hidden.php b/public/lib/form/hidden.php
index 63dea065363..db37c8ec490 100644
--- a/public/lib/form/hidden.php
+++ b/public/lib/form/hidden.php
@@ -53,15 +53,6 @@ class MoodleQuickForm_hidden extends HTML_QuickForm_hidden{
         parent::__construct($elementName, $value, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_hidden($elementName=null, $value='', $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        return self::__construct($elementName, $value, $attributes);
-    }
     /**
      * get html for help button
      *
diff --git a/public/lib/form/listing.php b/public/lib/form/listing.php
index dc520b74ee2..98b50c0e022 100644
--- a/public/lib/form/listing.php
+++ b/public/lib/form/listing.php
@@ -92,16 +92,6 @@ class MoodleQuickForm_listing extends HTML_QuickForm_input {
         parent::__construct($elementName, $elementLabel, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_listing($elementName=null, $elementLabel=null, $attributes=null, $options=array()) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes, $options);
-    }
-
     /**
      * Returns HTML for listing form element.
      *
diff --git a/public/lib/form/modgrade.php b/public/lib/form/modgrade.php
index e0107fa3187..960e097d472 100644
--- a/public/lib/form/modgrade.php
+++ b/public/lib/form/modgrade.php
@@ -119,16 +119,6 @@ class MoodleQuickForm_modgrade extends MoodleQuickForm_group {
         $this->useratings = !empty($options['useratings']);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_modgrade($elementname = null, $elementlabel = null, $options = array(), $attributes = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementname, $elementlabel, $options, $attributes);
-    }
-
     /**
      * Create elements for this group.
      */
diff --git a/public/lib/form/modvisible.php b/public/lib/form/modvisible.php
index 8a3fadcea9f..5d3168d90d0 100644
--- a/public/lib/form/modvisible.php
+++ b/public/lib/form/modvisible.php
@@ -62,16 +62,6 @@ class MoodleQuickForm_modvisible extends MoodleQuickForm_select{
         $this->_type = 'modvisible';
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_modvisible($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes, $options);
-    }
-
     /**
      * Called by HTML_QuickForm whenever form event is made on this element
      *
diff --git a/public/lib/form/password.php b/public/lib/form/password.php
index 3f101d8a324..73230ed40d0 100644
--- a/public/lib/form/password.php
+++ b/public/lib/form/password.php
@@ -76,16 +76,6 @@ class MoodleQuickForm_password extends HTML_QuickForm_password implements templa
         parent::__construct($elementName, $elementLabel, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_password($elementName=null, $elementLabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-
     /**
      * get html for help button
      *
diff --git a/public/lib/form/passwordunmask.php b/public/lib/form/passwordunmask.php
index ae0f9af21d8..bf4434f0984 100644
--- a/public/lib/form/passwordunmask.php
+++ b/public/lib/form/passwordunmask.php
@@ -58,16 +58,6 @@ class MoodleQuickForm_passwordunmask extends MoodleQuickForm_password {
         $this->setType('passwordunmask');
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_passwordunmask($elementName=null, $elementLabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-
     /**
      * Function to export the renderer data in a format that is suitable for a mustache template.
      *
diff --git a/public/lib/form/questioncategory.php b/public/lib/form/questioncategory.php
index 788090bd0f0..365b65a6afe 100644
--- a/public/lib/form/questioncategory.php
+++ b/public/lib/form/questioncategory.php
@@ -64,14 +64,4 @@ class MoodleQuickForm_questioncategory extends MoodleQuickForm_selectgroups {
                             $this->_options['currentcat'], false, $this->_options['nochildrenof'], false));
         }
     }
-
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_questioncategory($elementName = null, $elementLabel = null, $options = null, $attributes = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $options, $attributes);
-    }
 }
diff --git a/public/lib/form/radio.php b/public/lib/form/radio.php
index 0aea45e8df1..e5fa1d9ea26 100644
--- a/public/lib/form/radio.php
+++ b/public/lib/form/radio.php
@@ -60,16 +60,6 @@ class MoodleQuickForm_radio extends HTML_QuickForm_radio implements templatable
         parent::__construct($elementName, $elementLabel, $text, $value, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_radio($elementName=null, $elementLabel=null, $text=null, $value=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $text, $value, $attributes);
-    }
-
     /**
      * get html for help button
      *
diff --git a/public/lib/form/recaptcha.php b/public/lib/form/recaptcha.php
index 2eb732624e8..cfca2da95be 100644
--- a/public/lib/form/recaptcha.php
+++ b/public/lib/form/recaptcha.php
@@ -59,16 +59,6 @@ class MoodleQuickForm_recaptcha extends HTML_QuickForm_input implements templata
         $this->_type = 'recaptcha';
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_recaptcha($elementName = null, $elementLabel = null, $attributes = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-
     /**
      * Returns the reCAPTCHA element in HTML
      *
diff --git a/public/lib/form/searchableselector.php b/public/lib/form/searchableselector.php
index 1f487290ad1..6a575e6ed0c 100644
--- a/public/lib/form/searchableselector.php
+++ b/public/lib/form/searchableselector.php
@@ -52,14 +52,4 @@ class MoodleQuickForm_searchableselector extends MoodleQuickForm_autocomplete {
         $options = ['' => get_string('noselection', 'form')] + $options;
         parent::__construct($elementname, $elementlabel, $options, $attributes);
     }
-
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_searchableselector($elementName=null, $elementLabel=null, $options=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $options, $attributes);
-    }
 }
diff --git a/public/lib/form/select.php b/public/lib/form/select.php
index 050ad014690..65bf1313faf 100644
--- a/public/lib/form/select.php
+++ b/public/lib/form/select.php
@@ -62,16 +62,6 @@ class MoodleQuickForm_select extends HTML_QuickForm_select implements templatabl
         parent::__construct($elementName, $elementLabel, $options, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_select($elementName=null, $elementLabel=null, $options=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $options, $attributes);
-    }
-
     /**
      * Sets label to be hidden
      *
diff --git a/public/lib/form/selectgroups.php b/public/lib/form/selectgroups.php
index 8c61bb44129..9de0efd468f 100644
--- a/public/lib/form/selectgroups.php
+++ b/public/lib/form/selectgroups.php
@@ -79,16 +79,6 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element implements tem
         }
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_selectgroups($elementName=null, $elementLabel=null, $optgrps=null, $attributes=null, $showchoose=false) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $optgrps, $attributes, $showchoose);
-    }
-
     /**
      * Sets the default values of the select box
      *
diff --git a/public/lib/form/selectwithlink.php b/public/lib/form/selectwithlink.php
index fc4a91598eb..b5cf9b9b817 100644
--- a/public/lib/form/selectwithlink.php
+++ b/public/lib/form/selectwithlink.php
@@ -83,16 +83,6 @@ class MoodleQuickForm_selectwithlink extends HTML_QuickForm_select implements te
         $this->_type = 'selectwithlink';
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_selectwithlink($elementName=null, $elementLabel=null, $options=null, $attributes=null, $linkdata=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $options, $attributes, $linkdata);
-    }
-
     /**
      * Sets label to be hidden
      *
diff --git a/public/lib/form/selectyesno.php b/public/lib/form/selectyesno.php
index 7764fbb94e8..9d371484eaa 100644
--- a/public/lib/form/selectyesno.php
+++ b/public/lib/form/selectyesno.php
@@ -54,16 +54,6 @@ class MoodleQuickForm_selectyesno extends MoodleQuickForm_select{
         $this->_persistantFreeze = true;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_selectyesno($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes, $options);
-    }
-
     /**
      * Called by HTML_QuickForm whenever form event is made on this element
      *
diff --git a/public/lib/form/static.php b/public/lib/form/static.php
index 835e89e05ab..8e17d3fb15f 100644
--- a/public/lib/form/static.php
+++ b/public/lib/form/static.php
@@ -60,16 +60,6 @@ class MoodleQuickForm_static extends HTML_QuickForm_static implements templatabl
         parent::__construct($elementName, $elementLabel, $text);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_static($elementName=null, $elementLabel=null, $text=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $text);
-    }
-
     /**
      * get html for help button
      *
diff --git a/public/lib/form/submit.php b/public/lib/form/submit.php
index 3942eaed0f3..71eafff642a 100644
--- a/public/lib/form/submit.php
+++ b/public/lib/form/submit.php
@@ -83,16 +83,6 @@ class MoodleQuickForm_submit extends HTML_QuickForm_submit implements templatabl
         $this->customclassoverride = $options['customclassoverride'] ?? false;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_submit($elementName=null, $value=null, $attributes=null, $primary = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $value, $attributes, $primary);
-    }
-
     /**
      * Called by HTML_QuickForm whenever form event is made on this element
      *
diff --git a/public/lib/form/tags.php b/public/lib/form/tags.php
index d7306c482ed..10869e8f860 100644
--- a/public/lib/form/tags.php
+++ b/public/lib/form/tags.php
@@ -154,16 +154,6 @@ class MoodleQuickForm_tags extends MoodleQuickForm_autocomplete {
         return true;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_tags($elementName = null, $elementLabel = null, $options = array(), $attributes = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $options, $attributes);
-    }
-
     /**
      * Finds the tag collection to use for standard tag selector
      *
diff --git a/public/lib/form/text.php b/public/lib/form/text.php
index 38bf5b1061a..5c225a49c84 100644
--- a/public/lib/form/text.php
+++ b/public/lib/form/text.php
@@ -61,16 +61,6 @@ class MoodleQuickForm_text extends HTML_QuickForm_text implements templatable {
         parent::__construct($elementName, $elementLabel, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_text($elementName=null, $elementLabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-
     /**
      * Sets label to be hidden
      *
diff --git a/public/lib/form/textarea.php b/public/lib/form/textarea.php
index e8b7682ce47..25ff9454d8e 100644
--- a/public/lib/form/textarea.php
+++ b/public/lib/form/textarea.php
@@ -66,16 +66,6 @@ class MoodleQuickForm_textarea extends HTML_QuickForm_textarea implements templa
         parent::__construct($elementName, $elementLabel, $attributes);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_textarea($elementName=null, $elementLabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-
     /**
      * get html for help button
      *
diff --git a/public/lib/form/url.php b/public/lib/form/url.php
index 7e1ec9aa0db..1981eacd763 100644
--- a/public/lib/form/url.php
+++ b/public/lib/form/url.php
@@ -77,16 +77,6 @@ class MoodleQuickForm_url extends HTML_QuickForm_text implements templatable {
         $this->_type = 'url';
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_url($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes, $options);
-    }
-
     /**
      * Sets label to be hidden
      *
diff --git a/public/lib/form/warning.php b/public/lib/form/warning.php
index fe7ec66ab5b..206a35ca202 100644
--- a/public/lib/form/warning.php
+++ b/public/lib/form/warning.php
@@ -67,16 +67,6 @@ class MoodleQuickForm_warning extends HTML_QuickForm_static implements templatab
         $this->_class = $elementClass;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_warning($elementName=null, $elementClass='notifyproblem', $text=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementClass, $text);
-    }
-
     /**
      * Returns HTML for this form element.
      *
diff --git a/public/lib/formslib.php b/public/lib/formslib.php
index e07d8d8dbdc..0dcb50404f1 100644
--- a/public/lib/formslib.php
+++ b/public/lib/formslib.php
@@ -231,16 +231,6 @@ abstract class moodleform {
         $this->_process_submission($method);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function moodleform($action=null, $customdata=null, $method='post', $target='', $attributes=null, $editable=true) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($action, $customdata, $method, $target, $attributes, $editable);
-    }
-
     /**
      * It should returns unique identifier for the form.
      * Currently it will return class name, but in case two same forms have to be
@@ -1789,16 +1779,6 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
         );
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm($formName, $method, $action, $target='', $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($formName, $method, $action, $target, $attributes);
-    }
-
     /**
      * Use this method to indicate an element in a form is an advanced field. If items in a form
      * are marked as advanced then 'Hide/Show Advanced' buttons will automatically be displayed in the
@@ -3278,16 +3258,6 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
         parent::__construct();
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_Renderer() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
     /**
      * Set element's as adavance element
      *
diff --git a/public/lib/graphlib.php b/public/lib/graphlib.php
index 81b830c6d19..cf799561293 100644
--- a/public/lib/graphlib.php
+++ b/public/lib/graphlib.php
@@ -1213,16 +1213,6 @@ class graph {
       //ImageColorTransparent($this->image, $this->colour['white']); // colour for transparency
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function graph() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
     /**
      * Prepare label's text for GD output.
      *
diff --git a/public/lib/lexer.php b/public/lib/lexer.php
index 5299f4c877c..8e9f1307642 100644
--- a/public/lib/lexer.php
+++ b/public/lib/lexer.php
@@ -51,16 +51,6 @@
             $this->_regex = null;
         }
 
-        /**
-         * Old syntax of class constructor. Deprecated in PHP7.
-         *
-         * @deprecated since Moodle 3.1
-         */
-        public function ParallelRegex($case) {
-            debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-            self::__construct($case);
-        }
-
         /**
          *    Adds a pattern with an optional label.
          *    @param string $pattern      Perl style regex, but ( and )
@@ -151,16 +141,6 @@
             $this->_stack = array($start);
         }
 
-        /**
-         * Old syntax of class constructor. Deprecated in PHP7.
-         *
-         * @deprecated since Moodle 3.1
-         */
-        public function StateStack($start) {
-            debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-            self::__construct($start);
-        }
-
         /**
          *    Accessor for current state.
          *    @return string State as string.
@@ -231,16 +211,6 @@
             $this->_mode_handlers = array();
         }
 
-        /**
-         * Old syntax of class constructor. Deprecated in PHP7.
-         *
-         * @deprecated since Moodle 3.1
-         */
-        public function Lexer(&$parser, $start = "accept", $case = false) {
-            debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-            self::__construct($parser, $start, $case);
-        }
-
         /**
          *    Adds a token search pattern for a particular
          *    parsing mode. The pattern does not change the
diff --git a/public/lib/mathslib.php b/public/lib/mathslib.php
index 6cee99a3e32..6ce0fcd15a9 100644
--- a/public/lib/mathslib.php
+++ b/public/lib/mathslib.php
@@ -67,16 +67,6 @@ class calc_formula {
         }
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function calc_formula($formula, $params=false) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($formula, $params);
-    }
-
     /**
      * Raplace parameters used in existing formula,
      * parameter names must contain only lowercase [a-z] letters, no other characters are allowed!
diff --git a/public/lib/pear/HTML/Common.php b/public/lib/pear/HTML/Common.php
index 33023e044a7..fe3c66c3ed1 100644
--- a/public/lib/pear/HTML/Common.php
+++ b/public/lib/pear/HTML/Common.php
@@ -89,16 +89,6 @@ class HTML_Common {
         $this->setTabOffset($tabOffset);
     } // end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_Common($attributes = null, $tabOffset = 0) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($attributes, $tabOffset);
-    }
-
     public static function raiseError($message = null,
                                        $code = null,
                                        $mode = null,
diff --git a/public/lib/pear/HTML/QuickForm.php b/public/lib/pear/HTML/QuickForm.php
index 4ef7a24b5bc..56ed7a4e7a4 100644
--- a/public/lib/pear/HTML/QuickForm.php
+++ b/public/lib/pear/HTML/QuickForm.php
@@ -293,16 +293,6 @@ class HTML_QuickForm extends HTML_Common {
         }
     } // end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm($formName='', $method='post', $action='', $target='', $attributes=null, $trackSubmit = false) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($formName, $method, $action, $target, $attributes, $trackSubmit);
-    }
-
     // }}}
     // {{{ apiVersion()
 
@@ -2005,17 +1995,6 @@ class HTML_QuickForm_Error extends PEAR_Error {
         }
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_Error($code = QUICKFORM_ERROR, $mode = PEAR_ERROR_RETURN,
-                         $level = E_USER_NOTICE, $debuginfo = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($code, $mode, $level, $debuginfo);
-    }
-
     // }}}
 } // end class HTML_QuickForm_Error
 ?>
diff --git a/public/lib/pear/HTML/QuickForm/Renderer.php b/public/lib/pear/HTML/QuickForm/Renderer.php
index 324fbf78c1e..ac311084790 100644
--- a/public/lib/pear/HTML/QuickForm/Renderer.php
+++ b/public/lib/pear/HTML/QuickForm/Renderer.php
@@ -36,16 +36,6 @@ class HTML_QuickForm_Renderer
     public function __construct() {
     } // end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_Renderer() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
    /**
     * Called when visiting a form, before processing any form elements
     *
diff --git a/public/lib/pear/HTML/QuickForm/Renderer/Array.php b/public/lib/pear/HTML/QuickForm/Renderer/Array.php
index 36dd2cefc01..d77e46b7bd4 100644
--- a/public/lib/pear/HTML/QuickForm/Renderer/Array.php
+++ b/public/lib/pear/HTML/QuickForm/Renderer/Array.php
@@ -153,16 +153,6 @@ class HTML_QuickForm_Renderer_Array extends HTML_QuickForm_Renderer
         $this->_staticLabels  = $staticLabels;
     } // end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_Renderer_Array($collectHidden = false, $staticLabels = false) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($collectHidden, $staticLabels);
-    }
-
    /**
     * Returns the resultant array
     *
@@ -323,4 +313,4 @@ class HTML_QuickForm_Renderer_Array extends HTML_QuickForm_Renderer
         }
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/public/lib/pear/HTML/QuickForm/Renderer/Default.php b/public/lib/pear/HTML/QuickForm/Renderer/Default.php
index 7c54c130bf3..f1343f3301b 100644
--- a/public/lib/pear/HTML/QuickForm/Renderer/Default.php
+++ b/public/lib/pear/HTML/QuickForm/Renderer/Default.php
@@ -145,16 +145,6 @@ class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
         parent::__construct();
     } // end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_Renderer_Default() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    } // end constructor
-
    /**
     * returns the HTML generated for the form
     *
diff --git a/public/lib/pear/HTML/QuickForm/Renderer/Object.php b/public/lib/pear/HTML/QuickForm/Renderer/Object.php
index b4eade768ef..1c834473a79 100644
--- a/public/lib/pear/HTML/QuickForm/Renderer/Object.php
+++ b/public/lib/pear/HTML/QuickForm/Renderer/Object.php
@@ -84,16 +84,6 @@ class HTML_QuickForm_Renderer_Object extends HTML_QuickForm_Renderer
         $this->_obj = new QuickformForm;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_Renderer_Object($collecthidden = false) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($collecthidden);
-    }
-
     /**
      * Return the rendered Object
      * @access public
diff --git a/public/lib/pear/HTML/QuickForm/Renderer/Tableless.php b/public/lib/pear/HTML/QuickForm/Renderer/Tableless.php
index 5b444ac0bad..195da87140e 100644
--- a/public/lib/pear/HTML/QuickForm/Renderer/Tableless.php
+++ b/public/lib/pear/HTML/QuickForm/Renderer/Tableless.php
@@ -122,16 +122,6 @@ class HTML_QuickForm_Renderer_Tableless extends HTML_QuickForm_Renderer_Default
         parent::__construct();
     } // end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_Renderer_Tableless() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
    /**
     * Called when visiting a header element
     *
diff --git a/public/lib/pear/HTML/QuickForm/advcheckbox.php b/public/lib/pear/HTML/QuickForm/advcheckbox.php
index 896fa271f71..45e37fa469d 100644
--- a/public/lib/pear/HTML/QuickForm/advcheckbox.php
+++ b/public/lib/pear/HTML/QuickForm/advcheckbox.php
@@ -82,16 +82,6 @@ class HTML_QuickForm_advcheckbox extends HTML_QuickForm_checkbox
         $this->setValues($values);
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_advcheckbox($elementName=null, $elementLabel=null, $text=null, $attributes=null, $values=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $text, $attributes, $values);
-    }
-
     // }}}
     // {{{ getPrivateName()
 
diff --git a/public/lib/pear/HTML/QuickForm/autocomplete.php b/public/lib/pear/HTML/QuickForm/autocomplete.php
index acfbd20badd..144a92b1297 100644
--- a/public/lib/pear/HTML/QuickForm/autocomplete.php
+++ b/public/lib/pear/HTML/QuickForm/autocomplete.php
@@ -84,16 +84,6 @@ class HTML_QuickForm_autocomplete extends HTML_QuickForm_text
         }
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_autocomplete($elementName = null, $elementLabel = null, $options = null, $attributes = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $options, $attributes);
-    }
-
     // }}}
     // {{{ setOptions()
 
diff --git a/public/lib/pear/HTML/QuickForm/button.php b/public/lib/pear/HTML/QuickForm/button.php
index 95e975ffc7b..d79dc730326 100644
--- a/public/lib/pear/HTML/QuickForm/button.php
+++ b/public/lib/pear/HTML/QuickForm/button.php
@@ -52,16 +52,6 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
         $this->setType('button');
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_button($elementName=null, $value=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $value, $attributes);
-    }
-    
     // }}}
     // {{{ freeze()
 
diff --git a/public/lib/pear/HTML/QuickForm/checkbox.php b/public/lib/pear/HTML/QuickForm/checkbox.php
index f305fc5f968..0b2b53c5bee 100644
--- a/public/lib/pear/HTML/QuickForm/checkbox.php
+++ b/public/lib/pear/HTML/QuickForm/checkbox.php
@@ -65,16 +65,6 @@ class HTML_QuickForm_checkbox extends HTML_QuickForm_input
         $this->updateAttributes(array('value'=>1));
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_checkbox($elementName=null, $elementLabel=null, $text='', $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $text, $attributes);
-    }
-
     // }}}
     // {{{ setChecked()
 
diff --git a/public/lib/pear/HTML/QuickForm/date.php b/public/lib/pear/HTML/QuickForm/date.php
index 405638332c7..9e6d36e0191 100644
--- a/public/lib/pear/HTML/QuickForm/date.php
+++ b/public/lib/pear/HTML/QuickForm/date.php
@@ -288,16 +288,6 @@ class HTML_QuickForm_date extends HTML_QuickForm_group
         }
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_date($elementName = null, $elementLabel = null, $options = array(), $attributes = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $options, $attributes);
-    }
-
     // }}}
     // {{{ _createElements()
 
diff --git a/public/lib/pear/HTML/QuickForm/element.php b/public/lib/pear/HTML/QuickForm/element.php
index 45057e83d93..22d186d46a5 100644
--- a/public/lib/pear/HTML/QuickForm/element.php
+++ b/public/lib/pear/HTML/QuickForm/element.php
@@ -94,16 +94,6 @@ class HTML_QuickForm_element extends HTML_Common
         }
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_element($elementName=null, $elementLabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-    
     // }}}
     // {{{ apiVersion()
 
diff --git a/public/lib/pear/HTML/QuickForm/file.php b/public/lib/pear/HTML/QuickForm/file.php
index b698b670a7d..bf9760d5c4a 100644
--- a/public/lib/pear/HTML/QuickForm/file.php
+++ b/public/lib/pear/HTML/QuickForm/file.php
@@ -66,16 +66,6 @@ class HTML_QuickForm_file extends HTML_QuickForm_input
         $this->setType('file');
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_file($elementName=null, $elementLabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-
     // }}}
     // {{{ setSize()
 
diff --git a/public/lib/pear/HTML/QuickForm/group.php b/public/lib/pear/HTML/QuickForm/group.php
index 91326591635..f6067b714ab 100644
--- a/public/lib/pear/HTML/QuickForm/group.php
+++ b/public/lib/pear/HTML/QuickForm/group.php
@@ -110,16 +110,6 @@ class HTML_QuickForm_group extends HTML_QuickForm_element
         }
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_group($elementName = null, $elementLabel = null, $elements = null, $separator = null, $appendName = true, $attributes = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $elements, $separator, $appendName);
-    }
-
     // }}}
     // {{{ setName()
 
@@ -589,4 +579,4 @@ class HTML_QuickForm_group extends HTML_QuickForm_element
 
     // }}}
 } //end class HTML_QuickForm_group
-?>
\ No newline at end of file
+?>
diff --git a/public/lib/pear/HTML/QuickForm/header.php b/public/lib/pear/HTML/QuickForm/header.php
index 6ba301c3da8..a692a7aabc4 100644
--- a/public/lib/pear/HTML/QuickForm/header.php
+++ b/public/lib/pear/HTML/QuickForm/header.php
@@ -43,16 +43,6 @@ class HTML_QuickForm_header extends HTML_QuickForm_static
         $this->_type = 'header';
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_header($elementName = null, $text = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $text);
-    }
-
     // }}}
     // {{{ accept()
 
diff --git a/public/lib/pear/HTML/QuickForm/hidden.php b/public/lib/pear/HTML/QuickForm/hidden.php
index edbade9b797..3a48d047c3d 100644
--- a/public/lib/pear/HTML/QuickForm/hidden.php
+++ b/public/lib/pear/HTML/QuickForm/hidden.php
@@ -51,16 +51,6 @@ class HTML_QuickForm_hidden extends HTML_QuickForm_input
         $this->setValue($value);
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_hidden($elementName=null, $value='', $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        return self::__construct($elementName, $value, $attributes);
-    }
-
     // }}}
     // {{{ freeze()
 
diff --git a/public/lib/pear/HTML/QuickForm/hiddenselect.php b/public/lib/pear/HTML/QuickForm/hiddenselect.php
index acafa4f90eb..c4888673209 100644
--- a/public/lib/pear/HTML/QuickForm/hiddenselect.php
+++ b/public/lib/pear/HTML/QuickForm/hiddenselect.php
@@ -59,16 +59,6 @@ class HTML_QuickForm_hiddenselect extends HTML_QuickForm_select
         }
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_hiddenselect($elementName=null, $elementLabel=null, $options=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $options, $attributes);
-    }
-
     // }}}
     // {{{ toHtml()
 
diff --git a/public/lib/pear/HTML/QuickForm/hierselect.php b/public/lib/pear/HTML/QuickForm/hierselect.php
index 89376a27644..032e3bbf2b2 100644
--- a/public/lib/pear/HTML/QuickForm/hierselect.php
+++ b/public/lib/pear/HTML/QuickForm/hierselect.php
@@ -129,16 +129,6 @@ class HTML_QuickForm_hierselect extends HTML_QuickForm_group
         $this->_appendName = true;
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_hierselect($elementName=null, $elementLabel=null, $attributes=null, $separator=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes, $separator);
-    }
-
     // }}}
     // {{{ setOptions()
 
diff --git a/public/lib/pear/HTML/QuickForm/html.php b/public/lib/pear/HTML/QuickForm/html.php
index a8c6f012dd0..4413599a998 100644
--- a/public/lib/pear/HTML/QuickForm/html.php
+++ b/public/lib/pear/HTML/QuickForm/html.php
@@ -45,16 +45,6 @@ class HTML_QuickForm_html extends HTML_QuickForm_static
         $this->_type = 'html';
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_html($text = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($text);
-    }
-
     // }}}
     // {{{ accept()
 
diff --git a/public/lib/pear/HTML/QuickForm/image.php b/public/lib/pear/HTML/QuickForm/image.php
index 3cdef2ba712..cac4c0a5e3c 100644
--- a/public/lib/pear/HTML/QuickForm/image.php
+++ b/public/lib/pear/HTML/QuickForm/image.php
@@ -50,16 +50,6 @@ class HTML_QuickForm_image extends HTML_QuickForm_input
         $this->setSource($src);
     } // end class constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_image($elementName=null, $src='', $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $src, $attributes);
-    }
-
     // }}}
     // {{{ setSource()
 
diff --git a/public/lib/pear/HTML/QuickForm/input.php b/public/lib/pear/HTML/QuickForm/input.php
index aa197d172e5..f4d9fb07cb5 100644
--- a/public/lib/pear/HTML/QuickForm/input.php
+++ b/public/lib/pear/HTML/QuickForm/input.php
@@ -49,16 +49,6 @@ class HTML_QuickForm_input extends HTML_QuickForm_element
         parent::__construct($elementName, $elementLabel, $attributes);
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_input($elementName=null, $elementLabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-
     // }}}
     // {{{ setType()
 
diff --git a/public/lib/pear/HTML/QuickForm/link.php b/public/lib/pear/HTML/QuickForm/link.php
index 72787405828..13cdfb81ca0 100644
--- a/public/lib/pear/HTML/QuickForm/link.php
+++ b/public/lib/pear/HTML/QuickForm/link.php
@@ -66,16 +66,6 @@ class HTML_QuickForm_link extends HTML_QuickForm_static
         $this->_text = $text;
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_link($elementName=null, $elementLabel=null, $href=null, $text=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $href, $text, $attributes);
-    }
-
     // }}}
     // {{{ setName()
 
diff --git a/public/lib/pear/HTML/QuickForm/password.php b/public/lib/pear/HTML/QuickForm/password.php
index 6d4c73089e2..9c039c131c3 100644
--- a/public/lib/pear/HTML/QuickForm/password.php
+++ b/public/lib/pear/HTML/QuickForm/password.php
@@ -51,16 +51,6 @@ class HTML_QuickForm_password extends HTML_QuickForm_input
         $this->setType('password');
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_password($elementName=null, $elementLabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-    
     // }}}
     // {{{ setSize()
 
diff --git a/public/lib/pear/HTML/QuickForm/radio.php b/public/lib/pear/HTML/QuickForm/radio.php
index b3569fdf500..e192ee71308 100644
--- a/public/lib/pear/HTML/QuickForm/radio.php
+++ b/public/lib/pear/HTML/QuickForm/radio.php
@@ -68,16 +68,6 @@ class HTML_QuickForm_radio extends HTML_QuickForm_input
         $this->_text = $text;
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_radio($elementName=null, $elementLabel=null, $text=null, $value=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $text, $value, $attributes);
-    }
-
     // }}}
 
     function _generateId() {
diff --git a/public/lib/pear/HTML/QuickForm/reset.php b/public/lib/pear/HTML/QuickForm/reset.php
index 62ee12f2d64..42dbce6bced 100644
--- a/public/lib/pear/HTML/QuickForm/reset.php
+++ b/public/lib/pear/HTML/QuickForm/reset.php
@@ -51,16 +51,6 @@ class HTML_QuickForm_reset extends HTML_QuickForm_input
         $this->setType('reset');
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_reset($elementName=null, $value=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $value, $attributes);
-    }
-
     // }}}
     // {{{ freeze()
 
diff --git a/public/lib/pear/HTML/QuickForm/select.php b/public/lib/pear/HTML/QuickForm/select.php
index d06b40181e3..88a19a4cfa8 100644
--- a/public/lib/pear/HTML/QuickForm/select.php
+++ b/public/lib/pear/HTML/QuickForm/select.php
@@ -75,16 +75,6 @@ class HTML_QuickForm_select extends HTML_QuickForm_element {
         }
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_select($elementName=null, $elementLabel=null, $options=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-    
     // }}}
     // {{{ apiVersion()
 
diff --git a/public/lib/pear/HTML/QuickForm/static.php b/public/lib/pear/HTML/QuickForm/static.php
index 728eabdaa6f..6b178405a15 100644
--- a/public/lib/pear/HTML/QuickForm/static.php
+++ b/public/lib/pear/HTML/QuickForm/static.php
@@ -56,16 +56,6 @@ class HTML_QuickForm_static extends HTML_QuickForm_element {
         $this->_text = $text;
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_static($elementName=null, $elementLabel=null, $text=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $text);
-    }
-
     // }}}
     // {{{ setName()
 
diff --git a/public/lib/pear/HTML/QuickForm/submit.php b/public/lib/pear/HTML/QuickForm/submit.php
index 6ca23a47cf6..e6e9437bc91 100644
--- a/public/lib/pear/HTML/QuickForm/submit.php
+++ b/public/lib/pear/HTML/QuickForm/submit.php
@@ -50,16 +50,6 @@ class HTML_QuickForm_submit extends HTML_QuickForm_input
         $this->setType('submit');
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_submit($elementName=null, $value=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $value, $attributes);
-    }
-
     // }}}
     // {{{ freeze()
 
diff --git a/public/lib/pear/HTML/QuickForm/text.php b/public/lib/pear/HTML/QuickForm/text.php
index 042e50875c5..3ab6efccfc1 100644
--- a/public/lib/pear/HTML/QuickForm/text.php
+++ b/public/lib/pear/HTML/QuickForm/text.php
@@ -52,16 +52,6 @@ class HTML_QuickForm_text extends HTML_QuickForm_input
         $this->setType('text');
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_text($elementName=null, $elementLabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-        
     // }}}
     // {{{ setSize()
 
diff --git a/public/lib/pear/HTML/QuickForm/textarea.php b/public/lib/pear/HTML/QuickForm/textarea.php
index 52cd0080291..8ed18acebc7 100644
--- a/public/lib/pear/HTML/QuickForm/textarea.php
+++ b/public/lib/pear/HTML/QuickForm/textarea.php
@@ -61,16 +61,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         $this->_type = 'textarea';
     } //end constructor
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_textarea($elementName=null, $elementLabel=null, $attributes=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-
     // }}}
     // {{{ setName()
 
diff --git a/public/lib/pear/HTML/QuickForm/xbutton.php b/public/lib/pear/HTML/QuickForm/xbutton.php
index b8f972ba1bf..2d195202c6f 100644
--- a/public/lib/pear/HTML/QuickForm/xbutton.php
+++ b/public/lib/pear/HTML/QuickForm/xbutton.php
@@ -51,16 +51,6 @@ class HTML_QuickForm_xbutton extends HTML_QuickForm_element
         $this->_type = 'xbutton';
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function HTML_QuickForm_xbutton($elementName = null, $elementContent = null, $attributes = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementContent, $attributes);
-    }
-
     function toHtml()
     {
         return '<button' . $this->getAttributes(true) . '>' . $this->_content . '</button>';
diff --git a/public/lib/pear/PEAR.php b/public/lib/pear/PEAR.php
index 03622a978c2..75df4212bd7 100644
--- a/public/lib/pear/PEAR.php
+++ b/public/lib/pear/PEAR.php
@@ -890,14 +890,6 @@ class PEAR_Error
         }
     }
 
-    /**
-     * Old syntax of class constructor for backward compatibility.
-     */
-    public function PEAR_Error($message = 'unknown error', $code = null,
-                        $mode = null, $options = null, $userinfo = null) {
-        self::__construct($message, $code, $mode, $options, $userinfo);
-    }
-
     /**
      * Get the error mode from an error object.
      *
diff --git a/public/lib/searchlib.php b/public/lib/searchlib.php
index 6845610cc81..c6ab297b9ec 100644
--- a/public/lib/searchlib.php
+++ b/public/lib/searchlib.php
@@ -57,16 +57,6 @@ class search_token {
 
   }
 
-  /**
-   * Old syntax of class constructor. Deprecated in PHP7.
-   *
-   * @deprecated since Moodle 3.1
-   */
-  public function search_token($type, $value) {
-    debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-    self::__construct($type, $value);
-  }
-
   // Try to clean up user input to avoid potential security issues.
   // Need to think about this some more.
 
@@ -213,16 +203,6 @@ class search_lexer extends Lexer{
 
   }
 
-  /**
-   * Old syntax of class constructor. Deprecated in PHP7.
-   *
-   * @deprecated since Moodle 3.1
-   */
-  public function search_lexer(&$parser) {
-    debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-    self::__construct($parser);
-  }
-
 }
 
 
diff --git a/public/mnet/xmlrpc/xmlparser.php b/public/mnet/xmlrpc/xmlparser.php
index 2eea904f60f..03736c5d24c 100644
--- a/public/mnet/xmlrpc/xmlparser.php
+++ b/public/mnet/xmlrpc/xmlparser.php
@@ -61,16 +61,6 @@ class mnet_encxml_parser {
         return $this->initialise();
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function mnet_encxml_parser() {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct();
-    }
-
     /**
      * Set default element handlers and initialise properties to empty.
      *
diff --git a/public/mod/data/export_form.php b/public/mod/data/export_form.php
index 2fb88065208..3207d2e83f2 100644
--- a/public/mod/data/export_form.php
+++ b/public/mod/data/export_form.php
@@ -20,16 +20,6 @@ class mod_data_export_form extends moodleform {
         parent::__construct($url);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function mod_data_export_form($url, $datafields, $cm, $data) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($url, $datafields, $cm, $data);
-    }
-
     function definition() {
         $mform =& $this->_form;
         $mform->addElement('header', 'exportformat', get_string('chooseexportformat', 'data'));
diff --git a/public/mod/lesson/mod_form.php b/public/mod/lesson/mod_form.php
index ec95d1e46e3..d393f5641e9 100644
--- a/public/mod/lesson/mod_form.php
+++ b/public/mod/lesson/mod_form.php
@@ -38,16 +38,6 @@ class mod_lesson_mod_form extends moodleform_mod {
         parent::__construct($current, $section, $cm, $course);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function mod_lesson_mod_form($current, $section, $cm, $course) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($current, $section, $cm, $course);
-    }
-
     function definition() {
         global $CFG, $COURSE, $DB, $OUTPUT;
 
diff --git a/public/mod/wiki/diff/difflib.php b/public/mod/wiki/diff/difflib.php
index 168a83a8609..653e72ea6f0 100644
--- a/public/mod/wiki/diff/difflib.php
+++ b/public/mod/wiki/diff/difflib.php
@@ -321,16 +321,6 @@ class ouwiki_line {
         }
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function ouwiki_line($data, $linepos) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($data, $linepos);
-    }
-
     /**
      * @return string Normalised string representation of this line object
      */
@@ -383,16 +373,6 @@ class ouwiki_word {
         $this->word=$word;
         $this->start=$start;
     }
-
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function ouwiki_word($word, $start) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($word, $start);
-    }
 }
 
 /**
@@ -534,16 +514,6 @@ class ouwiki_changes {
         }
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function ouwiki_changes($diff, $count2) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($diff, $count2);
-    }
-
     /**
      * Find deleted lines. These are lines in file1 that
      * cannot be present even in modified form in file2
@@ -762,4 +732,3 @@ function ouwiki_diff_html($html1,$html2) {
         '<strong class="accesshide">'.get_string('addedends','wiki').'</strong>');
     return array($result1,$result2);
 }
-
diff --git a/public/mod/wiki/editors/wikieditor.php b/public/mod/wiki/editors/wikieditor.php
index fdb60c361b5..f6821d8e72b 100644
--- a/public/mod/wiki/editors/wikieditor.php
+++ b/public/mod/wiki/editors/wikieditor.php
@@ -60,16 +60,6 @@ class MoodleQuickForm_wikieditor extends MoodleQuickForm_textarea {
         $this->_type = 'wikieditor';
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_wikieditor($elementName = null, $elementLabel = null, $attributes = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes);
-    }
-
     function setWikiFormat($wikiformat) {
         $this->wikiformat = $wikiformat;
     }
diff --git a/public/mod/wiki/editors/wikifiletable.php b/public/mod/wiki/editors/wikifiletable.php
index 96577623dc4..89e742724b2 100644
--- a/public/mod/wiki/editors/wikifiletable.php
+++ b/public/mod/wiki/editors/wikifiletable.php
@@ -49,16 +49,6 @@ class MoodleQuickForm_wikifiletable extends HTML_QuickForm_element {
         $this->_format = $format;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function MoodleQuickForm_wikifiletable($elementName = null, $elementLabel = null, $attributes = null, $fileinfo = null, $format = null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($elementName, $elementLabel, $attributes, $fileinfo, $format);
-    }
-
     function onQuickFormEvent($event, $arg, &$caller) {
         global $OUTPUT;
 
@@ -174,5 +164,3 @@ class MoodleQuickForm_wikifiletable extends HTML_QuickForm_element {
 
 //register wikieditor
 MoodleQuickForm::registerElementType('wikifiletable', $CFG->dirroot."/mod/wiki/editors/wikifiletable.php", 'MoodleQuickForm_wikifiletable');
-
-
diff --git a/public/user/filters/cohort.php b/public/user/filters/cohort.php
index 1ea0fe1da12..5f512ff9463 100644
--- a/public/user/filters/cohort.php
+++ b/public/user/filters/cohort.php
@@ -41,16 +41,6 @@ class user_filter_cohort extends user_filter_type {
         parent::__construct('cohort', get_string('idnumber', 'core_cohort'), $advanced);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function user_filter_cohort($advanced) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($advanced);
-    }
-
     /**
      * Returns an array of comparison operators
      * @return array of comparison operators
diff --git a/public/user/filters/courserole.php b/public/user/filters/courserole.php
index 03c1ac35bce..8ed9acca853 100644
--- a/public/user/filters/courserole.php
+++ b/public/user/filters/courserole.php
@@ -41,16 +41,6 @@ class user_filter_courserole extends user_filter_type {
         parent::__construct($name, $label, $advanced);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function user_filter_courserole($name, $label, $advanced) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($name, $label, $advanced);
-    }
-
     /**
      * Returns an array of available roles
      * @return array of availble roles
diff --git a/public/user/filters/date.php b/public/user/filters/date.php
index 9d77613787c..c51df88e242 100644
--- a/public/user/filters/date.php
+++ b/public/user/filters/date.php
@@ -49,16 +49,6 @@ class user_filter_date extends user_filter_type {
         $this->_field = $field;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function user_filter_date($name, $label, $advanced, $field) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($name, $label, $advanced, $field);
-    }
-
     /**
      * Adds controls specific to this filter in the form.
      * @param object $mform a MoodleForm object to setup
diff --git a/public/user/filters/globalrole.php b/public/user/filters/globalrole.php
index aca521d76fa..629bf357032 100644
--- a/public/user/filters/globalrole.php
+++ b/public/user/filters/globalrole.php
@@ -42,16 +42,6 @@ class user_filter_globalrole extends user_filter_type {
         parent::__construct($name, $label, $advanced);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function user_filter_globalrole($name, $label, $advanced) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($name, $label, $advanced);
-    }
-
     /**
      * Returns an array of available roles
      * @return array of availble roles
diff --git a/public/user/filters/lib.php b/public/user/filters/lib.php
index 3e2d057121c..7f790b2bf8a 100644
--- a/public/user/filters/lib.php
+++ b/public/user/filters/lib.php
@@ -314,16 +314,6 @@ class user_filter_type {
         $this->_advanced = $advanced;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function user_filter_type($name, $label, $advanced) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($name, $label, $advanced);
-    }
-
     /**
      * Returns the condition to be used with SQL where
      * @param array $data filter settings
diff --git a/public/user/filters/profilefield.php b/public/user/filters/profilefield.php
index 23e575afbda..d36dc5b0fdf 100644
--- a/public/user/filters/profilefield.php
+++ b/public/user/filters/profilefield.php
@@ -43,16 +43,6 @@ class user_filter_profilefield extends user_filter_type {
         parent::__construct($name, $label, $advanced);
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function user_filter_profilefield($name, $label, $advanced) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($name, $label, $advanced);
-    }
-
     /**
      * Returns an array of comparison operators
      * @return array of comparison operators
diff --git a/public/user/filters/select.php b/public/user/filters/select.php
index 88e942a59e6..1311d2f252c 100644
--- a/public/user/filters/select.php
+++ b/public/user/filters/select.php
@@ -59,16 +59,6 @@ class user_filter_select extends user_filter_type {
         $this->_default = $default;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function user_filter_select($name, $label, $advanced, $field, $options, $default=null) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($name, $label, $advanced, $field, $options, $default=null);
-    }
-
     /**
      * Returns an array of comparison operators
      * @return array of comparison operators
@@ -168,4 +158,3 @@ class user_filter_select extends user_filter_type {
         return get_string('selectlabel', 'filters', $a);
     }
 }
-
diff --git a/public/user/filters/simpleselect.php b/public/user/filters/simpleselect.php
index 04f2c3b5f0d..63eeb8ca8d6 100644
--- a/public/user/filters/simpleselect.php
+++ b/public/user/filters/simpleselect.php
@@ -56,16 +56,6 @@ class user_filter_simpleselect extends user_filter_type {
         $this->_options = $options;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function user_filter_simpleselect($name, $label, $advanced, $field, $options) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($name, $label, $advanced, $field, $options);
-    }
-
     /**
      * Adds controls specific to this filter in the form.
      * @param moodleform $mform a MoodleForm object to setup
@@ -127,4 +117,3 @@ class user_filter_simpleselect extends user_filter_type {
         return get_string('selectlabel', 'filters', $a);
     }
 }
-
diff --git a/public/user/filters/text.php b/public/user/filters/text.php
index e8d71acb523..3a7f9dff3b1 100644
--- a/public/user/filters/text.php
+++ b/public/user/filters/text.php
@@ -46,16 +46,6 @@ class user_filter_text extends user_filter_type {
         $this->_field = $field;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function user_filter_text($name, $label, $advanced, $field) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($name, $label, $advanced, $field);
-    }
-
     /**
      * Returns an array of comparison operators
      * @return array of comparison operators
diff --git a/public/user/filters/yesno.php b/public/user/filters/yesno.php
index 5dadd805008..738976f431c 100644
--- a/public/user/filters/yesno.php
+++ b/public/user/filters/yesno.php
@@ -41,16 +41,6 @@ class user_filter_yesno extends user_filter_simpleselect {
         parent::__construct($name, $label, $advanced, $field, array(0 => get_string('no'), 1 => get_string('yes')));
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function user_filter_yesno($name, $label, $advanced, $field) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($name, $label, $advanced, $field);
-    }
-
     /**
      * Returns the condition to be used with SQL
      *
diff --git a/public/user/profile/lib.php b/public/user/profile/lib.php
index a3dd768e311..831a7c2d610 100644
--- a/public/user/profile/lib.php
+++ b/public/user/profile/lib.php
@@ -117,16 +117,6 @@ class profile_field_base {
         }
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function profile_field_base($fieldid=0, $userid=0) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($fieldid, $userid);
-    }
-
     /**
      * Abstract method: Adds the profile field to the moodle form class
      * @abstract The following methods must be overwritten by child classes