Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc97471649fc30fae9217a1d2a43d10ce1bbac117
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c97471649fc30fae9217a1d2a43d10ce1bbac117)
@@ -401,13 +401,6 @@
 admin.servertimezone.select  =Select
 config.profile.edit.enable  =Enable profile editing
 config.profile.partial.edit.enable  =Enable partial profile editing (only email and contact number can be changed)
-config.header.kaltura  =Kaltura settings
-config.kaltura.server  =Kaltura server URL
-config.kaltura.partner.id  =Partner Id
-config.kaltura.sub.partner.id  =Subpartner Id
-config.kaltura.user.secret  =User secret
-config.kaltura.kcw.uiconfid  =Kaltura Contribution Wizard (KCW) ui config id
-config.kaltura.kdp.uiconfid  =Kaltura Dynamic Player (KDP) ui config id
 config.server2server.registration.enable  =Enable remote server user registration
 admin.enable.course.notifications  =Enable organisation notifications
 cache.entries.title2  =Cacheable entities
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc97471649fc30fae9217a1d2a43d10ce1bbac117
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision c97471649fc30fae9217a1d2a43d10ce1bbac117)
@@ -277,9 +277,6 @@
 register.if.you.want.to.signup  =If you want to sign up to LAMS as a new user, please select "Sign up" tab. If you already have an account, please select "Login" one.
 register.signup.to.lams  =Sign up
 register.login  =Login
-kaltura.select.upload  =Select Upload tab to upload videos or Webcam to start webcam recording. After you have done with this press Next button. Assign a title to your video and follow the instructions to add your video(s).
-kaltura.error  =Sorry, there was an error
-kaltura.upload.error  =An error occurred processing this video. Please, reupload it.
 index.remove.lesson  =Remove
 index.remove.lesson.tooltip  =Permanently remove this lesson
 label.edit  =Edit
Index: lams_central/web/ckeditor/README.md
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc97471649fc30fae9217a1d2a43d10ce1bbac117
--- lams_central/web/ckeditor/README.md	(.../README.md)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/ckeditor/README.md	(.../README.md)	(revision c97471649fc30fae9217a1d2a43d10ce1bbac117)
@@ -13,7 +13,6 @@
 3. Copy plugins developed by LAMS from the old instance of CKEditor
 /ckeditor/plugins/jlatexmath
 /ckeditor/plugins/bootstrapTabs
-/ckeditor/plugins/kaltura
 /ckeditor/plugins/bootsnippets
 
 4. Apply all customizations listed below in ## LAMS Customizations
Fisheye: Tag c97471649fc30fae9217a1d2a43d10ce1bbac117 refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/kaltura/kaltura.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/ckeditor/plugins/kaltura/kalturagif.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc97471649fc30fae9217a1d2a43d10ce1bbac117
Binary files differ
Fisheye: Tag c97471649fc30fae9217a1d2a43d10ce1bbac117 refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/kaltura/lang/en.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c97471649fc30fae9217a1d2a43d10ce1bbac117 refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/kaltura/plugin.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/ckeditor/plugins/kaltura/swfobject/expressInstall.swf
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc97471649fc30fae9217a1d2a43d10ce1bbac117
Binary files differ
Fisheye: Tag c97471649fc30fae9217a1d2a43d10ce1bbac117 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/kaltura.min.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20181012.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20181012.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20181012.sql	(revision c97471649fc30fae9217a1d2a43d10ce1bbac117)
@@ -0,0 +1,19 @@
+-- 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-4686 Remove Kaltura settings from admin config settings	
+DELETE FROM lams_configuration WHERE (config_key = 'KalturaServer');
+DELETE FROM lams_configuration WHERE (config_key = 'KalturaPartnerId');
+DELETE FROM lams_configuration WHERE (config_key = 'KalturaSubPartnerId');
+DELETE FROM lams_configuration WHERE (config_key = 'KalturaUserSecret');
+DELETE FROM lams_configuration WHERE (config_key = 'KalturaKCWUiConfId');
+DELETE FROM lams_configuration WHERE (config_key = 'KalturaKDPUiConfId');
+
+----------------------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;