diff --git a/Credentials/CHANGEDB.php b/Credentials/CHANGEDB.php
index 837b8fd..2e195f1 100644
--- a/Credentials/CHANGEDB.php
+++ b/Credentials/CHANGEDB.php
@@ -149,3 +149,8 @@
 ++$count;
 $sql[$count][0] = '3.1.05';
 $sql[$count][1] = "";
+
+//3.1.06
+++$count;
+$sql[$count][0] = '3.1.06';
+$sql[$count][1] = "";
diff --git a/Credentials/CHANGELOG.txt b/Credentials/CHANGELOG.txt
index d027501..2371efd 100644
--- a/Credentials/CHANGELOG.txt
+++ b/Credentials/CHANGELOG.txt
@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+v3.1.06
+-------
+Removed deprecated function calls
+
 v3.1.05
 -------
 Final session refactoring
diff --git a/Credentials/credentials_student.php b/Credentials/credentials_student.php
index 1c2e3bf..cc1e3bb 100644
--- a/Credentials/credentials_student.php
+++ b/Credentials/credentials_student.php
@@ -63,10 +63,6 @@
             ]);
             $page->breadcrumbs->add(Format::name('', $student['preferredName'], $student['surname'], 'Student'));
 
-            if (isset($_GET['return'])) {
-                returnProcess($guid, $_GET['return'], null, null);
-            }
-
             if ($search != '' or $allStudents != '') {
                 echo "<div class='linkTop'>";
                 echo "<a href='".$session->get('absoluteURL')."/index.php?q=/modules/Credentials/credentials.php&search=$search&allStudents=$allStudents'>".__m('Back to Search Results').'</a>';
diff --git a/Credentials/credentials_student_add.php b/Credentials/credentials_student_add.php
index 6659c52..4d940c8 100644
--- a/Credentials/credentials_student_add.php
+++ b/Credentials/credentials_student_add.php
@@ -71,14 +71,11 @@
             );
             $page->breadcrumbs->add(__m('Add Credential'));
 
-            $returns = array();
             $editLink = $_GET['editID'] ?? '';
             if ($editLink != '') {
                 $editLink = $session->get('absoluteURL').'/index.php?q=/modules/Credentials/credentials_student_edit.php&credentialsCredentialID='.$editLink.'&search='.$search.'&allStudents'.$allStudents.'&gibbonPersonID='.$gibbonPersonID;
             }
-            if (isset($_GET['return'])) {
-                returnProcess($guid, $_GET['return'], $editLink, $returns);
-            }
+            $page->return->setEditLink($editLink);
 
             if ($search != '') {
                 echo "<div class='linkTop'>";
diff --git a/Credentials/credentials_student_delete.php b/Credentials/credentials_student_delete.php
index 68049be..1baf4a0 100644
--- a/Credentials/credentials_student_delete.php
+++ b/Credentials/credentials_student_delete.php
@@ -49,14 +49,7 @@
                 ->fromPOST();
         $students = $credentialsCredentialGateway->queryStudentBySchoolYear($criteria, $gibbonSchoolYearID, $gibbonPersonID);
 
-
         if ($students->getResultCount() == 1) {
-
-            //Proceed!
-            if (isset($_GET['return'])) {
-                returnProcess($guid, $_GET['return'], null, null);
-            }
-
             //Check if credentialsCredentialID was specified
             $credentialsCredentialID = $_GET['credentialsCredentialID'] ?? '';
             if ($credentialsCredentialID == '') {
diff --git a/Credentials/credentials_student_edit.php b/Credentials/credentials_student_edit.php
index db550ab..953420d 100644
--- a/Credentials/credentials_student_edit.php
+++ b/Credentials/credentials_student_edit.php
@@ -74,10 +74,6 @@
             );
             $page->breadcrumbs->add(__m('Edit Credential'));
 
-            if (isset($_GET['return'])) {
-                returnProcess($guid, $_GET['return'], null, null);
-            }
-
             //Check if credentialsCredentialID specified
             $credentialsCredentialID = $_GET['credentialsCredentialID'] ?? '';
 
diff --git a/Credentials/manifest.php b/Credentials/manifest.php
index 17e6bbe..adbdae0 100644
--- a/Credentials/manifest.php
+++ b/Credentials/manifest.php
@@ -25,7 +25,7 @@
 $entryURL = 'credentials.php';
 $type = 'Additional';
 $category = 'Admin';
-$version = '3.1.05';
+$version = '3.1.06';
 $author = 'Ross Parker';
 $url = 'http://rossparker.org';
 
diff --git a/Credentials/version.php b/Credentials/version.php
index eae2473..6eb483b 100644
--- a/Credentials/version.php
+++ b/Credentials/version.php
@@ -20,5 +20,5 @@
 /**
  * Sets version information.
  */
-$moduleVersion = '3.1.05';
+$moduleVersion = '3.1.06';
 $coreVersion = '22.0.00';
diff --git a/Credentials/websites.php b/Credentials/websites.php
index 9bfc142..2cb87b8 100644
--- a/Credentials/websites.php
+++ b/Credentials/websites.php
@@ -30,10 +30,6 @@
 } else {
     $page->breadcrumbs->add(__m('Manage Websites'));
 
-    if (isset($_GET['return'])) {
-        returnProcess($guid, $_GET['return'], null, null);
-    }
-
     $websiteGateway = $container->get(CredentialsWebsiteGateway::class);
     $criteria = $websiteGateway->newQueryCriteria()->sortBy(['title']);
     $website = $websiteGateway->queryAllCredentialsWebsite($criteria);
diff --git a/Credentials/websites_add.php b/Credentials/websites_add.php
index 2574917..96b5600 100644
--- a/Credentials/websites_add.php
+++ b/Credentials/websites_add.php
@@ -29,14 +29,11 @@
     $page->breadcrumbs->add(__m('Manage Websites'), 'websites.php');
     $page->breadcrumbs->add(__m('Add Website'));
 
-    $returns = array();
     $editLink = $_GET['editID'] ?? '';
     if ($editLink != '') {
         $editLink = $session->get('absoluteURL').'/index.php?q=/modules/Credentials/websites_edit.php&credentialsWebsiteID='.$_GET['editID'];
     }
-    if (isset($_GET['return'])) {
-        returnProcess($guid, $_GET['return'], $editLink, $returns);
-    }
+    $page->return->setEditLink($editLink);
 
     $form = Form::create('action', $session->get('absoluteURL').'/modules/'.$session->get('module').'/websites_addProcess.php');
 
diff --git a/Credentials/websites_delete.php b/Credentials/websites_delete.php
index bd35e56..279d3f5 100644
--- a/Credentials/websites_delete.php
+++ b/Credentials/websites_delete.php
@@ -26,11 +26,6 @@
     echo __m('You do not have access to this action.');
     echo '</div>';
 } else {
-    //Proceed!
-    if (isset($_GET['return'])) {
-        returnProcess($guid, $_GET['return'], null, null);
-    }
-
     $credentialsWebsiteID = $_GET['credentialsWebsiteID'] ?? '';
 
     if ($credentialsWebsiteID == '') {
diff --git a/Credentials/websites_edit.php b/Credentials/websites_edit.php
index 1318ad7..a122596 100644
--- a/Credentials/websites_edit.php
+++ b/Credentials/websites_edit.php
@@ -31,13 +31,8 @@
     $page->breadcrumbs->add(__m('Manage Websites'), 'websites.php');
     $page->breadcrumbs->add(__m('Edit Website'));
 
-    $returns = array(
-        'error3'   => __m('Website title should be unique'),
-    );
-
-    if (isset($_GET['return'])) {
-        returnProcess($guid, $_GET['return'], null, $returns);
-    }
+    $returns = ['error3'   => __m('Website title should be unique')];
+    $page->return->addReturns($returns);
 
     //Check if credentialsWebsiteID specified
     $credentialsWebsiteID = $_GET['credentialsWebsiteID'] ?? '';