Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -rad80b813ce57fb0277896d5ba213d15b559af004
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java	(.../DisplayGroupController.java)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -331,7 +331,7 @@
 
 	    if (isGroupManagerOrMonitor) {
 		lessonLinks.addFirst(new IndexLinkBean("index.monitor",
-			"javascript:openMonitorLesson(" + bean.getId() + ", null)", "fa fa-fw fa-heartbeat", null));
+			"javascript:openMonitorLesson(" + bean.getId() + ")", "fa fa-fw fa-heartbeat", null));
 	    }
 
 	    // Adding lesson notifications links if enabled
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -rad80b813ce57fb0277896d5ba213d15b559af004
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -628,7 +628,6 @@
 			<url-pattern>/includes/javascript/*</url-pattern>
 			<url-pattern>/includes/font-awesome/*</url-pattern>
 			<url-pattern>/ckeditor/*</url-pattern>
-			<url-pattern>/loadVars.jsp</url-pattern>
 			<url-pattern>/favicon.ico</url-pattern>
 			<http-method>GET</http-method>
  			<http-method>POST</http-method>
Index: lams_central/web/findUserLessons.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -rad80b813ce57fb0277896d5ba213d15b559af004
--- lams_central/web/findUserLessons.jsp	(.../findUserLessons.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/findUserLessons.jsp	(.../findUserLessons.jsp)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -17,7 +17,6 @@
 	</style>
 
 	<script type="text/javascript" src="${lams}/includes/javascript/getSysInfo.js"></script>
-	<script type="text/javascript" src="${lams}/loadVars.jsp"></script>
 	<script type="text/javascript" src="${lams}/includes/javascript/openUrls.js"></script>
 	<script type="text/javascript" src="${lams}/includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}/includes/javascript/jquery-ui.js"></script>
Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -r020c86cfa246722a71b281ab9fd68e6a8c4b706e -rad80b813ce57fb0277896d5ba213d15b559af004
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 020c86cfa246722a71b281ab9fd68e6a8c4b706e)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -289,39 +289,6 @@
 	}).disableSelection();
 }
 
-
-function showMonitorLessonDialog(lessonID) {
-	var id = "dialogMonitorLesson" + lessonID,
-	    dialog = showDialog(id, {
-			'data' : {
-				'isMonitorDialog' : true,
-				'lessonID' : lessonID
-			},
-			'autoOpen' : false,
-			'height': Math.max(380, Math.min(monitor_height, $(window).height() - 30)),
-			'width' : Math.max(380, Math.min(monitor_width, $(window).width() - 60)),
-			'title' : LABELS.MONITORING_TITLE,
-			'open' : function() {
-				// load contents after opening the dialog
-				$('iframe', this).attr({'src': LAMS_URL
-					+ 'home/monitorLesson.do?lessonID='
-					+ $(this).data('lessonID'),
-					'id' : 'monitorModal'});
-			},
-	
-		}, true, true);
-		
-
-		
-	// if it was just created
-	if (dialog) {
-		// tell the dialog contents that it was resized
-		$('.modal-content', dialog).on('resizestop', resizeSequenceCanvas);
-		
-		dialog.modal('show');
-	}
-}
-
 /**
  * Adjust the position of LD SVG in Monitoring.
  */
@@ -669,11 +636,7 @@
 	if (refresh) {
 		loadOrganisation();
 	}
-	var dialog = $("#" + id).modal('hide'),
-		relaunchMonitorLessonID = dialog.data('relaunchMonitorLessonID');
-	if (relaunchMonitorLessonID) {
-		showMonitorLessonDialog(relaunchMonitorLessonID);
-	}
+	$("#" + id).modal('hide');
 }
 
 
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -rad80b813ce57fb0277896d5ba213d15b559af004
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -6,6 +6,9 @@
 	belowMinRes = false;
 }
 
+var learner_width = 1280;
+var learner_height = 720;
+
 var authorWin = null;
 var learnWin = null;
 var kumaliveWin = null;
@@ -43,18 +46,9 @@
 	if (gradebookMonLessonWin && !gradebookMonLessonWin.closed) gradebookMonLessonWin.close();
 }
 
-function returnToMonitorLessonIntegrated( lessonID ) {
-	window.location = '/lams/home/monitorLesson.do?lessonID='+lessonID;
-}
-
-function openMonitorLesson( lessonID, url ) {
-	if (!url) {
-		// change back to Home controller after upgrade!!
-		url = '/lams/monitoring/monitoring/monitorLesson.do?';
-	}
-	url += 'lessonID='+ lessonID;
+function openMonitorLesson(lessonID) {
 	sessionStorage.removeItem("lamsMonitoringCurrentTab");
-	window.location.href = url;
+	window.location.href = '/lams/home/monitorLesson.do?lessonID='+ lessonID;
 }
 
 function openLearner( lessonId, url ) {
@@ -117,8 +111,8 @@
 }
 
 function openAppadmin() {
-	var height = app_admin_height;
-	var width = app_admin_width;
+	var height = 768;
+	var width = 1024;
 	var left = 0;
 	var top = 0;
 	
Index: lams_central/web/launchlearner.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -rad80b813ce57fb0277896d5ba213d15b559af004
--- lams_central/web/launchlearner.jsp	(.../launchlearner.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/launchlearner.jsp	(.../launchlearner.jsp)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -18,7 +18,6 @@
 	<lams:css />
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/getSysInfo.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>loadVars.jsp"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/openUrls.js"></script>
 </lams:head>
 
Fisheye: Tag ad80b813ce57fb0277896d5ba213d15b559af004 refers to a dead (removed) revision in file `lams_central/web/loadVars.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/lti/addLesson.jsp
===================================================================
diff -u -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2 -rad80b813ce57fb0277896d5ba213d15b559af004
--- lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
+++ lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -29,7 +29,6 @@
 	</style>
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/getSysInfo.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>loadVars.jsp"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/openUrls.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/addLesson.js"></script>	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
Index: lams_central/web/lti/learnerMonitor.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -rad80b813ce57fb0277896d5ba213d15b559af004
--- lams_central/web/lti/learnerMonitor.jsp	(.../learnerMonitor.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/lti/learnerMonitor.jsp	(.../learnerMonitor.jsp)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -27,7 +27,6 @@
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/getSysInfo.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>loadVars.jsp"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/openUrls.js"></script>
 	
 </lams:head>
Index: lams_central/web/main.jsp
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -rad80b813ce57fb0277896d5ba213d15b559af004
--- lams_central/web/main.jsp	(.../main.jsp)	(revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -15,7 +15,6 @@
 	<link rel="stylesheet" href="/lams/css/bootstrap-tourist.min.css" type="text/css" media="screen">
 
 	<lams:JSImport src="includes/javascript/getSysInfo.js" />
-	<lams:JSImport src="loadVars.jsp" />
 	<lams:JSImport src="includes/javascript/openUrls.js" />
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
Index: lams_central/web/profile/lessons.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -rad80b813ce57fb0277896d5ba213d15b559af004
--- lams_central/web/profile/lessons.jsp	(.../lessons.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/profile/lessons.jsp	(.../lessons.jsp)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -6,7 +6,6 @@
 	<lams:css/>
 	
 	<script type="text/javascript" src="${lams}includes/javascript/getSysInfo.js"></script>
-	<script type="text/javascript" src="${lams}loadVars.jsp"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/openUrls.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
Index: lams_central/web/qb/stats.jsp
===================================================================
diff -u -r45abd8fb5701761386ec30cd2478e55274ad081b -rad80b813ce57fb0277896d5ba213d15b559af004
--- lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision 45abd8fb5701761386ec30cd2478e55274ad081b)
+++ lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -63,7 +63,6 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/getSysInfo.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>loadVars.jsp"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/openUrls.js"></script>
 	<script type="text/javascript">
 		var permanentRemove = '${permanentRemove}' == 'true',
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20221003.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20221003.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20221003.sql	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+-- LDEV-5329 Remove obsolete configuration items
+DELETE FROM lams_configuration WHERE config_key IN ('AuthoringScreenSize', 'MonitorScreenSize', 'LearnerScreenSize', 'AdminScreenSize');
+
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -rb252aada547de7cb1f7feca627c59b3cff9fba45 -rad80b813ce57fb0277896d5ba213d15b559af004
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision b252aada547de7cb1f7feca627c59b3cff9fba45)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
@@ -102,14 +102,6 @@
 
     public static String HELP_URL = "HelpURL";
 
-    public static String XMPP_DOMAIN = "XmppDomain";
-
-    public static String XMPP_CONFERENCE = "XmppConference";
-
-    public static String XMPP_ADMIN = "XmppAdmin";
-
-    public static String XMPP_PASSWORD = "XmppPassword";
-
     public static String DEFAULT_THEME = "DefaultTheme";
 
     public static String ALLOW_DIRECT_LESSON_LAUNCH = "AllowDirectLessonLaunch";
@@ -203,23 +195,6 @@
 
     public static String CUSTOM_TAB_TITLE = "CustomTabTitle";
 
-    /**
-     * Configurable screen sizes for authoring, monitor, learner and admin (LDEV-1598)
-     */
-    public static String AUTHORING_SCREEN_SIZE = "AuthoringScreenSize";
-
-    public static String MONITOR_SCREEN_SIZE = "MonitorScreenSize";
-
-    public static String LEARNER_SCREEN_SIZE = "LearnerScreenSize";
-
-    public static String ADMIN_SCREEN_SIZE = "AdminScreenSize";
-
-    public static String GMAP_KEY = "GmapKey";
-
-    public static String RED5_SERVER_URL = "Red5ServerUrl";
-
-    public static String RED5_RECORDINGS_URL = "Red5RecordingsUrl";
-
     public static String SMTP_AUTH_USER = "SMTPUser";
 
     public static String SMTP_AUTH_PASSWORD = "SMTPPassword";
@@ -232,18 +207,6 @@
 
     public static String PROFILE_PARTIAL_EDIT_ENABLE = "ProfilePartialEditEnable";
 
-    public static String KALTURA_SERVER = "KalturaServer";
-
-    public static String KALTURA_PARTNER_ID = "KalturaPartnerId";
-
-    public static String KALTURA_SUB_PARTNER_ID = "KalturaSubPartnerId";
-
-    public static String KALTURA_USER_SECRET = "KalturaUserSecret";
-
-    public static String KALTURA_KCW_UI_CONF_ID = "KalturaKCWUiConfId";
-
-    public static String KALTURA_KDP_UI_CONF_ID = "KalturaKDPUiConfId";
-
     public static String USER_VALIDATION_REQUIRED_USERNAME = "UserValidationUsername";
 
     public static String USER_VALIDATION_REQUIRED_FIRST_LAST_NAME = "UserValidationFirstLastName";