diff --git a/admin/settings.php b/admin/settings.php
index 10b9f6b727a..04bf9bc64e1 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -97,7 +97,7 @@ if (empty($SITE->fullname)) {
             $caption = get_string('blocksediton');
             $options['adminedit'] = 'on';
         }
-        $buttons = $OUTPUT->button(html_form::make_button($PAGE->url->out(false), $options, $caption, 'get'));
+        $buttons = $OUTPUT->button(html_form::make_button($PAGE->url->out(), $options, $caption, 'get'));
     }
 
     $visiblepathtosection = array_reverse($settingspage->visiblepath);
diff --git a/lib/adminlib.php b/lib/adminlib.php
index 08cad4d3aa9..11dbdb97e22 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -5263,7 +5263,7 @@ function admin_externalpage_print_header($focus='') {
             $caption = get_string('blocksediton');
             $options['adminedit'] = 'on';
         }
-        $buttons = $OUTPUT->button(html_form::make_button($PAGE->url->out(false), $options, $caption, 'get'));
+        $buttons = $OUTPUT->button(html_form::make_button($PAGE->url->out(), $options, $caption, 'get'));
     }
 
     $PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
diff --git a/lib/pagelib.php b/lib/pagelib.php
index 3b34c2aaeaa..1f3879f5cb8 100644
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -1378,8 +1378,8 @@ class moodle_page {
      * @return string URL for this page without parameters.
      */
     function url_get_path() {
-        debugging('Call to deprecated method moodle_page::url_get_path. Use $this->url->out(false) instead.');
-        return $this->url->out(false);
+        debugging('Call to deprecated method moodle_page::url_get_path. Use $this->url->out() instead.');
+        return $this->url->out();
     }
 
     /**
diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index 0caf62fc52e..96e1ac71f62 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -654,7 +654,7 @@ function quiz_print_pagecontrols($quiz, $pageurl, $page, $hasattempts) {
     $returnurl_addtoquiz = new moodle_url($pageurl->out(true), array('addonpage' => $page));
 
     // Print a button linking to the choose question type page.
-    $newquestionparams = array('returnurl' => $returnurl_addtoquiz->out(false),
+    $newquestionparams = array('returnurl' => $returnurl_addtoquiz->out(),
             'cmid' => $quiz->cmid, 'appendqnumstring' => 'addquestion');
     create_new_question_button($defaultcategory->id, $newquestionparams, get_string('addaquestion', 'quiz'),
             get_string('createquestionandadd', 'quiz'), $hasattempts);
diff --git a/question/editlib.php b/question/editlib.php
index df9a6c6cc62..0f5a4a1b157 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -1535,7 +1535,7 @@ function question_edit_setup($edittab, $requirecmid = false, $requirecourseid =
     //$thispageurl is used to construct urls for all question edit pages we link to from this page. It contains an array
     //of parameters that are passed from page to page.
     $thispageurl = new moodle_url();
-    $thispageurl->remove_params(); // We are going to explicity add back everything important - this avoids unwanted params from being retained.
+    $thispageurl->remove_all_params(); // We are going to explicity add back everything important - this avoids unwanted params from being retained.
 
     if ($requirecmid){
         $cmid =required_param('cmid', PARAM_INT);
diff --git a/repository/filepicker.php b/repository/filepicker.php
index f7e703441e9..08ecfdba2e2 100755
--- a/repository/filepicker.php
+++ b/repository/filepicker.php
@@ -170,7 +170,7 @@ case 'sign':
         $list = $repo->get_listing($req_path, $curr_page);
         $dynload = !empty($list['dynload'])?true:false;
         if (!empty($list['upload'])) {
-            echo '<form action="'.$url->out(false).'" method="post" enctype="multipart/form-data" style="display:inline">';
+            echo '<form action="'.$url->out().'" method="post" enctype="multipart/form-data" style="display:inline">';
             echo '<label>'.$list['upload']['label'].': </label>';
             echo '<input type="file" name="repo_upload_file" /><br />';
             echo '<input type="hidden" name="action" value="upload" /><br />';