diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/connector/marketo/MarketoView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/connector/marketo/MarketoView.js
index a6d6ca3ef6..2426ce03c1 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/connector/marketo/MarketoView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/connector/marketo/MarketoView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 define([
@@ -73,10 +74,6 @@ define([
                 details.configurationProperties.scriptRoots = ["jar:file:connectors/marketo-connector-" +details.connectorRef.bundleVersion +".jar!/script/marketo/"];
             }
 
-            if(_.isNull(details.configurationProperties.clientSecret) && _.isObject(details.configurationProperties.clientSecret)){
-                details.configurationProperties.clientSecret = details.configurationProperties.clientSecret;
-            }
-
             details.configurationProperties.createScriptFileName = "CreateMarketo.groovy";
             details.configurationProperties.deleteScriptFileName = "DeleteMarketo.groovy";
             details.configurationProperties.schemaScriptFileName = "SchemaMarketo.groovy";
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/dashboard/widgets/RelationshipWidget.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/dashboard/widgets/RelationshipWidget.js
index b301fe4b1f..7ff476e4aa 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/dashboard/widgets/RelationshipWidget.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/dashboard/widgets/RelationshipWidget.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 define([
@@ -269,8 +270,7 @@ define([
                                             subItemType = subItemRef[0],
                                             subItemObject = subItemRef[1],
                                             subResourceCollections,
-                                            subNodeData,
-                                            refreshSettings;
+                                            subNodeData;
 
                                         if (relProp.items) {
                                             subResourceCollections = relProp.items.resourceCollection;
@@ -279,7 +279,6 @@ define([
                                         }
 
                                         subNodeData = getNodeData(item, subItemType, subItemObject, subResourceCollections);
-                                        refreshSettings = nodeData.refreshSettings;
 
                                         nodeSet.push({
                                             id: "SN" + nodeCounter,
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/managed/ManagedListView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/managed/ManagedListView.js
index 88be4191c2..f65abf09cc 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/managed/ManagedListView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/managed/ManagedListView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 define([
@@ -111,7 +112,7 @@ define([
                             editable: false,
                             cell: Backgrid.Cell.extend({
                                 render: function () {
-                                    var icon = this.model.attributes.iconClass,
+                                    var icon,
                                         display;
 
                                     if(this.model.attributes.schema && this.model.attributes.schema.icon)  {
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/managed/schema/SchemaEditorView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/managed/schema/SchemaEditorView.js
index 0d6ad27111..cf146b3616 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/managed/schema/SchemaEditorView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/managed/schema/SchemaEditorView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 define([
@@ -168,9 +169,9 @@ define([
                 var prop = managedSchema.properties[propName];
 
                 if(prop.items) {
-                    prop.items = _.extend(prop.items,relationshipTypeView.getValue());
+                    _.extend(prop.items, relationshipTypeView.getValue());
                 } else {
-                    prop = _.extend(prop,relationshipTypeView.getValue());
+                    _.extend(prop, relationshipTypeView.getValue());
                 }
             });
 
@@ -731,8 +732,6 @@ define([
                             "val": this.translateSubProperties(property.properties, property.order, property.required, false),
                             "display": this.toProperCase(property.type)
                         };
-
-                        forArray = false;
                     } else {
                         tempProperty.type = {
                             "val": this.translateSubProperties(property.properties, property.order, property.required, false),
@@ -747,8 +746,6 @@ define([
                             "val": this.translateRelationship(property),
                             "display": this.toProperCase(property.type)
                         };
-
-                        forArray = false;
                     } else {
                         tempProperty.type = {
                             "val": this.translateRelationship(property),
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/AssociationRuleView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/AssociationRuleView.js
index e49c65d65b..65bbafbcc9 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/AssociationRuleView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/AssociationRuleView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 define([
@@ -263,9 +264,9 @@ define([
                     this.model.changes.push(_.extend(data, {"changes": "edit"}));
                 } else if (!added) {
                     this.model.changes.push(_.extend(data, {"changes": "add"}));
-                } else if (added && _.find(this.model.mapping.correlationQuery, {"linkQualifier": data.linkQualifier})) {
+                } else if (_.find(this.model.mapping.correlationQuery, {"linkQualifier": data.linkQualifier})) {
                     this.model.changes[addedIndex] = _.extend(data, {"changes": "edit"});
-                } else if (added) {
+                } else {
                     this.model.changes[addedIndex] = _.extend(data, {"changes": "add"});
                 }
 
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/correlationQuery/CorrelationQueryBuilderView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/correlationQuery/CorrelationQueryBuilderView.js
index 8ebccc08ab..f7e0bcb752 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/correlationQuery/CorrelationQueryBuilderView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/correlationQuery/CorrelationQueryBuilderView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 define([
@@ -270,13 +271,8 @@ define([
         },
 
         showExpressionMenu: function (e) {
+            // the menu itself is a Bootstrap dropdown; only the default action must be stopped
             e.preventDefault();
-
-            var clickedEle = e.target;
-
-            if ($(clickedEle).not("button")) {
-                clickedEle = $(clickedEle).closest("button");
-            }
         },
 
         getExpressionContext: function (e) {
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/objectTypes/ObjectTypesDialog.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/objectTypes/ObjectTypesDialog.js
index 14807e13df..172e3af659 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/objectTypes/ObjectTypesDialog.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/objectTypes/ObjectTypesDialog.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 define([
@@ -333,7 +334,7 @@ define([
                 });
                 jsonEditorFormat.properties = properties;
             }
-            return jsonEditorFormat || false;
+            return jsonEditorFormat;
         },
 
         loadObjectTypeData: function(objectTypes) {
diff --git a/openidm-ui/openidm-ui-admin/src/main/resources/templates/admin/connector/oauth/org.forgerock.openidm.salesforce.Salesforce_2.0.html b/openidm-ui/openidm-ui-admin/src/main/resources/templates/admin/connector/oauth/org.forgerock.openidm.salesforce.Salesforce_2.0.html
index 3c74955877..d60b73d6fc 100644
--- a/openidm-ui/openidm-ui-admin/src/main/resources/templates/admin/connector/oauth/org.forgerock.openidm.salesforce.Salesforce_2.0.html
+++ b/openidm-ui/openidm-ui-admin/src/main/resources/templates/admin/connector/oauth/org.forgerock.openidm.salesforce.Salesforce_2.0.html
@@ -1,4 +1,5 @@
 <!-- Copyright 2015 ForgeRock AS.
+	Portions Copyright 2026 3A Systems, LLC.
 	License terms: https://forgerock.org/cddlv1-0/ -->
 <div class="panel panel-default panel-collapse">
     <div class="panel-heading" role="tab" id="connectorSpecificBaseHeading">
@@ -78,6 +79,6 @@ <h4 class="panel-title">
                 </p>
             </div>
         </div>
-        <input id="" type="hidden" name="configurationProperties.instanceUrl" value="{{connectorDefaults.configurationProperties.instanceUrl}}">
+        <input type="hidden" name="configurationProperties.instanceUrl" value="{{connectorDefaults.configurationProperties.instanceUrl}}">
     </div>
 </div>
\ No newline at end of file
diff --git a/openidm-ui/openidm-ui-admin/src/main/resources/templates/admin/connector/org.forgerock.openicf.connectors.ssh.SSHConnector_1.4.html b/openidm-ui/openidm-ui-admin/src/main/resources/templates/admin/connector/org.forgerock.openicf.connectors.ssh.SSHConnector_1.4.html
index c8bce4ec3d..f4ed7ed1ec 100644
--- a/openidm-ui/openidm-ui-admin/src/main/resources/templates/admin/connector/org.forgerock.openicf.connectors.ssh.SSHConnector_1.4.html
+++ b/openidm-ui/openidm-ui-admin/src/main/resources/templates/admin/connector/org.forgerock.openicf.connectors.ssh.SSHConnector_1.4.html
@@ -1,4 +1,5 @@
 <!-- Copyright 2016 ForgeRock AS.
+    Portions Copyright 2026 3A Systems, LLC.
     License terms: https://forgerock.org/cddlv1-0/ -->
 <!-- Base Details panel -->
 <div class="panel panel-default panel-collapse" id="{{#if isKerberos}}forKerberosConnector{{else}}forSSHConnector{{/if}}">
@@ -12,7 +13,7 @@ <h4 class="panel-title">
             <div class="form-group">
                 <label class="col-sm-3 control-label" for="host">{{t "templates.connector.ssh.hostDisplay"}}</label>
                 <div class="col-sm-8">
-                    <input class="form-control" type="text" id="host" name="configurationProperties.host" value="{{connectorDefaults.configurationProperties.host}}" data-validator="required" data-validator-event="keyup blur" data-validator-event="keyup blur"/>
+                    <input class="form-control" type="text" id="host" name="configurationProperties.host" value="{{connectorDefaults.configurationProperties.host}}" data-validator="required" data-validator-event="keyup blur"/>
                     <span class="error form-control-feedback"><i class='fa validation-icon'></i></span>
                 </div>
                 <div class="validation-message"></div>
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/resource/GenericEditResourceView.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/resource/GenericEditResourceView.js
index a4a96bb244..0a47cfef1f 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/resource/GenericEditResourceView.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/resource/GenericEditResourceView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 define([
@@ -451,7 +452,6 @@ define([
                 getFields,
                 convertField,
                 convertArrayField,
-                showRelationships,
                 addTab;
 
             getFields = function(properties, parent) {
@@ -606,17 +606,6 @@ define([
                 }
             };
 
-            showRelationships = function(prop) {
-                return addTab(prop, {
-                    templateId : "relationshipsTemplate",
-                    tabView: new ResourceCollectionRelationshipsView(),
-                    viewId: "resourceCollectionRelationship-" + prop.propName,
-                    contentId: "relationship-" + prop.propName,
-                    contentClass: "resourceCollectionRelationships",
-                    headerText: prop.resourceCollection.label
-                });
-            };
-
             addTab = function(prop, opts) {
                 var tabHeader = _this.$el.find("#tabHeaderTemplate").clone(),
                     tabContent = _this.$el.find("#" + opts.templateId).clone(),
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/util/FormGenerationUtils.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/util/FormGenerationUtils.js
index 5cccf4ea98..3936991a4f 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/util/FormGenerationUtils.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/util/FormGenerationUtils.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 define([
@@ -27,12 +28,11 @@ define([
     obj.standardErrorMessageTag = '<div class="validation-message"></div>';
 
     obj.generateTemplateFromFormProperties = function(definition, formValues) {
-        var property, formTemplate = "", formFieldType, formFieldDescription, i;
+        var property, formTemplate = "", formFieldDescription, i;
         for(i = 0; i < definition.formProperties.length; i++) {
             formFieldDescription = definition.formProperties[i];
             formFieldDescription.value = obj.getValueForKey(formFieldDescription._id, formValues);
             if (formFieldDescription._id !== '_formGenerationTemplate') {
-                formFieldType = formFieldDescription.type;
                 formTemplate = formTemplate + this.generateTemplateLine(formFieldDescription._id, formFieldDescription);
             }
         }
diff --git a/openidm-ui/openidm-ui-enduser/src/main/js/org/forgerock/openidm/ui/user/profile/SocialIdentitiesTab.js b/openidm-ui/openidm-ui-enduser/src/main/js/org/forgerock/openidm/ui/user/profile/SocialIdentitiesTab.js
index 6eb1df46f4..b58fe59bc8 100644
--- a/openidm-ui/openidm-ui-enduser/src/main/js/org/forgerock/openidm/ui/user/profile/SocialIdentitiesTab.js
+++ b/openidm-ui/openidm-ui-enduser/src/main/js/org/forgerock/openidm/ui/user/profile/SocialIdentitiesTab.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 define([
@@ -169,7 +170,6 @@ define([
         },
 
         oauthPopup: function(options) {
-            let oauthWindow = null;
             let width = "";
             let height = "";
 
@@ -182,7 +182,7 @@ define([
                 window.location.reload();
             };
 
-            oauthWindow = window.open(options.path, options.windowName, options.windowOptions);
+            window.open(options.path, options.windowName, options.windowOptions);
         },
 
         disconnectDialog: function(card) {