diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js
index f1a794ce2..dd9874976 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js
@@ -88,7 +88,7 @@ define('pgadmin.node.cast', [
       }),
 
       getSchema: function(treeNodeInfo, itemNodeData){
-        let schema = new CastSchema({
+        return new CastSchema({
           getTypeOptions: ()=>getNodeAjaxOptions('get_type', this, treeNodeInfo, itemNodeData),
           getFuncOptions: (srcTyp, trgtyp) =>
           {
@@ -113,15 +113,14 @@ define('pgadmin.node.cast', [
                   .catch((err)=>{
                     reject(err);
                   });
-              }else{
-                let data = [];
+              } else {
+                data = [];
                 resolve(data);
               }
             });
           },
         },
         );
-        return schema;
       },
     });
 
diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.ui.js b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.ui.js
index cba34540c..02340b930 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.ui.js
@@ -172,8 +172,7 @@ export default class CastSchema extends BaseUISchema {
       setError('srctyp', errmsg);
       return true;
     } else {
-      errmsg = null;
-      setError('srctyp', errmsg);
+      setError('srctyp', null);
     }
 
     if (isEmptyString(state.trgtyp)) {
@@ -181,8 +180,7 @@ export default class CastSchema extends BaseUISchema {
       setError('trgtyp', errmsg);
       return true;
     } else {
-      errmsg = null;
-      setError('trgtyp', errmsg);
+      setError('trgtyp', null);
     }
     return false;
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.ui.js b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.ui.js
index 3a0d30f32..8f21f435f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.ui.js
@@ -118,14 +118,12 @@ export default class EventTriggerSchema extends BaseUISchema {
         setError('eventfunname', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('eventfunname', errmsg);
+        setError('eventfunname', null);
       }
 
     } else {
-      errmsg = null;
       _.each(['eventfunname'], (item) => {
-        setError(item, errmsg);
+        setError(item, null);
       });
     }
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js b/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js
index 53ee4ed0d..6045b0c75 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js
@@ -201,9 +201,9 @@ define('pgadmin.node.extension', [
       }),
       getSchema: (treeNodeInfo, itemNodeData)=>{
         let nodeObj = pgAdmin.Browser.Nodes['extension'];
-        let schema = new ExtensionsSchema(
+        return new ExtensionsSchema(
           {
-            extensionsList:()=>getNodeAjaxOptions('avails', nodeObj, treeNodeInfo, itemNodeData, { cacheLevel: 'server'}, 
+            extensionsList:()=>getNodeAjaxOptions('avails', nodeObj, treeNodeInfo, itemNodeData, { cacheLevel: 'server'},
               (data)=>{
                 let res = [];
                 if (data && _.isArray(data)) {
@@ -216,7 +216,6 @@ define('pgadmin.node.extension', [
             schemaList:()=>getNodeListByName('schema', treeNodeInfo, itemNodeData)
           }
         );
-        return schema;
       }
     });
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.ui.js b/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.ui.js
index bae9a5a53..918faee7f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.ui.js
@@ -166,8 +166,7 @@ export default class ExtensionsSchema extends BaseUISchema {
       setError('name', errmsg);
       return true;
     } else {
-      errmsg = null;
-      setError('name', errmsg);
+      setError('name', null);
     }
     return false;
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
index 3e9e2b44f..aaabe734d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
@@ -104,7 +104,7 @@ define('pgadmin.node.language', [
       }),
 
       getSchema: function(treeNodeInfo, itemNodeData){
-        let schema = new LanguageSchema(
+        return new LanguageSchema(
           (privileges)=>getNodePrivilegeRoleSchema(this, treeNodeInfo, itemNodeData, privileges),
           {
             lan_functions: ()=>getNodeAjaxOptions('get_functions', this, treeNodeInfo, itemNodeData),
@@ -116,7 +116,6 @@ define('pgadmin.node.language', [
             node_info: treeNodeInfo.server,
           },
         );
-        return schema;
       },
     });
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.ui.js b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.ui.js
index 68227ad97..1ce85de1c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.ui.js
@@ -228,8 +228,7 @@ export default class LanguageSchema extends BaseUISchema {
       setError('lanproc', errmsg);
       return true;
     } else {
-      errmsg = null;
-      setError('lanproc', errmsg);
+      setError('lanproc', null);
     }
     return false;
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.js b/web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.js
index 29b1468a7..b767057cd 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.js
@@ -148,7 +148,7 @@ define('pgadmin.node.publication', [
       }),
 
       getSchema: function(treeNodeInfo, itemNodeData){
-        let schema = new PublicationSchema(
+        return new PublicationSchema(
           {
             publicationTable: ()=>getNodeAjaxOptions('get_tables', this, treeNodeInfo, itemNodeData),
             role:()=>getNodeListByName('role', treeNodeInfo, itemNodeData),
@@ -156,7 +156,6 @@ define('pgadmin.node.publication', [
             node_info: treeNodeInfo.server,
           },
         );
-        return schema;
       },
 
     });
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/static/js/aggregate.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/static/js/aggregate.js
index ba61c3af6..25c0f04fc 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/static/js/aggregate.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/static/js/aggregate.js
@@ -77,8 +77,7 @@ define('pgadmin.node.aggregate', [
         ],
       }),
       getSchema: ()=>{
-        let schema = new AggregateSchema();
-        return schema;
+        return new AggregateSchema();
       }
     });
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js
index b37ba5d36..586f410bc 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js
@@ -107,7 +107,7 @@ define('pgadmin.node.collation', [
       }),
       getSchema: (treeNodeInfo, itemNodeData)=>{
         let nodeObj = pgAdmin.Browser.Nodes['collation'];
-        let schema = new CollationSchema(
+        return new CollationSchema(
           {
             rolesList: ()=>getNodeListByName('role', treeNodeInfo, itemNodeData, {cacheLevel: 'server'}),
             schemaList: ()=>getNodeListByName('schema', treeNodeInfo, itemNodeData, {cacheLevel: 'database'}),
@@ -118,7 +118,6 @@ define('pgadmin.node.collation', [
             schema: ('schema' in treeNodeInfo)? treeNodeInfo.schema.label : ''
           }
         );
-        return schema;
       }
     });
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.ui.js
index 97e3a7d67..428e7619d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.ui.js
@@ -239,8 +239,7 @@ export default class ForeignTableSchema extends BaseUISchema {
         setError('ftsrvname', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('ftsrvname', errmsg);
+        setError('ftsrvname', null);
       }
 
     }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
index e7255cf8e..4ff24a131 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
@@ -148,7 +148,7 @@ export default class FunctionSchema extends BaseUISchema {
   }
 
   isVisible(state) {
-    if(!(this.type === 'procedure')){
+    if(this.type !== 'procedure'){
       if (state.sysproc) { return false; }
       return true;
     }else{
@@ -210,7 +210,7 @@ export default class FunctionSchema extends BaseUISchema {
       id: 'funcowner', label: gettext('Owner'), cell: 'string',
       options: this.fieldOptions.role, type: 'select',
       disabled: (state) => {
-        if (!(this.type === 'procedure')) {
+        if (this.type !== 'procedure') {
           obj.inCatalog(state);
         } else {
           obj.isGreaterThan95(state);
@@ -320,7 +320,7 @@ export default class FunctionSchema extends BaseUISchema {
         {'label': 'VOLATILE', 'value': 'v'},
         {'label': 'STABLE', 'value': 's'},
         {'label': 'IMMUTABLE', 'value': 'i'},
-      ], disabled: (!(this.type === 'procedure')) ? obj.inCatalog() : obj.isGreaterThan95,
+      ], disabled: (this.type !== 'procedure') ? obj.inCatalog() : obj.isGreaterThan95,
       controlProps: {allowClear: false},
     },{
       id: 'proretset', label: gettext('Returns a set?'), type: 'switch',
@@ -333,7 +333,7 @@ export default class FunctionSchema extends BaseUISchema {
     },{
       id: 'prosecdef', label: gettext('Security of definer?'),
       group: gettext('Options'), type: 'switch',
-      disabled: (!(this.type === 'procedure')) ? obj.inCatalog(): ()=>{
+      disabled: (this.type !== 'procedure') ? obj.inCatalog(): ()=>{
         return obj.node_info['node_info'].server.version < 90500;
       },
     },{
@@ -349,13 +349,13 @@ export default class FunctionSchema extends BaseUISchema {
         {'label': 'RESTRICTED', 'value': 'r'},
         {'label': 'SAFE', 'value': 's'},
       ],
-      disabled: (!(this.type === 'procedure')) ? obj.inCatalog(): obj.isGreaterThan96,
+      disabled: (this.type !== 'procedure') ? obj.inCatalog(): obj.isGreaterThan96,
       min_version: 90600,
       controlProps: {allowClear: false},
     },{
       id: 'procost', label: gettext('Estimated cost'), group: gettext('Options'),
       cell:'string', type: 'text', deps: ['lanname'],
-      disabled: (!(this.type === 'procedure')) ? obj.isDisabled: obj.isGreaterThan95,
+      disabled: (this.type !== 'procedure') ? obj.isDisabled: obj.isGreaterThan95,
     },{
       id: 'prorows', label: gettext('Estimated rows'), type: 'text',
       deps: ['proretset'], visible: obj.isVisible,
@@ -370,7 +370,7 @@ export default class FunctionSchema extends BaseUISchema {
     },{
       id: 'proleakproof', label: gettext('Leak proof?'),
       group: gettext('Options'), cell:'boolean', type: 'switch', min_version: 90200,
-      disabled: (!(this.type === 'procedure')) ? obj.inCatalog(): obj.isGreaterThan95,
+      disabled: (this.type !== 'procedure') ? obj.inCatalog(): obj.isGreaterThan95,
       deps: ['lanname'],
     },{
       id: 'prosupportfunc', label: gettext('Support function'),
@@ -411,20 +411,19 @@ export default class FunctionSchema extends BaseUISchema {
       canEdit: false, canDelete: true, uniqueCol : ['provider'],
       disabled: obj.inCatalog(),
       visible: function() {
-        return this.node_info && !(this.type === 'procedure');
+        return this.node_info && this.type !== 'procedure';
       },
     },
     ];
   }
   validate(state, setError) {
     let errmsg = null;
-    if (!(this.type === 'procedure') &&(isEmptyString(state.prorettypename))) {
+    if (this.type !== 'procedure' &&(isEmptyString(state.prorettypename))) {
       errmsg = gettext('Return type cannot be empty.');
       setError('prorettypename', errmsg);
       return true;
     } else {
-      errmsg = null;
-      setError('prorettypename', errmsg);
+      setError('prorettypename', null);
     }
 
     if ((String(state.lanname) == 'c')) {
@@ -433,8 +432,7 @@ export default class FunctionSchema extends BaseUISchema {
         setError('probin', errmsg);
         return true;
       }else {
-        errmsg = null;
-        setError('probin', errmsg);
+        setError('probin', null);
       }
 
       if (isEmptyString(state.prosrc_c)) {
@@ -442,8 +440,7 @@ export default class FunctionSchema extends BaseUISchema {
         setError('prosrc_c', errmsg);
         return true;
       }else {
-        errmsg = null;
-        setError('prosrc_c', errmsg);
+        setError('prosrc_c', null);
       }
 
     }else {
@@ -453,8 +450,7 @@ export default class FunctionSchema extends BaseUISchema {
         setError('prosrc', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('prosrc', errmsg);
+        setError('prosrc', null);
       }
     }
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.ui.js
index 46453fcf6..209d3a3d5 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.ui.js
@@ -274,8 +274,7 @@ export default class TriggerFunctionSchema extends BaseUISchema {
         setError('prosrc', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('prosrc', errmsg);
+        setError('prosrc', null);
       }
 
     }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/static/js/operator.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/static/js/operator.js
index 131719053..98fff6bab 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/static/js/operator.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/static/js/operator.js
@@ -77,8 +77,7 @@ define('pgadmin.node.operator', [
         ],
       }),
       getSchema: ()=>{
-        let schema = new OperatorSchema();
-        return schema;
+        return new OperatorSchema();
       }
     });
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.ui.js
index 3ef531e81..0e40eab88 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.ui.js
@@ -147,8 +147,7 @@ export default class PackageSchema extends BaseUISchema {
       setError('pkgheadsrc', errmsg);
       return true;
     } else {
-      errmsg = null;
-      setError('pkgheadsrc', errmsg);
+      setError('pkgheadsrc', null);
     }
     return null;
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
index 177468858..c7c72de9d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
@@ -109,8 +109,7 @@ export class EventSchema extends BaseUISchema {
         setError('evnt_insert', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('evnt_insert', errmsg);
+        setError('evnt_insert', null);
       }
     }
   }
@@ -488,8 +487,7 @@ export default class TriggerSchema extends BaseUISchema {
         setError('tfunction', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('tfunction', errmsg);
+        setError('tfunction', null);
       }
     }
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js
index 81d9e2ff5..08eb6d3cc 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js
@@ -1054,9 +1054,8 @@ class CompositeSchema extends BaseUISchema {
         return true;
       }
       if(_.isUndefined(errmsg) || errmsg == null) {
-        errmsg = null;
-        setError('member_name', errmsg);
-        setError('type', errmsg);
+        setError('member_name', null);
+        setError('type', null);
       }
     }
     return false;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.ui.js
index 2211beb61..2c7ab320d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.ui.js
@@ -132,8 +132,7 @@ export default class MViewSchema extends BaseUISchema {
         setError('definition', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('definition', errmsg);
+        setError('definition', null);
       }
 
       if (state.definition) {
@@ -146,9 +145,8 @@ export default class MViewSchema extends BaseUISchema {
       }
       return false;
     } else {
-      errmsg = null;
       _.each(['definition'], (item) => {
-        setError(item, errmsg);
+        setError(item, null);
       });
     }
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js
index 31234d80c..cfccfeee9 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js
@@ -130,16 +130,15 @@ export default class ViewSchema extends BaseUISchema {
         setError('definition', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('definition', errmsg);
+        setError('definition', null);
       }
 
       if (state.definition) {
         if (!(obj.nodeInfo.server.server_type == 'pg' &&
           // No need to check this when creating a view
           obj.origData.oid !== undefined
-        ) || !(
-          state.definition !== obj.origData.definition
+        ) || (
+          state.definition === obj.origData.definition
         )) {
           obj.warningText = null;
           return false;
@@ -173,9 +172,8 @@ export default class ViewSchema extends BaseUISchema {
       }
 
     } else {
-      errmsg = null;
       _.each(['definition'], (item) => {
-        setError(item, errmsg);
+        setError(item, null);
       });
     }
   }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js
index b62e13bb1..bb6b418c6 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js
@@ -379,16 +379,14 @@ export default class SubscriptionSchema extends BaseUISchema{
       setError('host', errmsg);
       return true;
     } else {
-      errmsg = null;
-      setError('host', errmsg);
+      setError('host', null);
     }
     if(isEmptyString(state.username)) {
       errmsg = gettext('Username must be specified.');
       setError('username', errmsg);
       return true;
     } else {
-      errmsg = null;
-      setError('username', errmsg);
+      setError('username', null);
     }
 
     if(isEmptyString(state.port)) {
@@ -396,8 +394,7 @@ export default class SubscriptionSchema extends BaseUISchema{
       setError('port', errmsg);
       return true;
     } else {
-      errmsg = null;
-      setError('port', errmsg);
+      setError('port', null);
     }
 
     if(isEmptyString(state.pub)) {
@@ -405,8 +402,7 @@ export default class SubscriptionSchema extends BaseUISchema{
       setError('pub', errmsg);
       return true;
     } else {
-      errmsg = null;
-      setError('pub', errmsg);
+      setError('pub', null);
     }
 
     if (state.use_ssh_tunnel) {
@@ -415,8 +411,7 @@ export default class SubscriptionSchema extends BaseUISchema{
         setError('tunnel_host', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('tunnel_host', errmsg);
+        setError('tunnel_host', null);
       }
 
       if(isEmptyString(state.tunnel_port)) {
@@ -424,8 +419,7 @@ export default class SubscriptionSchema extends BaseUISchema{
         setError('tunnel_port', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('tunnel_port', errmsg);
+        setError('tunnel_port', null);
       }
 
       if(isEmptyString(state.tunnel_username)) {
@@ -433,8 +427,7 @@ export default class SubscriptionSchema extends BaseUISchema{
         setError('tunnel_username', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('tunnel_username', errmsg);
+        setError('tunnel_username', null);
       }
 
       if (state.tunnel_authentication) {
@@ -443,8 +436,7 @@ export default class SubscriptionSchema extends BaseUISchema{
           setError('tunnel_identity_file', errmsg);
           return true;
         } else {
-          errmsg = null;
-          setError('tunnel_identity_file', errmsg);
+          setError('tunnel_identity_file', null);
         }
       }
     }
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.ui.js b/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.ui.js
index dea7075d5..a17fa9e6f 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.ui.js
@@ -204,8 +204,7 @@ export default class PgaJobStepSchema extends BaseUISchema {
           setError('jstconnstr', errMsg);
           return true;
         } else {
-          errMsg = null;
-          setError('jstconnstr', errMsg);
+          setError('jstconnstr', null);
         }
       }
     } else {
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/privilege.js b/web/pgadmin/browser/server_groups/servers/static/js/privilege.js
index c934aa0f6..fe8d1ff5f 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/privilege.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/privilege.js
@@ -671,7 +671,7 @@ define(['sources/gettext', 'underscore', 'jquery', 'backbone', 'backform',
    * displayed in the cell.
    */
   var PrivilegeCellFormatter = Backgrid.Extension.PrivilegeCellFormatter =
-    function () {};
+    function () {/*This is intentional (SonarQube)*/};
   _.extend(PrivilegeCellFormatter.prototype, {
     notation: {
       'CREATE' : 'C',
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.js b/web/pgadmin/browser/server_groups/servers/static/js/server.js
index 3fc98cba2..c943243b1 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js
@@ -737,14 +737,13 @@ define('pgadmin.node.server', [
         }
       },
       getSchema: (treeNodeInfo, itemNodeData)=>{
-        let schema = new ServerSchema(
+        return new ServerSchema(
           getNodeListById(pgBrowser.Nodes['server_group'], treeNodeInfo, itemNodeData),
           itemNodeData.user_id,
           {
             gid: treeNodeInfo['server_group']._id,
           }
         );
-        return schema;
       },
       connection_lost: function(i, resp) {
         if (pgBrowser.tree) {
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js b/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
index c4b64577f..f6d81f0bd 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
@@ -449,9 +449,8 @@ export default class ServerSchema extends BaseUISchema {
         setError('host', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('host', errmsg);
-        setError('hostaddr', errmsg);
+        setError('host', null);
+        setError('hostaddr', null);
       }
 
       /* IP address validate */
@@ -476,8 +475,7 @@ export default class ServerSchema extends BaseUISchema {
         setError('username', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('username', errmsg);
+        setError('username', null);
       }
 
       if(isEmptyString(state.port)) {
@@ -485,13 +483,11 @@ export default class ServerSchema extends BaseUISchema {
         setError('port', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('port', errmsg);
+        setError('port', null);
       }
     } else {
-      errmsg = null;
       _.each(['host', 'hostaddr', 'db', 'username', 'port'], (item) => {
-        setError(item, errmsg);
+        setError(item, null);
       });
     }
 
@@ -501,8 +497,7 @@ export default class ServerSchema extends BaseUISchema {
         setError('tunnel_host', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('tunnel_host', errmsg);
+        setError('tunnel_host', null);
       }
 
       if(isEmptyString(state.tunnel_port)) {
@@ -510,8 +505,7 @@ export default class ServerSchema extends BaseUISchema {
         setError('tunnel_port', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('tunnel_port', errmsg);
+        setError('tunnel_port', null);
       }
 
       if(isEmptyString(state.tunnel_username)) {
@@ -519,8 +513,7 @@ export default class ServerSchema extends BaseUISchema {
         setError('tunnel_username', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('tunnel_username', errmsg);
+        setError('tunnel_username', null);
       }
 
       if (state.tunnel_authentication) {
@@ -529,8 +522,7 @@ export default class ServerSchema extends BaseUISchema {
           setError('tunnel_identity_file', errmsg);
           return true;
         } else {
-          errmsg = null;
-          setError('tunnel_identity_file', errmsg);
+          setError('tunnel_identity_file', null);
         }
       }
     }
diff --git a/web/pgadmin/browser/static/js/node.ui.js b/web/pgadmin/browser/static/js/node.ui.js
index 92e05e864..d7f17611c 100644
--- a/web/pgadmin/browser/static/js/node.ui.js
+++ b/web/pgadmin/browser/static/js/node.ui.js
@@ -24,7 +24,7 @@ define([
     'select2/dropdown/attachBody',
   ], function(Utils, Dropdown, AttachBody) {
 
-    function SelectAll() {}
+    function SelectAll() {/*This is intentional (SonarQube)*/}
     SelectAll.prototype.render = function(decorated) {
       let self = this;
       let $rendered = decorated.call(this);
diff --git a/web/pgadmin/static/js/sqleditor/new_connection_dialog_model.js b/web/pgadmin/static/js/sqleditor/new_connection_dialog_model.js
index 35a5d64f6..2d84bfe6e 100644
--- a/web/pgadmin/static/js/sqleditor/new_connection_dialog_model.js
+++ b/web/pgadmin/static/js/sqleditor/new_connection_dialog_model.js
@@ -250,7 +250,7 @@ export default function newConnectionDialogModel(response, sgid, sid, handler, c
                     },
                   };
                 },
-                build:function() {
+                build:function() { /*This is intentional (SonarQube)*/
                 },
                 prepare:function() {
                   this.setContent(this.message);
@@ -469,6 +469,5 @@ export default function newConnectionDialogModel(response, sgid, sid, handler, c
     },
   });
 
-  let model = new newConnectionModel();
-  return model;
+  return new newConnectionModel();
 }
diff --git a/web/pgadmin/static/vendor/backgrid/backgrid.js b/web/pgadmin/static/vendor/backgrid/backgrid.js
index 91bb4c392..9be19445d 100644
--- a/web/pgadmin/static/vendor/backgrid/backgrid.js
+++ b/web/pgadmin/static/vendor/backgrid/backgrid.js
@@ -191,7 +191,7 @@ _.extend(Command.prototype, {
    @class Backgrid.CellFormatter
    @constructor
 */
-var CellFormatter = Backgrid.CellFormatter = function () {};
+var CellFormatter = Backgrid.CellFormatter = function () {/*This is intentional (SonarQube)*/};
 _.extend(CellFormatter.prototype, {
 
   /**
@@ -541,7 +541,7 @@ _.extend(DatetimeFormatter.prototype, {
    @extends Backgrid.CellFormatter
    @constructor
  */
-var StringFormatter = Backgrid.StringFormatter = function () {};
+var StringFormatter = Backgrid.StringFormatter = function () {/*This is intentional (SonarQube)*/};
 StringFormatter.prototype = new CellFormatter();
 _.extend(StringFormatter.prototype, {
   /**
@@ -567,7 +567,7 @@ _.extend(StringFormatter.prototype, {
    @extends Backgrid.CellFormatter
    @constructor
  */
-var EmailFormatter = Backgrid.EmailFormatter = function () {};
+var EmailFormatter = Backgrid.EmailFormatter = function () {/*This is intentional (SonarQube)*/};
 EmailFormatter.prototype = new CellFormatter();
 _.extend(EmailFormatter.prototype, {
   /**
@@ -600,7 +600,7 @@ _.extend(EmailFormatter.prototype, {
    @extends Backgrid.CellFormatter
    @constructor
 */
-var SelectFormatter = Backgrid.SelectFormatter = function () {};
+var SelectFormatter = Backgrid.SelectFormatter = function () {/*This is intentional (SonarQube)*/};
 SelectFormatter.prototype = new CellFormatter();
 _.extend(SelectFormatter.prototype, {
 
diff --git a/web/pgadmin/tools/backup/static/js/backup.ui.js b/web/pgadmin/tools/backup/static/js/backup.ui.js
index e8c0edada..bda79f630 100644
--- a/web/pgadmin/tools/backup/static/js/backup.ui.js
+++ b/web/pgadmin/tools/backup/static/js/backup.ui.js
@@ -559,8 +559,7 @@ export default class BackupSchema extends BaseUISchema {
         setError('file', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('file', errmsg);
+        setError('file', null);
       }
     }
   }
diff --git a/web/pgadmin/tools/backup/static/js/backupGlobal.ui.js b/web/pgadmin/tools/backup/static/js/backupGlobal.ui.js
index 8d70d4209..b2a4b99f7 100644
--- a/web/pgadmin/tools/backup/static/js/backupGlobal.ui.js
+++ b/web/pgadmin/tools/backup/static/js/backupGlobal.ui.js
@@ -107,8 +107,7 @@ export default class BackupGlobalSchema extends BaseUISchema {
         setError('file', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('file', errmsg);
+        setError('file', null);
       }
     }
   }
diff --git a/web/pgadmin/tools/erd/static/js/erd_tool/dialogs/TableDialog.js b/web/pgadmin/tools/erd/static/js/erd_tool/dialogs/TableDialog.js
index 4dcc68e6b..ddb02633a 100644
--- a/web/pgadmin/tools/erd/static/js/erd_tool/dialogs/TableDialog.js
+++ b/web/pgadmin/tools/erd/static/js/erd_tool/dialogs/TableDialog.js
@@ -22,7 +22,7 @@ class EmptySchema extends BaseUISchema {
     return [];
   }
   changeColumnOptions() {
-
+    /*This is intentional (SonarQube)*/
   }
 }
 
diff --git a/web/pgadmin/tools/erd/static/js/erd_tool/index.js b/web/pgadmin/tools/erd/static/js/erd_tool/index.js
index 34e96aae1..8563ac562 100644
--- a/web/pgadmin/tools/erd/static/js/erd_tool/index.js
+++ b/web/pgadmin/tools/erd/static/js/erd_tool/index.js
@@ -24,7 +24,7 @@ export default class ERDTool {
   }
 
   getPreferencesForModule() {
-
+    /*This is intentional (SonarQube)*/
   }
 
   render() {
diff --git a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
index cb5e9f994..c28302115 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
@@ -88,6 +88,7 @@ define([
           var $container = $('<div class=\'wizard_dlg\' id=\'grantWizardDlg\'></div>');
           return {
             main: function () {
+              /*This is intentional (SonarQube)*/
             },
             setup: function () {
               return {
diff --git a/web/pgadmin/tools/import_export_servers/static/js/import_export_selection.ui.js b/web/pgadmin/tools/import_export_servers/static/js/import_export_selection.ui.js
index 0017bc1a5..06f542565 100644
--- a/web/pgadmin/tools/import_export_servers/static/js/import_export_selection.ui.js
+++ b/web/pgadmin/tools/import_export_servers/static/js/import_export_selection.ui.js
@@ -91,8 +91,7 @@ export default class ImportExportSelectionSchema extends BaseUISchema {
         setError('filename', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('filename', errmsg);
+        setError('filename', null);
       }
     }
   }
diff --git a/web/pgadmin/tools/import_export_servers/static/js/import_export_servers.js b/web/pgadmin/tools/import_export_servers/static/js/import_export_servers.js
index 3b12000f6..d2953a3d2 100644
--- a/web/pgadmin/tools/import_export_servers/static/js/import_export_servers.js
+++ b/web/pgadmin/tools/import_export_servers/static/js/import_export_servers.js
@@ -61,6 +61,7 @@ export default class ImportExportServersModule {
         var $container = $('<div class=\'wizard_dlg\' id=\'importExportServersDlg\'></div>');
         return {
           main: function () {
+            /*This is intentional (SonarQube)*/
           },
           setup: function () {
             return {
diff --git a/web/pgadmin/tools/restore/static/js/restore.ui.js b/web/pgadmin/tools/restore/static/js/restore.ui.js
index df2cc58f8..92f3c678a 100644
--- a/web/pgadmin/tools/restore/static/js/restore.ui.js
+++ b/web/pgadmin/tools/restore/static/js/restore.ui.js
@@ -460,8 +460,7 @@ export default class RestoreSchema extends BaseUISchema {
         setError('file', errmsg);
         return true;
       } else {
-        errmsg = null;
-        setError('file', errmsg);
+        setError('file', null);
       }
     }
   }
diff --git a/web/regression/javascript/erd/erd_core_spec.js b/web/regression/javascript/erd/erd_core_spec.js
index b3a598440..bd1192479 100644
--- a/web/regression/javascript/erd/erd_core_spec.js
+++ b/web/regression/javascript/erd/erd_core_spec.js
@@ -245,7 +245,7 @@ describe('ERDCore', ()=>{
             return {'name': name};
           },
           addPort: function() {
-
+            /*This is intentional (SonarQube)*/
           },
           getData: function() {
             return table;
diff --git a/web/regression/javascript/erd/fake_item.js b/web/regression/javascript/erd/fake_item.js
index 62fa306b0..2ae3b6070 100644
--- a/web/regression/javascript/erd/fake_item.js
+++ b/web/regression/javascript/erd/fake_item.js
@@ -5,19 +5,19 @@ export class FakeNode {
     this.data = data || {};
     this.id = id;
   }
-  setSelected() {}
+  setSelected() {/*This is intentional (SonarQube)*/}
   getColumns() {return this.data.columns;}
   getID() {return this.id;}
   setData(data) {this.data = data;}
   getData() {return this.data;}
   getPosition() {return {x: 30, y: 30};}
-  setPosition() {}
+  setPosition() {/*This is intentional (SonarQube)*/}
   serializeData() {return this.getData();}
   getPortName(attnum) {return `port-${attnum}`;}
   getPort() {return null;}
   addPort(obj) {return obj;}
   getColumnAt(pos) {return _.find(this.getColumns()||[], (c)=>c.attnum==pos);}
-  remove() {}
+  remove() {/*This is intentional (SonarQube)*/}
   getSchemaTableName() {return [this.data.schema, this.data.name];}
   cloneData(tabName) {
     let retVal = {...this.data};
@@ -36,12 +36,12 @@ export class FakeLink {
     this.data = data;
     this.id = id;
   }
-  setSelected() {}
+  setSelected() {/*This is intentional (SonarQube)*/}
   getID() {return this.id;}
   getData() {return this.data;}
   getSourcePort() {return {remove: ()=>{/*This is intentional (SonarQube)*/}};}
-  setSourcePort() {}
+  setSourcePort() {/*This is intentional (SonarQube)*/}
   getTargetPort() {return {remove: ()=>{/*This is intentional (SonarQube)*/}};}
-  setTargetPort() {}
-  remove() {}
+  setTargetPort() {/*This is intentional (SonarQube)*/}
+  remove() {/*This is intentional (SonarQube)*/}
 }
diff --git a/web/regression/javascript/schema_ui_files/partition.utils.ui.spec.js b/web/regression/javascript/schema_ui_files/partition.utils.ui.spec.js
index bfdebf56b..f1f57dd72 100644
--- a/web/regression/javascript/schema_ui_files/partition.utils.ui.spec.js
+++ b/web/regression/javascript/schema_ui_files/partition.utils.ui.spec.js
@@ -29,8 +29,8 @@ class SchemaInColl extends BaseUISchema {
     this.collSchema = schemaObj;
     this.columns = columns;
   }
-  getCollations() {}
-  getOperatorClass() {}
+  getCollations() {/*This is intentional (SonarQube)*/}
+  getOperatorClass() {/*This is intentional (SonarQube)*/}
 
   get baseFields() {
     return [{
diff --git a/web/regression/javascript/table/enable_disable_triggers_spec.js b/web/regression/javascript/table/enable_disable_triggers_spec.js
index d785ab7b3..1b24c5de7 100644
--- a/web/regression/javascript/table/enable_disable_triggers_spec.js
+++ b/web/regression/javascript/table/enable_disable_triggers_spec.js
@@ -54,7 +54,7 @@ describe('#enableTriggers', () => {
 
   describe('no node is selected', () => {
     it('does not send the request to the backend', (done) => {
-      networkMock.onAny('.*').reply(200, () => {
+      networkMock.onAny('.*').reply(200, () => { /*This is intentional (SonarQube)*/
       });
 
       setTimeout(() => {
@@ -70,6 +70,7 @@ describe('#enableTriggers', () => {
         tree.selectNode([{id: 'table-no-data'}]);
 
         networkMock.onAny('.*').reply(200, () => {
+          /*This is intentional (SonarQube)*/
         });
 
         setTimeout(() => {
@@ -189,6 +190,7 @@ describe('#disableTriggers', () => {
   describe('no node is selected', () => {
     it('does not send the request to the backend', (done) => {
       networkMock.onAny('.*').reply(200, () => {
+        /*This is intentional (SonarQube)*/
       });
 
       setTimeout(() => {
@@ -204,6 +206,7 @@ describe('#disableTriggers', () => {
         tree.selectNode([{id: 'table-no-data'}]);
 
         networkMock.onAny('.*').reply(200, () => {
+          /*This is intentional (SonarQube)*/
         });
 
         setTimeout(() => {