diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index 1bee09a585e..8f7f5bf2ceb 100755
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -67,7 +67,7 @@ class enrolment_plugin_authorize
         print_course($course, '80%');
 
         if ($course->password) {
-            echo $OUTPUT->heading(get_string('choosemethod', 'enrol_authorize'), null, 'mdl-align');
+            echo $OUTPUT->heading(get_string('choosemethod', 'enrol_authorize'));
         }
 
         if ($USER->username == 'guest') { // only real guest user, not for users with guest role
diff --git a/enrol/paypal/enrol.php b/enrol/paypal/enrol.php
index dfba7da7ae3..be973157811 100644
--- a/enrol/paypal/enrol.php
+++ b/enrol/paypal/enrol.php
@@ -38,7 +38,7 @@ function print_entry($course) {
         print_course($course, "80%");
 
         if ($course->password) {  // Presenting two options
-            echo $OUTPUT->heading(get_string('costorkey', 'enrol_paypal'), null, 'mdl-align');
+            echo $OUTPUT->heading(get_string('costorkey', 'enrol_paypal'));
         }
 
         print_simple_box_start("center");
diff --git a/group/index.php b/group/index.php
index d4af670c6a5..c8349bcf382 100644
--- a/group/index.php
+++ b/group/index.php
@@ -149,7 +149,7 @@ if (ajaxenabled()) {
     $deletegroup_disabled = '';
 }
 
-echo $OUTPUT->heading(format_string($course->shortname) .' '.$strgroups, 3, 'mdl-align');
+echo $OUTPUT->heading(format_string($course->shortname) .' '.$strgroups, 3);
 echo '<form id="groupeditform" action="index.php" method="post">'."\n";
 echo '<div>'."\n";
 echo '<input type="hidden" name="id" value="' . $courseid . '" />'."\n";
diff --git a/group/overview.php b/group/overview.php
index 9836fd9aaa5..76686616f63 100644
--- a/group/overview.php
+++ b/group/overview.php
@@ -119,7 +119,7 @@ $currenttab = 'overview';
 require('tabs.php');
 
 /// Print overview
-echo $OUTPUT->heading(format_string($course->shortname) .' '.$stroverview, 3, 'mdl-align');
+echo $OUTPUT->heading(format_string($course->shortname) .' '.$stroverview, 3);
 
 echo $strfiltergroups;
 
diff --git a/mod/lesson/highscores.php b/mod/lesson/highscores.php
index b097c606638..7c8d51109b9 100644
--- a/mod/lesson/highscores.php
+++ b/mod/lesson/highscores.php
@@ -154,10 +154,10 @@
                 $grades = array();
             }
         
-            echo $OUTPUT->heading(get_string("topscorestitle", "lesson", $lesson->maxhighscores), 4, 'mdl-align');
+            echo $OUTPUT->heading(get_string("topscorestitle", "lesson", $lesson->maxhighscores), 4);
 
             if (!$highscores = $DB->get_records_select("lesson_high_scores", "lessonid = :lessonid", $params)) {
-                echo $OUTPUT->heading(get_string("nohighscores", "lesson"), 3, 'mdl-align');
+                echo $OUTPUT->heading(get_string("nohighscores", "lesson"), 3);
             } else {
                 foreach ($highscores as $highscore) {
                     $grade = $grades[$highscore->gradeid]->grade;
diff --git a/mod/lesson/report.php b/mod/lesson/report.php
index 6b22ddd762e..8ad3af5e1cd 100644
--- a/mod/lesson/report.php
+++ b/mod/lesson/report.php
@@ -835,7 +835,7 @@
                 //$headingobject->firstname = $students[$userid]->firstname;
                 //$headingobject->attempt = $try + 1;
                 //print_heading(get_string("studentattemptlesson", "lesson", $headingobject));
-            print_heading(get_string('attempt', 'lesson', $try+1));
+            echo $OUTPUT->heading(get_string('attempt', 'lesson', $try+1));
             
             $table->head = array();
             $table->align = array("right", "left");
diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index 35e46e2229f..82da2e4517e 100644
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -241,7 +241,7 @@ class default_questiontype {
             }
         }
         if (!$question->formoptions->movecontext  && count($permissionstrs)){
-            echo $OUTPUT->heading(get_string('permissionto', 'question'), 3, 'mdl-align');
+            echo $OUTPUT->heading(get_string('permissionto', 'question'), 3);
             $html = '<ul>';
             foreach ($permissionstrs as $permissionstr){
                 $html .= '<li>'.$permissionstr.'</li>';
diff --git a/user/index.php b/user/index.php
index 269a81015c5..92ae73d676a 100644
--- a/user/index.php
+++ b/user/index.php
@@ -615,7 +615,7 @@
             $heading .= ' <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?roleid='.$roleid.'&amp;contextid='.$context->id.'">';
             $heading .= '<img src="'.$OUTPUT->old_icon_url('i/edit') . '" class="icon" alt="" /></a>';
         }
-        echo $OUTPUT->heading($heading, 3, 'mdl-align');
+        echo $OUTPUT->heading($heading, 3);
     } else {
         if ($course->id != SITEID && has_capability('moodle/role:assign', $context)) {
             $editlink  = ' <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$context->id.'">';