diff --git a/docs/en_US/images/preferences_browser_display.png b/docs/en_US/images/preferences_browser_display.png
index a3a84664a..e8be4f21b 100644
Binary files a/docs/en_US/images/preferences_browser_display.png and b/docs/en_US/images/preferences_browser_display.png differ
diff --git a/docs/en_US/preferences.rst b/docs/en_US/preferences.rst
index 14cbf87ae..f3e08cf4a 100644
--- a/docs/en_US/preferences.rst
+++ b/docs/en_US/preferences.rst
@@ -43,13 +43,6 @@ Use the fields on the *Display* panel to specify general display preferences:
   attempt to catch browser close or refresh events and prompt before allowing
   them to continue.
 
-* When the *Enable browser tree animation?* switch is set to *True*, the client
-  will display the animated tree control otherwise it will be unanimated.
-
-* When the *Enable dialogue/notification animation?* switch is set to *True*,
-  the client will display the animated dialogues/notifications otherwise it
-  will be unanimated.
-
 * When the *Hide shared servers?* switch is set to *True*, the client will hide
   all the shared servers from the browser tree.
 
diff --git a/web/package.json b/web/package.json
index d70a5b871..9eb2850b0 100644
--- a/web/package.json
+++ b/web/package.json
@@ -92,7 +92,6 @@
     "@types/react": "^16.7.18",
     "@types/react-dom": "^16.0.11",
     "ajv": "^8.8.2",
-    "alertifyjs": "git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263",
     "anti-trojan-source": "^1.4.0",
     "aspen-decorations": "^1.0.2",
     "axios": "^0.21.1",
diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py
index 5038dc8ce..d196fe9dc 100644
--- a/web/pgadmin/__init__.py
+++ b/web/pgadmin/__init__.py
@@ -222,7 +222,7 @@ def create_app(app_name=None):
 
         config.SECURITY_RECOVERABLE = True
         config.SECURITY_CHANGEABLE = True
-        # Now we'll open change password page in alertify dialog
+        # Now we'll open change password page in dialog
         # we don't want it to redirect to main page after password
         # change operation so we will open the same password change page again.
         config.SECURITY_POST_CHANGE_VIEW = 'browser.change_password'
diff --git a/web/pgadmin/browser/register_browser_preferences.py b/web/pgadmin/browser/register_browser_preferences.py
index cfd9bca1a..1fc865b57 100644
--- a/web/pgadmin/browser/register_browser_preferences.py
+++ b/web/pgadmin/browser/register_browser_preferences.py
@@ -45,18 +45,6 @@ def register_browser_preferences(self):
             )
         )
 
-    self.preference.register(
-        'display', 'enable_acitree_animation',
-        gettext("Enable browser tree animation?"), 'boolean', True,
-        category_label=PREF_LABEL_DISPLAY
-    )
-
-    self.preference.register(
-        'display', 'enable_alertify_animation',
-        gettext("Enable dialogue/notification animation?"), 'boolean',
-        True, category_label=PREF_LABEL_DISPLAY
-    )
-
     self.preference.register(
         'display', 'browser_tree_state_save_interval',
         gettext("Browser tree state saving interval"), 'integer',
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 d1ee8b3b3..5c70ed607 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
@@ -11,10 +11,10 @@ import CastSchema from './cast.ui';
 import getApiInstance from '../../../../../../../static/js/api_instance';
 
 define('pgadmin.node.cast', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser',
-  'pgadmin.alertifyjs', 'pgadmin.backform', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+  'pgadmin.browser.collection',
+], function(gettext, url_for, pgAdmin, pgBrowser) {
   // Extend the collection class for cast
   if (!pgBrowser.Nodes['coll-cast']) {
     pgAdmin.Browser.Nodes['coll-cast'] =
diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js
index 5e830af87..e9889c787 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js
@@ -11,9 +11,9 @@ import EventTriggerSchema from './event_trigger.ui';
 import { getNodeListByName, getNodeAjaxOptions } from '../../../../../../static/js/node_ajax';
 
 define('pgadmin.node.event_trigger', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgAdmin, pgBrowser) {
 
   // Extend the browser's collection class for event trigger collection
   if (!pgBrowser.Nodes['coll-event_trigger']) {
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 d288a6734..ed0093187 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
@@ -10,11 +10,12 @@
 
 import { getNodeAjaxOptions, getNodeListByName } from '../../../../../../static/js/node_ajax';
 import ExtensionsSchema from './extension.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.extension', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgAdmin, pgBrowser) {
 
   /*
    * Create and Add an Extension Collection into nodes
diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js
index 4dc85aae0..026e2439f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js
@@ -12,10 +12,10 @@ import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.u
 import ForeignServerSchema from './foreign_server.ui';
 
 define('pgadmin.node.foreign_server', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/pgadmin',
+  'sources/gettext', 'sources/url_for', 'sources/pgadmin',
   'pgadmin.browser', 'pgadmin.browser.collection',
   'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgAdmin, pgBrowser) {
 
   // Extend the browser's collection class for foreign server collection
   if (!pgBrowser.Nodes['coll-foreign_server']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.js
index 40e9a5925..0015aa8d5 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.js
@@ -9,12 +9,13 @@
 
 import { getNodeListByName } from '../../../../../../../../static/js/node_ajax';
 import UserMappingSchema from './user_mapping.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.user_mapping', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.backform', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, Backform) {
+], function(gettext, url_for, pgAdmin, pgBrowser, Backform) {
 
   // Extend the browser's collection class for user mapping collection
   if (!pgBrowser.Nodes['coll-user_mapping']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js
index b45be8187..4dcfc72af 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js
@@ -12,10 +12,9 @@ import { getNodePrivilegeRoleSchema } from '../../../../static/js/privilege.ui';
 import ForeignDataWrapperSchema from './foreign_data_wrapper.ui';
 
 define('pgadmin.node.foreign_data_wrapper', [
-  'sources/gettext', 'sources/url_for', 'jquery',
-  'sources/pgadmin', 'pgadmin.browser',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   // Extend the browser's collection class for foreign data wrapper collection
   if (!pgBrowser.Nodes['coll-foreign_data_wrapper']) {
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 56dc670a1..2ab91efb7 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
@@ -12,10 +12,9 @@ import LanguageSchema from './language.ui';
 import { getNodePrivilegeRoleSchema } from '../../../../static/js/privilege.ui';
 
 define('pgadmin.node.language', [
-  'sources/gettext', 'sources/url_for', 'jquery',
-  'sources/pgadmin', 'pgadmin.browser',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   // Extend the browser's collection class for languages collection
   if (!pgBrowser.Nodes['coll-language']) {
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 9af351d31..b77ad85e2 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
@@ -11,10 +11,9 @@ import { getNodeAjaxOptions, getNodeListByName } from '../../../../../../static/
 import PublicationSchema from './publication.ui';
 
 define('pgadmin.node.publication', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   // Extend the browser's collection class for publications collection
   if (!pgBrowser.Nodes['coll-publication']) {
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 df8d9b4f9..f9a485879 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
@@ -10,10 +10,9 @@
 import AggregateSchema from './aggregate.ui';
 
 define('pgadmin.node.aggregate', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser',
+  'sources/gettext', 'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChild) {
+], function(gettext, pgAdmin, pgBrowser, schemaChild) {
 
   if (!pgBrowser.Nodes['coll-aggregate']) {
     pgAdmin.Browser.Nodes['coll-aggregate'] =
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.js
index e1152eb22..0a533cd47 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.js
@@ -9,9 +9,9 @@
 import CatalogObjectColumnSchema from './catalog_object_column.ui';
 
 define('pgadmin.node.catalog_object_column', [
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin',
+  'sources/gettext', 'sources/pgadmin',
   'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, $, _, pgAdmin, pgBrowser) {
+], function(gettext, pgAdmin, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-catalog_object_column']) {
     pgAdmin.Browser.Nodes['coll-catalog_object_column'] =
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js
index dac46721a..0bd5afa54 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js
@@ -10,9 +10,9 @@
 import CatalogObjectSchema from './catalog_object.ui';
 
 define('pgadmin.node.catalog_object', [
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin',
+  'sources/gettext', 'sources/pgadmin',
   'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, $, _, pgAdmin, pgBrowser) {
+], function(gettext, pgAdmin, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-catalog_object']) {
     pgAdmin.Browser.Nodes['coll-catalog_object'] =
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 4d3dff132..de0645e3d 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
@@ -11,11 +11,11 @@ import CollationSchema from './collation.ui';
 import { getNodeAjaxOptions, getNodeListByName } from '../../../../../../../static/js/node_ajax';
 
 define('pgadmin.node.collation', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChild,
+], function(gettext, url_for, pgAdmin, pgBrowser, schemaChild,
   schemaChildTreeNode) {
 
   if (!pgBrowser.Nodes['coll-collation']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js
index 4c6594ddb..ebe8a0c8f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js
@@ -11,10 +11,10 @@ import DomainConstraintSchema from './domain_constraints.ui';
 
 // Domain Constraint Module: Collection and Node
 define('pgadmin.node.domain_constraints', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChildTreeNode) {
+], function(gettext, url_for, pgAdmin, pgBrowser, schemaChildTreeNode) {
 
   // Define Domain Constraint Collection Node
   if (!pgBrowser.Nodes['coll-domain_constraints']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
index 8b2b361f9..e20555593 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
@@ -12,13 +12,11 @@ import DomainSchema from './domain.ui';
 
 // Domain Module: Collection and Node.
 define('pgadmin.node.domain', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'backbone',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform', 'pgadmin.backgrid',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser, Backform, Backgrid,
-  schemaChild, schemaChildTreeNode
+  gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode
 ) {
 
   // Define Domain Collection Node
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js
index 3affdeefb..2f1f15135 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js
@@ -14,13 +14,11 @@ import _ from 'lodash';
 
 /* Create and Register Foreign Table Collection and Node. */
 define('pgadmin.node.foreign_table', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'backbone',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backgrid',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, Backbone, pgAdmin, pgBrowser, Backgrid,
-  schemaChild, schemaChildTreeNode
+  gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-foreign_table']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js
index 073dd4acc..44a616a9d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js
@@ -11,13 +11,11 @@ import { getNodeAjaxOptions, getNodeListByName, getNodeListById} from '../../../
 import FTSConfigurationSchema from './fts_configuration.ui';
 
 define('pgadmin.node.fts_configuration', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'backbone',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform', 'pgadmin.backgrid',
+  'sources/gettext', 'sources/url_for', 'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser, Backform, Backgrid,
-  schemaChild, schemaChildTreeNode
+  gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode
 ) {
 
   // Extend the collection class for FTS Configuration
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js
index 0ea741034..164df6a41 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js
@@ -11,13 +11,12 @@ import { getNodeAjaxOptions, getNodeListByName, getNodeListById} from '../../../
 import FTSDictionarySchema from './fts_dictionary.ui';
 
 define('pgadmin.node.fts_dictionary', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/gettext', 'sources/url_for',
+  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, schemaChild,
-  schemaChildTreeNode
+  gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode
 ) {
 
   // Extend the collection class for FTS Dictionary
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js
index ad5579d0d..dde527839 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js
@@ -11,10 +11,10 @@ import FTSParserSchema from './fts_parser.ui';
 import { getNodeAjaxOptions, getNodeListById } from '../../../../../../../static/js/node_ajax';
 
 define('pgadmin.node.fts_parser', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.node.schema.dir/child',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode) {
+], function(gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode) {
 
   // Extend the collection class for fts parser
   if (!pgBrowser.Nodes['coll-fts_parser']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js
index 5320246f3..f56e12941 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js
@@ -11,10 +11,10 @@ import FTSTemplateSchema from './fts_template.ui';
 import { getNodeAjaxOptions, getNodeListById } from '../../../../../../../static/js/node_ajax';
 
 define('pgadmin.node.fts_template', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.node.schema.dir/child',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode) {
+], function(gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode) {
 
   // Extend the collection class for fts template
   if (!pgBrowser.Nodes['coll-fts_template']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
index b9107d98f..f730bd154 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
@@ -14,13 +14,11 @@ import { getNodeVariableSchema } from '../../../../../static/js/variable.ui';
 
 /* Create and Register Function Collection and Node. */
 define('pgadmin.node.function', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'backbone',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
 ], function(
-  gettext, url_for, $, Backbone, pgAdmin, pgBrowser, Backform, schemaChild,
-  schemaChildTreeNode
+  gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-function']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js
index 7cbcdc907..8248525b6 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js
@@ -14,13 +14,11 @@ import { getNodeVariableSchema } from '../../../../../static/js/variable.ui';
 
 /* Create and Register Procedure Collection and Node. */
 define('pgadmin.node.procedure', [
-  'sources/gettext', 'sources/url_for', 'jquery',
-  'sources/pgadmin', 'pgadmin.browser', 'alertify',
-  'pgadmin.node.function', 'pgadmin.node.schema.dir/child',
+  'sources/gettext', 'sources/url_for',
+  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.node.schema.dir/child',
   'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, pgAdmin, pgBrowser, alertify, Function,
-  schemaChild, schemaChildTreeNode) {
+], function(gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode) {
 
   if (!pgBrowser.Nodes['coll-procedure']) {
     pgAdmin.Browser.Nodes['coll-procedure'] =
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js
index b7a1f2af8..d9ac6bbb0 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js
@@ -10,15 +10,15 @@ import TriggerFunctionSchema from './trigger_function.ui';
 import { getNodeListByName, getNodeListById, getNodeAjaxOptions } from '../../../../../../../static/js/node_ajax';
 import { getNodeVariableSchema } from '../../../../../static/js/variable.ui';
 import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.ui';
+import _ from 'lodash';
 
 /* Create and Register Function Collection and Node. */
 define('pgadmin.node.trigger_function', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, schemaChild, schemaChildTreeNode
+  gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-trigger_function']) {
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 576220638..e25b41df9 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
@@ -10,10 +10,10 @@
 import OperatorSchema from './operator.ui';
 
 define('pgadmin.node.operator', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChild) {
+], function(gettext, pgAdmin, pgBrowser, schemaChild) {
 
   if (!pgBrowser.Nodes['coll-operator']) {
     pgAdmin.Browser.Nodes['coll-operator'] =
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js
index 6d8e6e6c2..5bf697fe3 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js
@@ -11,10 +11,9 @@ import EDBFuncSchema from './edbfunc.ui';
 
 /* Create and Register Function Collection and Node. */
 define('pgadmin.node.edbfunc', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-edbfunc']) {
     pgBrowser.Nodes['coll-edbfunc'] =
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js
index c1e74aa2a..bf3c570a6 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js
@@ -8,15 +8,16 @@
 //////////////////////////////////////////////////////////////
 
 import EDBFuncSchema from './edbfunc.ui';
+import _ from 'lodash';
 
 /* Create and Register Procedure Collection and Node. */
 define('pgadmin.node.edbproc', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.edbfunc', 'pgadmin.browser.collection',
   'pgadmin.browser.server.privilege',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, EdbFunction
+  gettext, url_for, pgAdmin, pgBrowser, EdbFunction
 ) {
 
   if (!pgBrowser.Nodes['coll-edbproc']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js
index d9ebb9d3d..490ad4a9c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js
@@ -11,10 +11,9 @@ import EDBVarSchema from './edbvar.ui';
 
 /* Create and Register Function Collection and Node. */
 define('pgadmin.node.edbvar', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-edbvar']) {
     pgBrowser.Nodes['coll-edbvar'] =
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js
index 003f379bd..14750af5d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js
@@ -11,13 +11,12 @@ import PackageSchema from './package.ui';
 import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.ui';
 import { getNodeListByName } from '../../../../../../../static/js/node_ajax';
 
+
 define('pgadmin.node.package', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, schemaChild,
-  schemaChildTreeNode) {
+], function(gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode) {
 
   // Extend the browser's collection class for package collection
   if (!pgBrowser.Nodes['coll-package']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js
index 0e336682a..57026803d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js
@@ -12,13 +12,11 @@ import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.u
 import SequenceSchema from './sequence.ui';
 
 define('pgadmin.node.sequence', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, schemaChild,
-  schemaChildTreeNode
+  gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode
 ) {
 
   // Extend the browser's collection class for sequence collection
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js
index 42d182c48..0ac986378 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js
@@ -10,9 +10,8 @@
 import CatalogSchema from './catalog.ui';
 
 define('pgadmin.node.catalog', [
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin',
-  'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, $, _, pgAdmin, pgBrowser) {
+  'sources/gettext', 'pgadmin.browser', 'pgadmin.browser.collection',
+], function(gettext, pgBrowser) {
 
   // Extend the browser's collection class for catalog collection
   if (!pgBrowser.Nodes['coll-catalog']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js
index 4822c204d..340a9444e 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js
@@ -10,12 +10,13 @@
 import PGSchema from './schema.ui';
 import { getNodePrivilegeRoleSchema } from '../../../../static/js/privilege.ui';
 import { getNodeListByName } from '../../../../../../static/js/node_ajax';
+import _ from 'lodash';
 
 define('pgadmin.node.schema', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform', 'pgadmin.backgrid',
+  'sources/gettext', 'sources/url_for', 'jquery',
+  'pgadmin.browser', 'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, Backgrid) {
+], function(gettext, url_for, $, pgBrowser, Backform, Backgrid) {
 
   // VacuumSettings Collection to display all settings parameters as Grid
   Backform.VacuumCollectionControl =
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
index 104324cb3..c7806a64f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
@@ -9,14 +9,14 @@
 
 import { getNodeAjaxOptions, getNodeListByName } from '../../../../../../../static/js/node_ajax';
 import SynonymSchema from './synonym.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.synonym', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
+  'sources/gettext', 'sources/url_for',
+  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, alertify,
-  schemaChild, schemaChildTreeNode) {
+], function(gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode) {
 
   if (!pgBrowser.Nodes['coll-synonym']) {
     pgAdmin.Browser.Nodes['coll-synonym'] =
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js
index 4df6c7ae7..0956f5e19 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js
@@ -8,14 +8,13 @@
 //////////////////////////////////////////////////////////////
 
 import { getNodeColumnSchema } from './column.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.column', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'backbone',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform', 'pgadmin.backgrid',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser, Backform, Backgrid,
-  SchemaChildTreeNode
+  gettext, url_for, pgBrowser, SchemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-column']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.ui.js
index 73d487ac3..45a28f682 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.ui.js
@@ -1,3 +1,12 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
+
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import VariableSchema from 'top/browser/server_groups/servers/static/js/variable.ui';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js
index 06b41026a..e45e74ef3 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js
@@ -12,12 +12,12 @@ import CompoundTriggerSchema from './compound_trigger.ui';
 import Notify from '../../../../../../../../../static/js/helpers/Notifier';
 
 define('pgadmin.node.compound_trigger', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/gettext', 'sources/url_for', 'jquery',
+  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, SchemaChildTreeNode
+  gettext, url_for, $, pgAdmin, pgBrowser, SchemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-compound_trigger']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js
index 4d1ccde09..b8578d365 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js
@@ -9,13 +9,14 @@
 
 import CheckConstraintSchema from './check_constraint.ui';
 import Notify from '../../../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 // Check Constraint Module: Node
 define('pgadmin.node.check_constraint', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChildTreeNode) {
+], function(gettext, url_for, $, pgAdmin, pgBrowser, schemaChildTreeNode) {
 
   // Check Constraint Node
   if (!pgBrowser.Nodes['check_constraint']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.ui.js
index aaf53dbf4..484962d0c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.ui.js
@@ -1,3 +1,11 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import _ from 'lodash';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js
index a71ea2e79..3c2767348 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js
@@ -8,12 +8,13 @@
 //////////////////////////////////////////////////////////////
 
 import { getNodeExclusionConstraintSchema } from './exclusion_constraint.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.exclusion_constraint', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'backbone',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser
+  gettext, url_for, pgAdmin, pgBrowser
 ) {
   // Extend the browser's node class for exclusion constraint node
   if (!pgBrowser.Nodes['exclusion_constraint']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.ui.js
index 410a71617..0d7a4cb62 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.ui.js
@@ -1,3 +1,11 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import _ from 'lodash';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
index 00950a8de..6fc8fc69a 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
@@ -9,12 +9,13 @@
 
 import { getNodeForeignKeySchema } from './foreign_key.ui';
 import Notify from '../../../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define('pgadmin.node.foreign_key', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'backbone',
+  'sources/gettext', 'sources/url_for', 'jquery',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser
+  gettext, url_for, $, pgAdmin, pgBrowser
 ) {
   // Extend the browser's node class for foreign key node
   if (!pgBrowser.Nodes['foreign_key']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.ui.js
index f046155fd..f72433c5d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.ui.js
@@ -1,3 +1,12 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
+
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import _ from 'lodash';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js
index a1844f7a6..da48deafb 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js
@@ -9,12 +9,13 @@
 
 import { getNodeListByName } from '../../../../../../../../../static/js/node_ajax';
 import PrimaryKeySchema from './primary_key.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.primary_key', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, Backgrid) {
+], function(gettext, url_for, pgAdmin, pgBrowser, Backform, Backgrid) {
 
   // Extend the browser's node class for index constraint node
   if (!pgBrowser.Nodes['primary_key']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.ui.js
index b0189bb88..634212380 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.ui.js
@@ -1,3 +1,11 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import _ from 'lodash';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js
index 1edf236a2..acb8a9823 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js
@@ -9,11 +9,12 @@
 
 import { getNodeListByName } from '../../../../../../../../../static/js/node_ajax';
 import UniqueConstraintSchema from './unique_constraint.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.unique_constraint', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgAdmin, pgBrowser) {
 
   // Extend the browser's node class for index constraint node
   if (!pgBrowser.Nodes['unique_constraint']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.ui.js
index bf1a098bc..014f3b634 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.ui.js
@@ -1,3 +1,11 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import _ from 'lodash';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js
index df5f0e4cb..5bdf77aa4 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js
@@ -8,12 +8,12 @@
 //////////////////////////////////////////////////////////////
 
 define('pgadmin.node.constraints', [
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin',
+  'sources/gettext', 'sources/pgadmin',
   'pgadmin.browser', 'pgadmin.browser.collection',
   'pgadmin.node.unique_constraint', 'pgadmin.node.check_constraint',
   'pgadmin.node.foreign_key', 'pgadmin.node.exclusion_constraint',
   'pgadmin.node.primary_key',
-], function(gettext, $, _, pgAdmin, pgBrowser) {
+], function(gettext, pgAdmin, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-constraints']) {
     pgAdmin.Browser.Nodes['coll-constraints'] =
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js
index cb1749c08..84e396ce2 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js
@@ -9,16 +9,15 @@
 
 import IndexSchema, { getColumnSchema } from './index.ui';
 import { getNodeAjaxOptions, getNodeListByName } from 'pgbrowser/node_ajax';
+import _ from 'lodash';
 
 define('pgadmin.node.index', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'backbone', 'sources/pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
-  'pgadmin.backform', 'pgadmin.backgrid',
+  'sources/gettext', 'sources/url_for',
+  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser, Alertify, Backform,
-  Backgrid, SchemaChildTreeNode
+  gettext, url_for, pgAdmin, pgBrowser, SchemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-index']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js
index 93944e3b9..3a3f9b8ad 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js
@@ -9,16 +9,16 @@
 
 import { getNodePartitionTableSchema } from './partition.ui';
 import Notify from '../../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define([
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
   'sources/pgadmin', 'pgadmin.browser',
-  'pgadmin.alertifyjs', 'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'sources/utils',
   'pgadmin.browser.collection',
 ],
 function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Alertify, Backform, Backgrid,
+  gettext, url_for, $, pgAdmin, pgBrowser,
   SchemaChildTreeNode, pgadminUtils
 ) {
 
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js
index b05a487bf..ea22cfdb7 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js
@@ -1,3 +1,12 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
+
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import SecLabelSchema from 'top/browser/server_groups/servers/static/js/sec_label.ui';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.js
index d1908a6eb..014e88999 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.js
@@ -11,14 +11,12 @@ import { getNodeListByName } from '../../../../../../../../static/js/node_ajax';
 
 
 define('pgadmin.node.row_security_policy', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser',
-  'pgadmin.backform', 'pgadmin.alertifyjs',
   'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, alertify,
-  SchemaChildTreeNode
+  gettext, url_for, pgAdmin, pgBrowser, SchemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-row_security_policy']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js
index 73ebd4183..d82ac7df2 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js
@@ -8,12 +8,13 @@
 //////////////////////////////////////////////////////////////
 import RuleSchema from './rule.ui';
 import Notify from '../../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define('pgadmin.node.rule', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/gettext', 'sources/url_for', 'jquery',
+  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/schema_child_tree_node',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, SchemaChildTreeNode) {
+], function(gettext, url_for, $, pgAdmin, pgBrowser, SchemaChildTreeNode) {
 
   /**
     Create and add a rule collection into nodes
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.ui.js
index 237291b6a..68d627bb8 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.ui.js
@@ -1,3 +1,11 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
 import _ from 'lodash';
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
index 332107503..c70c58fd9 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
@@ -8,19 +8,18 @@
 
 import { getNodeTableSchema } from './table.ui';
 import Notify from '../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define('pgadmin.node.table', [
   'pgadmin.tables.js/enable_disable_triggers',
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
   'sources/pgadmin', 'pgadmin.browser',
-  'pgadmin.alertifyjs', 'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.node.schema.dir/child','pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection', 'pgadmin.node.column',
   'pgadmin.node.constraints',
 ], function(
   tableFunctions,
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Alertify, Backform, Backgrid,
-  SchemaChild, SchemaChildTreeNode
+  gettext, url_for, $, pgAdmin, pgBrowser, SchemaChild, SchemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-table']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js
index 0197f6671..e5bf4a9cc 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js
@@ -1,3 +1,11 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import SecLabelSchema from 'top/browser/server_groups/servers/static/js/sec_label.ui';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js
index c60ecbc5c..68deb6dc9 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js
@@ -9,14 +9,15 @@
 import { getNodeListByName, getNodeAjaxOptions } from '../../../../../../../../static/js/node_ajax';
 import TriggerSchema from './trigger.ui';
 import Notify from '../../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define('pgadmin.node.trigger', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
   'sources/pgadmin', 'pgadmin.browser',
-  'pgadmin.backform', 'pgadmin.node.schema.dir/schema_child_tree_node',
+  'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, SchemaChildTreeNode
+  gettext, url_for, $, pgAdmin, pgBrowser, SchemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-trigger']) {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js
index 56ef198e1..54a05ad1d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js
@@ -12,13 +12,11 @@ import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.u
 import TypeSchema, { getCompositeSchema, getRangeSchema, getExternalSchema, getDataTypeSchema } from './type.ui';
 
 define('pgadmin.node.type', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
-  'pgadmin.backgrid', 'pgadmin.node.schema.dir/child',
+  'sources/gettext', 'sources/url_for',
+  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.node.schema.dir/child',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, Backgrid,
-  schemaChild, schemaChildTreeNode
+  gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-type']) {
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 92e71b1ec..c715e6082 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
@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import SecLabelSchema from '../../../../../static/js/sec_label.ui';
 
 import { getNodeAjaxOptions } from '../../../../../../../static/js/node_ajax';
-import _ from 'underscore';
+import _ from 'lodash';
 import getApiInstance from 'sources/api_instance';
 import { isEmptyString } from 'sources/validators';
 
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js
index b598d58b0..33c9822e2 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js
@@ -12,15 +12,16 @@ import { getNodeListByName } from '../../../../../../../static/js/node_ajax';
 import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.ui';
 import { getNodeVacuumSettingsSchema } from '../../../../../static/js/vacuum.ui';
 import Notify from '../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define('pgadmin.node.mview', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.alertifyjs', 'pgadmin.browser',
-  'pgadmin.backform', 'pgadmin.node.schema.dir/child',
+  'sources/gettext', 'sources/url_for', 'jquery',
+  'sources/pgadmin', 'pgadmin.browser',
+  'pgadmin.node.schema.dir/child',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'sources/utils',
   'pgadmin.browser.server.privilege',
 ], function(
-  gettext, url_for, $, _, pgAdmin, Alertify, pgBrowser, Backform,
+  gettext, url_for, $, pgAdmin, pgBrowser,
   schemaChild, schemaChildTreeNode, commonUtils
 ) {
 
@@ -178,7 +179,7 @@ define('pgadmin.node.mview', [
           return;
         }
 
-        if (!commonUtils.hasBinariesConfiguration(pgBrowser, server_data, Alertify)) {
+        if (!commonUtils.hasBinariesConfiguration(pgBrowser, server_data)) {
           return;
         }
 
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js
index 0ba952954..829ddca3b 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js
@@ -12,12 +12,11 @@ import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.u
 import ViewSchema from './view.ui';
 
 define('pgadmin.node.view', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.server.privilege', 'pgadmin.node.rule',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, schemaChild, schemaChildTreeNode
+  gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode
 ) {
 
 
diff --git a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
index 4fccec388..ba9f82e0d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
@@ -13,14 +13,14 @@ import { getNodeVariableSchema } from '../../../static/js/variable.ui';
 import DatabaseSchema from './database.ui';
 import Notify from '../../../../../../static/js/helpers/Notifier';
 import { showServerPassword } from '../../../../../../static/js/Dialogs/index';
+import _ from 'lodash';
 
 define('pgadmin.node.database', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/utils', 'sources/pgadmin', 'pgadmin.browser.utils',
-  'pgadmin.alertifyjs', 'pgadmin.backform',
+  'sources/gettext', 'sources/url_for', 'jquery',
+  'sources/pgadmin', 'pgadmin.browser.utils',
   'pgadmin.authenticate.kerberos', 'pgadmin.browser.collection',
   'pgadmin.browser.server.privilege', 'pgadmin.browser.server.variable',
-], function(gettext, url_for, $, _, pgadminUtils, pgAdmin, pgBrowser, Alertify, Backform, Kerberos) {
+], function(gettext, url_for, $, pgAdmin, pgBrowser, Kerberos) {
 
   if (!pgBrowser.Nodes['coll-database']) {
     pgBrowser.Nodes['coll-database'] =
diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.js b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.js
index f5f596188..12aa68e94 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.js
@@ -13,9 +13,9 @@ import _ from 'lodash';
 import Notify from '../../../../../../../static/js/helpers/Notifier';
 
 define('pgadmin.node.subscription', [
-  'sources/gettext', 'sources/url_for', 'jquery',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, pgAdmin, pgBrowser) {
+  'sources/gettext', 'sources/url_for',
+  'pgadmin.browser', 'pgadmin.browser.collection',
+], function(gettext, url_for, pgBrowser) {
 
   // Extend the browser's collection class for subscriptions collection
   if (!pgBrowser.Nodes['coll-subscription']) {
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js
index 2e647175d..e07ed39e8 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js
@@ -10,10 +10,9 @@
 import PgaJobScheduleSchema from './pga_schedule.ui';
 
 define('pgadmin.node.pga_schedule', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'moment', 'pgadmin.browser',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
 ], function(
-  gettext, url_for, $, _, pgAdmin, moment, pgBrowser
+  gettext, url_for, pgBrowser
 ) {
 
   if (!pgBrowser.Nodes['coll-pga_schedule']) {
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js b/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js
index c9d83da86..fc04ac25e 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js
@@ -13,10 +13,9 @@ import { getNodePgaJobStepSchema } from '../../steps/static/js/pga_jobstep.ui';
 import Notify from '../../../../../../static/js/helpers/Notifier';
 
 define('pgadmin.node.pga_job', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser',
+  'sources/gettext', 'sources/url_for', 'jquery', 'pgadmin.browser',
   'pgadmin.node.pga_jobstep', 'pgadmin.node.pga_schedule',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, $, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-pga_job']) {
     pgBrowser.Nodes['coll-pga_job'] =
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js b/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js
index d418dac9f..ced319471 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js
@@ -8,12 +8,12 @@
 //////////////////////////////////////////////////////////////
 
 import { getNodePgaJobStepSchema } from './pga_jobstep.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.pga_jobstep', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
-  'sources/pgadmin', 'pgadmin.browser', 'alertify', 'backform',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser', 'backform',
   'backgrid', 'pgadmin.backform',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, Alertify, Backform) {
+], function(gettext, url_for, pgBrowser, Backform) {
 
   if (!pgBrowser.Nodes['coll-pga_jobstep']) {
     pgBrowser.Nodes['coll-pga_jobstep'] =
diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js b/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js
index c612fe20c..9f5113961 100644
--- a/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js
+++ b/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js
@@ -10,9 +10,9 @@
 import ResourceGroupSchema from './resource_group.ui';
 
 define('pgadmin.node.resource_group', [
-  'sources/gettext', 'sources/url_for', 'underscore', 'pgadmin.browser',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.browser.collection',
-], function(gettext, url_for, _, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   // Extend the browser's collection class for resource group collection
   if (!pgBrowser.Nodes['coll-resource_group']) {
diff --git a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
index 592af2bb6..f4bb59199 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
+++ b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js
@@ -13,9 +13,9 @@ import { getMembershipSchema } from '../../../static/js/membership.ui';
 import { showRoleReassign } from './roleReassign';
 
 define('pgadmin.node.role', [
-  'sources/gettext', 'sources/url_for', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser'
-], function(gettext, url_for, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgAdmin, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-role']) {
     pgAdmin.Browser.Nodes['coll-role'] =
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 fe8d1ff5f..1d030246e 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/privilege.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/privilege.js
@@ -7,9 +7,11 @@
 //
 //////////////////////////////////////////////////////////////
 
-define(['sources/gettext', 'underscore', 'jquery', 'backbone', 'backform',
-  'backgrid', 'alertify', 'pgadmin.browser.node', 'sources/utils', 'pgadmin.browser.node.ui',
-], function(gettext, _, $, Backbone, Backform, Backgrid, Alertify, pgNode, commonUtils) {
+import _ from 'lodash';
+
+define(['sources/gettext', 'jquery', 'backbone',
+  'backgrid', 'pgadmin.browser.node', 'sources/utils', 'pgadmin.browser.node.ui',
+], function(gettext, $, Backbone, Backgrid, pgNode, commonUtils) {
   /**
    * Each Privilege, supporeted by an database object, will be represented
    * using this Model.
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 a651f7fa4..7c80dfc22 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js
@@ -11,15 +11,16 @@ import { getNodeListById } from '../../../../static/js/node_ajax';
 import ServerSchema from './server.ui';
 import Notify from '../../../../../static/js/helpers/Notifier';
 import { showServerPassword, showChangeServerPassword, showNamedRestorePoint } from '../../../../../static/js/Dialogs/index';
+import _ from 'lodash';
 
 define('pgadmin.node.server', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.user_management.current_user',
   'pgadmin.authenticate.kerberos',
   'pgadmin.browser.server.privilege',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser,
+  gettext, url_for, $, pgAdmin, pgBrowser,
   current_user, Kerberos,
 ) {
 
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/variable.js b/web/pgadmin/browser/server_groups/servers/static/js/variable.js
index cb0ae42e8..3087169b5 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/variable.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/variable.js
@@ -7,11 +7,13 @@
 //
 //////////////////////////////////////////////////////////////
 
+import _ from 'lodash';
+
 define([
-  'sources/gettext', 'underscore', 'jquery', 'backbone', 'backform', 'backgrid', 'alertify',
-  'sources/pgadmin', 'pgadmin.browser.node', 'pgadmin.browser.node.ui',
+  'sources/gettext', 'jquery', 'backbone', 'backform', 'backgrid',
+  'pgadmin.browser.node', 'pgadmin.browser.node.ui',
 ],
-function(gettext, _, $, Backbone, Backform, Backgrid, Alertify, pgAdmin, pgNode) {
+function(gettext, $, Backbone, Backform, Backgrid, pgNode) {
 
   /*
      * cellFunction for variable control.
diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
index d16033820..22b8543b8 100644
--- a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
+++ b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
@@ -11,13 +11,14 @@ import { getNodeListByName } from '../../../../../static/js/node_ajax';
 import { getNodePrivilegeRoleSchema } from '../../../static/js/privilege.ui';
 import { getNodeVariableSchema } from '../../../static/js/variable.ui';
 import TablespaceSchema from './tablespace.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.tablespace', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'backbone',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection', 'pgadmin.browser.node.ui',
+  'sources/gettext', 'sources/url_for',
+  'pgadmin.browser', 'pgadmin.browser.collection', 'pgadmin.browser.node.ui',
   'pgadmin.browser.server.privilege',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser
+  gettext, url_for, pgBrowser
 ) {
 
   if (!pgBrowser.Nodes['coll-tablespace']) {
diff --git a/web/pgadmin/browser/server_groups/static/js/server_group.js b/web/pgadmin/browser/server_groups/static/js/server_group.js
index 91ac1a7f5..ebe7588e0 100644
--- a/web/pgadmin/browser/server_groups/static/js/server_group.js
+++ b/web/pgadmin/browser/server_groups/static/js/server_group.js
@@ -7,11 +7,12 @@
 //
 //////////////////////////////////////////////////////////////
 import ServerGroupSchema from './server_group.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.server_group', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.user_management.current_user', 'pgadmin.browser', 'pgadmin.browser.node',
-], function(gettext, url_for, $, _, pgAdmin, current_user) {
+], function(gettext, url_for, pgAdmin, current_user) {
 
   if (!pgAdmin.Browser.Nodes['server_group']) {
     pgAdmin.Browser.Nodes['server_group'] = pgAdmin.Browser.Node.extend({
diff --git a/web/pgadmin/browser/static/css/wizard.css b/web/pgadmin/browser/static/css/wizard.css
index a8d5fbd64..c999fab01 100644
--- a/web/pgadmin/browser/static/css/wizard.css
+++ b/web/pgadmin/browser/static/css/wizard.css
@@ -45,8 +45,7 @@
   padding: 0.5rem 0rem;
 }
 
-/* In wizard select2 dropdown doesn't
- * popup because z-index of alertify
+/* In wizard select2 dropdown doesn't popup.
  * wizard is greater than the z-index
  * of select2 dropdown. To make select2
  * visible, set z-index of select2
diff --git a/web/pgadmin/browser/static/js/activity.js b/web/pgadmin/browser/static/js/activity.js
index 10fa10df2..7e3553e78 100644
--- a/web/pgadmin/browser/static/js/activity.js
+++ b/web/pgadmin/browser/static/js/activity.js
@@ -8,7 +8,7 @@
 //////////////////////////////////////////////////////////////
 
 import $ from 'jquery';
-import _ from 'underscore';
+import _ from 'lodash';
 
 import pgAdmin from 'sources/pgadmin';
 import pgWindow from 'sources/window';
diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
index 3c4207f2a..6e4f2f4ee 100644
--- a/web/pgadmin/browser/static/js/browser.js
+++ b/web/pgadmin/browser/static/js/browser.js
@@ -8,12 +8,14 @@
 //////////////////////////////////////////////////////////////
 
 import { generateNodeUrl } from './node_ajax';
+import _ from 'lodash';
 import Notify, {initializeModalProvider, initializeNotifier} from '../../../static/js/helpers/Notifier';
 import { checkMasterPassword } from '../../../static/js/Dialogs/index';
+import { pgHandleItemError } from '../../../static/js/utils';
 
 define('pgadmin.browser', [
-  'sources/gettext', 'sources/url_for', 'require', 'jquery', 'underscore',
-  'bootstrap', 'sources/pgadmin', 'pgadmin.alertifyjs', 'bundled_codemirror',
+  'sources/gettext', 'sources/url_for', 'require', 'jquery',
+  'bootstrap', 'sources/pgadmin', 'bundled_codemirror',
   'sources/check_node_visibility', './toolbar', 'pgadmin.help',
   'sources/csrf', 'sources/utils', 'sources/window', 'pgadmin.authenticate.kerberos',
   'sources/tree/tree_init',
@@ -25,8 +27,8 @@ define('pgadmin.browser', [
   'sources/codemirror/addon/fold/pgadmin-sqlfoldcode',
   'pgadmin.browser.keyboard', 'sources/tree/pgadmin_tree_save_state'
 ], function(
-  gettext, url_for, require, $, _,
-  Bootstrap, pgAdmin, Alertify, codemirror,
+  gettext, url_for, require, $,
+  Bootstrap, pgAdmin, codemirror,
   checkNodeVisibility, toolBar, help, csrfToken, pgadminUtils, pgWindow,
   Kerberos, InitTree,
 ) {
@@ -1707,12 +1709,10 @@ define('pgadmin.browser', [
               success();
             }
           })
-          .fail(function(xhr, error, status) {
-            if (
-              !Alertify.pgHandleItemError(
-                xhr, error, status, {item: __i, info: info}
-              )
-            ) {
+          .fail(function(xhr, error) {
+            if (!pgHandleItemError(
+              xhr, {item: __i, info: info}
+            )) {
               var contentType = xhr.getResponseHeader('Content-Type'),
                 jsonResp = (
                   contentType &&
diff --git a/web/pgadmin/browser/static/js/collection.js b/web/pgadmin/browser/static/js/collection.js
index ada8258fc..d911653d9 100644
--- a/web/pgadmin/browser/static/js/collection.js
+++ b/web/pgadmin/browser/static/js/collection.js
@@ -7,13 +7,14 @@
 //
 //////////////////////////////////////////////////////////////
 import {getPanelView} from './panel_view';
+import _ from 'lodash';
 
 define([
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin',
-  'backbone', 'alertify', 'backform', 'backgrid', 'sources/browser/generate_url',
+  'sources/gettext', 'sources/pgadmin',
+  'sources/browser/generate_url',
   'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.browser.node', 'backgrid.select.all',
-], function(gettext, $, _, pgAdmin, Backbone, Alertify, Backform, Backgrid, generateUrl) {
+], function(gettext, pgAdmin, generateUrl) {
 
   var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};
 
diff --git a/web/pgadmin/browser/static/js/datamodel.js b/web/pgadmin/browser/static/js/datamodel.js
index 570b1382c..2b57d50cb 100644
--- a/web/pgadmin/browser/static/js/datamodel.js
+++ b/web/pgadmin/browser/static/js/datamodel.js
@@ -6,10 +6,11 @@
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
+import _ from 'lodash';
 
 define([
-  'underscore', 'sources/pgadmin', 'jquery', 'backbone', 'sources/utils',
-], function(_, pgAdmin, $, Backbone, pgadminUtils) {
+  'sources/pgadmin', 'jquery', 'backbone', 'sources/utils',
+], function(pgAdmin, $, Backbone, pgadminUtils) {
   var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};
 
   pgBrowser.DataModel = Backbone.Model.extend({
diff --git a/web/pgadmin/browser/static/js/error.js b/web/pgadmin/browser/static/js/error.js
index b4603d883..eabc55275 100644
--- a/web/pgadmin/browser/static/js/error.js
+++ b/web/pgadmin/browser/static/js/error.js
@@ -8,10 +8,11 @@
 //////////////////////////////////////////////////////////////
 
 import Notify from '../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define(
-  ['sources/gettext', 'underscore', 'sources/pgadmin'],
-  function(gettext, _, pgAdmin) {
+  ['sources/gettext', 'sources/pgadmin'],
+  function(gettext, pgAdmin) {
     pgAdmin.Browser = pgAdmin.Browser || {};
 
     _.extend(pgAdmin.Browser, {
diff --git a/web/pgadmin/browser/static/js/frame.js b/web/pgadmin/browser/static/js/frame.js
index 8a1537740..3d3de4d3e 100644
--- a/web/pgadmin/browser/static/js/frame.js
+++ b/web/pgadmin/browser/static/js/frame.js
@@ -6,10 +6,10 @@
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
-
+import _ from 'lodash';
 define([
-  'underscore', 'sources/pgadmin', 'jquery', 'wcdocker',
-], function(_, pgAdmin, $) {
+  'sources/pgadmin', 'jquery', 'wcdocker',
+], function(pgAdmin, $) {
 
   var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {},
     wcDocker = window.wcDocker,
diff --git a/web/pgadmin/browser/static/js/keyboard.js b/web/pgadmin/browser/static/js/keyboard.js
index 1a9dafb69..5ef23bb8d 100644
--- a/web/pgadmin/browser/static/js/keyboard.js
+++ b/web/pgadmin/browser/static/js/keyboard.js
@@ -7,7 +7,7 @@
 //
 //////////////////////////////////////////////////////////////
 
-import _ from 'underscore';
+import _ from 'lodash';
 import pgAdmin from '../../../static/js/pgadmin';
 import $ from 'jquery';
 import Mousetrap from 'mousetrap';
diff --git a/web/pgadmin/browser/static/js/menu.js b/web/pgadmin/browser/static/js/menu.js
index bce476969..7e8b52af4 100644
--- a/web/pgadmin/browser/static/js/menu.js
+++ b/web/pgadmin/browser/static/js/menu.js
@@ -6,10 +6,11 @@
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
+import _ from 'lodash';
 
 define([
-  'underscore', 'sources/pgadmin', 'jquery', 'sources/utils', 'sources/gettext',
-], function(_, pgAdmin, $, pgadminUtils, gettext) {
+  'sources/pgadmin', 'jquery', 'sources/utils', 'sources/gettext',
+], function(pgAdmin, $, pgadminUtils, gettext) {
   'use strict';
 
   pgAdmin.Browser = pgAdmin.Browser || {};
diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js
index 062d613f2..49c8198fc 100644
--- a/web/pgadmin/browser/static/js/node.js
+++ b/web/pgadmin/browser/static/js/node.js
@@ -9,17 +9,17 @@
 
 import {getNodeView, removeNodeView} from './node_view';
 import Notify from '../../../static/js/helpers/Notifier';
+import _ from 'lodash';
+import { pgHandleItemError } from '../../../static/js/utils';
 
 define('pgadmin.browser.node', [
-  'sources/url_for',
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin',
-  'pgadmin.browser.menu', 'backbone', 'pgadmin.alertifyjs', 'pgadmin.browser.datamodel',
+  'sources/gettext', 'jquery', 'sources/pgadmin',
+  'backbone', 'pgadmin.browser.datamodel',
   'backform', 'sources/browser/generate_url', 'pgadmin.help', 'sources/utils',
   'pgadmin.browser.utils', 'pgadmin.backform',
 ], function(
-  url_for,
-  gettext, $, _, pgAdmin,
-  Menu, Backbone, Alertify, pgBrowser,
+  gettext, $, pgAdmin,
+  Backbone, pgBrowser,
   Backform, generateUrl, help,
   commonUtils
 ) {
@@ -458,11 +458,10 @@ define('pgadmin.browser.node', [
                     'pgadmin:node:retrieval:error', 'properties',
                     xhr, options.textStatus, options.errorThrown, item
                   );
-                  if (!Alertify.pgHandleItemError(
-                    xhr, options.textStatus, options.errorThrown, {
-                      item: item,
-                      info: info,
-                    }
+                  if (!pgHandleItemError(xhr, {
+                    item: item,
+                    info: info,
+                  }
                   )) {
                     Notify.pgNotifier(
                       options.textStatus, xhr,
@@ -1672,7 +1671,7 @@ define('pgadmin.browser.node', [
               type: 'cancel',
               tooltip: gettext('Cancel changes to this object.'),
               extraClasses: ['btn-secondary', 'mx-1'],
-              icon: 'fa fa-times pg-alertify-button',
+              icon: 'fa fa-times',
               disabled: false,
               register: function(btn) {
                 btn.on('click',() => {
@@ -1686,7 +1685,7 @@ define('pgadmin.browser.node', [
               type: 'reset',
               tooltip: gettext('Reset the fields on this dialog.'),
               extraClasses: ['btn-secondary', 'mx-1'],
-              icon: 'fa fa-recycle pg-alertify-button',
+              icon: 'fa fa-recycle',
               disabled: true,
               register: function(btn) {
                 btn.on('click',() => {
@@ -1706,7 +1705,7 @@ define('pgadmin.browser.node', [
               type: 'save',
               tooltip: gettext('Save this object.'),
               extraClasses: ['btn-primary', 'mx-1'],
-              icon: 'fa fa-save pg-alertify-button',
+              icon: 'fa fa-save',
               disabled: true,
               register: function(btn) {
                 // Save the changes
@@ -1975,7 +1974,7 @@ define('pgadmin.browser.node', [
         ) || 0;
 
       if (node_info) {
-        _.each(_.sortBy(_.values(_.pick(
+        _.each(_.sortBy(_.values(_.pickBy(
           node_info,
           function(v) {
             return (v.priority <= min_priority);
diff --git a/web/pgadmin/browser/static/js/node.ui.js b/web/pgadmin/browser/static/js/node.ui.js
index a12a053c9..bc1196a9e 100644
--- a/web/pgadmin/browser/static/js/node.ui.js
+++ b/web/pgadmin/browser/static/js/node.ui.js
@@ -6,11 +6,12 @@
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
+import _ from 'lodash';
 
 define([
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin', 'backbone', 'backform',
-  'alertify', 'backgrid', 'select2', 'pgadmin.browser.node',
-], function(gettext, $, _, pgAdmin, Backbone, Backform, Alertify, Backgrid) {
+  'sources/gettext', 'jquery', 'sources/pgadmin', 'backform',
+  'backgrid', 'select2', 'pgadmin.browser.node',
+], function(gettext, $, pgAdmin, Backform, Backgrid) {
 
   /*
    * Define the selectAll adapter for select2.
diff --git a/web/pgadmin/browser/static/js/panel.js b/web/pgadmin/browser/static/js/panel.js
index 8f49a6745..d445787b8 100644
--- a/web/pgadmin/browser/static/js/panel.js
+++ b/web/pgadmin/browser/static/js/panel.js
@@ -8,10 +8,11 @@
 //////////////////////////////////////////////////////////////
 
 import { getPanelView } from './panel_view';
+import _ from 'lodash';
 
 define(
-  ['underscore', 'sources/pgadmin', 'jquery', 'wcdocker'],
-  function(_, pgAdmin, $) {
+  ['sources/pgadmin', 'jquery', 'wcdocker'],
+  function(pgAdmin, $) {
 
     var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {},
       wcDocker = window.wcDocker;
diff --git a/web/pgadmin/browser/static/js/preferences.js b/web/pgadmin/browser/static/js/preferences.js
index 3f1aab16b..d9bb93ed4 100644
--- a/web/pgadmin/browser/static/js/preferences.js
+++ b/web/pgadmin/browser/static/js/preferences.js
@@ -10,9 +10,10 @@
 import pgAdmin from 'sources/pgadmin';
 import url_for from 'sources/url_for';
 import $ from 'jquery';
-import * as SqlEditorUtils from 'sources/sqleditor_utils';
 import pgWindow from 'sources/window';
 import Notify from '../../../static/js/helpers/Notifier';
+import { calcFontSize } from '../../../static/js/utils';
+
 
 const pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};
 
@@ -123,7 +124,7 @@ _.extend(pgBrowser, {
       let sqlEditPreferences = obj.get_preferences_for_module('sqleditor');
 
       $(obj?.editor?.getWrapperElement()).css(
-        'font-size',SqlEditorUtils.calcFontSize(sqlEditPreferences.sql_font_size)
+        'font-size', calcFontSize(sqlEditPreferences.sql_font_size)
       );
       obj?.editor?.setOption('tabSize', sqlEditPreferences.tab_size);
       obj?.editor?.setOption('lineWrapping', sqlEditPreferences.wrap_code);
diff --git a/web/pgadmin/browser/static/js/toolbar.js b/web/pgadmin/browser/static/js/toolbar.js
index 974b40e92..6ce976690 100644
--- a/web/pgadmin/browser/static/js/toolbar.js
+++ b/web/pgadmin/browser/static/js/toolbar.js
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////
 
 import gettext from 'sources/gettext';
-import _ from 'underscore';
+import _ from 'lodash';
 import pgAdmin from 'sources/pgadmin';
 
 let _toolbarButtons = {};
diff --git a/web/pgadmin/browser/static/scss/_wizard.scss b/web/pgadmin/browser/static/scss/_wizard.scss
index 67e2b8c2c..b8985fd73 100644
--- a/web/pgadmin/browser/static/scss/_wizard.scss
+++ b/web/pgadmin/browser/static/scss/_wizard.scss
@@ -18,7 +18,7 @@
   position: absolute;
   overflow: auto;
   top: $title-height;
-  bottom: $footer-height-calc; //similar to alertify footer
+  bottom: $footer-height-calc;
   left: 0;
   right: 0;
 }
@@ -28,7 +28,7 @@
   padding: $footer-padding
 }
 
-/* match the alertify footer */
+/* match the footer */
 .pgadmin-wizard .wizard-footer {
   min-height: $footer-min-height;
   border: none;
diff --git a/web/pgadmin/dashboard/static/js/Dashboard.jsx b/web/pgadmin/dashboard/static/js/Dashboard.jsx
index cf06a7ad1..17f19812e 100644
--- a/web/pgadmin/dashboard/static/js/Dashboard.jsx
+++ b/web/pgadmin/dashboard/static/js/Dashboard.jsx
@@ -30,7 +30,7 @@ import EmptyPanelMessage from '../../../static/js/components/EmptyPanelMessage';
 import TabPanel from '../../../static/js/components/TabPanel';
 
 function parseData(data) {
-  var res = [];
+  let res = [];
 
   data.forEach((row) => {
     res.push({ ...row, icon: '' });
@@ -197,7 +197,7 @@ export default function Dashboard({
       id: 'btn-terminate',
       // eslint-disable-next-line react/display-name
       Cell: ({ row }) => {
-        var terminate_session_url =
+        let terminate_session_url =
           url_for('dashboard.index') + 'terminate_session' + '/' + sid,
           title = gettext('Terminate Session?'),
           txtConfirm = gettext(
@@ -268,7 +268,7 @@ export default function Dashboard({
       minWidth: 0,
       id: 'btn-cancel',
       Cell: ({ row }) => {
-        var cancel_query_url =
+        let cancel_query_url =
           url_for('dashboard.index') + 'cancel_query' + '/' + sid,
           title = gettext('Cancel Active Query?'),
           txtConfirm = gettext(
@@ -629,14 +629,14 @@ export default function Dashboard({
     // If there is only one active session means it probably our main
     // connection session
     cellAction = cellAction || null;
-    var pg_version = treeNodeInfo.server.version || null,
+    let pg_version = treeNodeInfo.server.version || null,
       is_cancel_session = cellAction === 'cancel',
       txtMessage,
       maintenance_database = treeNodeInfo.server.db,
       is_super_user,
       current_user;
 
-    var can_signal_backend =
+    let can_signal_backend =
       treeNodeInfo.server && treeNodeInfo.server.user
         ? treeNodeInfo.server.user.can_signal_backend
         : false;
diff --git a/web/pgadmin/dashboard/static/js/Graphs.jsx b/web/pgadmin/dashboard/static/js/Graphs.jsx
index 10ccf126b..82b93db75 100644
--- a/web/pgadmin/dashboard/static/js/Graphs.jsx
+++ b/web/pgadmin/dashboard/static/js/Graphs.jsx
@@ -41,7 +41,7 @@ export function transformData(labels, refreshRate, use_diff_point_style) {
 
 /* Custom ChartJS legend callback */
 export function generateLegend(chart) {
-  var text = [];
+  let text = [];
   text.push('<div class="' + chart.id + '-legend d-flex">');
   for (let chart_val of chart.data.datasets) {
     text.push('<div class="legend-value"><span style="background-color:' + chart_val.backgroundColor + '">&nbsp;&nbsp;&nbsp;&nbsp;</span>');
diff --git a/web/pgadmin/dashboard/static/js/WelcomeDashboard.jsx b/web/pgadmin/dashboard/static/js/WelcomeDashboard.jsx
index 386973874..e3186d7f3 100644
--- a/web/pgadmin/dashboard/static/js/WelcomeDashboard.jsx
+++ b/web/pgadmin/dashboard/static/js/WelcomeDashboard.jsx
@@ -89,7 +89,7 @@ const useStyles = makeStyles((theme) => ({
 
 function AddNewServer(pgBrowser) {
   if (pgBrowser && pgBrowser.tree) {
-    var i = _.isUndefined(pgBrowser.tree.selected()) ?
+    let i = _.isUndefined(pgBrowser.tree.selected()) ?
         pgBrowser.tree.first(null, false) :
         pgBrowser.tree.selected(),
       serverModule = pgAdmin.Browser.Nodes.server,
diff --git a/web/pgadmin/misc/cloud/static/js/CloudWizard.jsx b/web/pgadmin/misc/cloud/static/js/CloudWizard.jsx
index a6ac67fff..d6b10e534 100644
--- a/web/pgadmin/misc/cloud/static/js/CloudWizard.jsx
+++ b/web/pgadmin/misc/cloud/static/js/CloudWizard.jsx
@@ -67,7 +67,7 @@ export default function CloudWizard({ nodeInfo, nodeData, onClose}) {
 
   const eventBus = React.useRef(new EventBus());
 
-  var steps = [gettext('Cloud Provider'), gettext('Credentials'),
+  let steps = [gettext('Cloud Provider'), gettext('Credentials'),
     gettext('Instance Specification'), gettext('Database Details'), gettext('Review')];
   const [currentStep, setCurrentStep] = React.useState('');
   const [selectionVal, setCloudSelection] = React.useState('');
@@ -121,7 +121,7 @@ export default function CloudWizard({ nodeInfo, nodeData, onClose}) {
   };
 
   const onSave = () => {
-    var _url = url_for('cloud.deploy_on_cloud'),
+    let _url = url_for('cloud.deploy_on_cloud'),
       post_data = {};
 
     if (cloudProvider == 'rds') {
@@ -227,7 +227,7 @@ export default function CloudWizard({ nodeInfo, nodeData, onClose}) {
     return new Promise((resolve, reject)=>{
       if(activeStep == 1 && cloudProvider == 'rds') {
         setErrMsg([MESSAGE_TYPE.INFO, gettext('Validating credentials...')]);
-        var _url = url_for('rds.verify_credentials');
+        let _url = url_for('rds.verify_credentials');
         const post_data = {
           cloud: selectionVal,
           secret: cloudDBCred,
@@ -283,7 +283,7 @@ export default function CloudWizard({ nodeInfo, nodeData, onClose}) {
   };
 
   const authenticateBigAnimal = () => {
-    var loading_icon_url = url_for(
+    let loading_icon_url = url_for(
       'static', { 'filename': 'img/loading.gif'}
     );
 
diff --git a/web/pgadmin/misc/dependencies/static/js/Dependencies.jsx b/web/pgadmin/misc/dependencies/static/js/Dependencies.jsx
index 7a23b0eca..b861d9732 100644
--- a/web/pgadmin/misc/dependencies/static/js/Dependencies.jsx
+++ b/web/pgadmin/misc/dependencies/static/js/Dependencies.jsx
@@ -76,7 +76,7 @@ export default function Dependencies({ nodeData, item, node, ...props }) {
   const [tableData, setTableData] = React.useState([]);
   const [loaderText, setLoaderText] = React.useState('');
   const [msg, setMsg] = React.useState('');
-  var columns = [
+  let columns = [
     {
       Header: 'Type',
       accessor: 'type',
diff --git a/web/pgadmin/misc/dependents/static/js/Dependents.jsx b/web/pgadmin/misc/dependents/static/js/Dependents.jsx
index 0c54c36cf..b9379e27e 100644
--- a/web/pgadmin/misc/dependents/static/js/Dependents.jsx
+++ b/web/pgadmin/misc/dependents/static/js/Dependents.jsx
@@ -77,7 +77,7 @@ export default function Dependents({ nodeData, item, node, ...props }) {
   const [loaderText, setLoaderText] = React.useState('');
   const [msg, setMsg] = React.useState('');
 
-  var columns = [
+  let columns = [
     {
       Header: 'Type',
       accessor: 'type',
diff --git a/web/pgadmin/misc/properties/CollectionNodeProperties.jsx b/web/pgadmin/misc/properties/CollectionNodeProperties.jsx
index 71a9b64dc..37952b3a7 100644
--- a/web/pgadmin/misc/properties/CollectionNodeProperties.jsx
+++ b/web/pgadmin/misc/properties/CollectionNodeProperties.jsx
@@ -198,7 +198,7 @@ export function CollectionNodeView({
       const api = getApiInstance();
 
       let tableColumns = [];
-      var column = {};
+      let column = {};
       setLoaderText('Loading...');
 
       if (itemNodeData._type.indexOf('coll-') > -1 && !_.isUndefined(nodeObj.getSchema)) {
diff --git a/web/pgadmin/misc/sql/static/js/SQL.jsx b/web/pgadmin/misc/sql/static/js/SQL.jsx
index c22cadf2d..16bb098cc 100644
--- a/web/pgadmin/misc/sql/static/js/SQL.jsx
+++ b/web/pgadmin/misc/sql/static/js/SQL.jsx
@@ -35,7 +35,7 @@ export default function SQL({ nodeData, node, did,  ...props }) {
   const [msg, setMsg] = React.useState('');
 
   useEffect(() => {
-    var sql = '-- ' + gettext('Please select an object in the tree view.');
+    let sql = '-- ' + gettext('Please select an object in the tree view.');
     if (node) {
       let url = generateNodeUrl.call(
         node,
diff --git a/web/pgadmin/static/css/style.css b/web/pgadmin/static/css/style.css
index bcea34567..62c52adac 100644
--- a/web/pgadmin/static/css/style.css
+++ b/web/pgadmin/static/css/style.css
@@ -1,5 +1,3 @@
-@import 'node_modules/alertifyjs/build/css/alertify.css';
-@import 'node_modules/alertifyjs/build/css/themes/bootstrap.css';
 @import 'node_modules/@fortawesome/fontawesome-free/css/all.css';
 @import 'node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css';
 @import 'node_modules/tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.css';
diff --git a/web/pgadmin/static/js/Dialogs/index.jsx b/web/pgadmin/static/js/Dialogs/index.jsx
index ee2ca73df..7a8cc6c86 100644
--- a/web/pgadmin/static/js/Dialogs/index.jsx
+++ b/web/pgadmin/static/js/Dialogs/index.jsx
@@ -26,7 +26,7 @@ import RenamePanelContent from './RenamePanelContent';
 
 function mountDialog(title, getDialogContent, docker=undefined, width, height) {
   // Register dialog panel
-  var panel;
+  let panel;
   if (docker) {
     pgAdmin.Browser.Node.registerUtilityPanel(docker);
     panel = pgAdmin.Browser.Node.addUtilityPanel(width||pgAdmin.Browser.stdW.md, height||undefined, docker);
@@ -35,7 +35,7 @@ function mountDialog(title, getDialogContent, docker=undefined, width, height) {
     panel = pgAdmin.Browser.Node.addUtilityPanel(width||pgAdmin.Browser.stdW.md);
   }
 
-  var j = panel.$container.find('.obj_properties').first();
+  let j = panel.$container.find('.obj_properties').first();
   panel.title(title);
 
   const onClose = ()=> {
@@ -61,7 +61,7 @@ function mountDialog(title, getDialogContent, docker=undefined, width, height) {
 
 // This functions is used to show the connect server password dialog.
 export function showServerPassword() {
-  var title = arguments[0],
+  let title = arguments[0],
     formJson = arguments[1],
     nodeObj = arguments[2],
     nodeData = arguments[3],
@@ -83,7 +83,7 @@ export function showServerPassword() {
         data={formJson}
         onOK={(formData)=>{
           const api = getApiInstance();
-          var _url = nodeObj.generate_url(itemNodeData, 'connect', nodeData, true);
+          let _url = nodeObj.generate_url(itemNodeData, 'connect', nodeData, true);
           if (!status) {
             treeNodeInfo.setLeaf(itemNodeData);
             treeNodeInfo.removeIcon(itemNodeData);
@@ -112,7 +112,7 @@ export function showServerPassword() {
 // This functions is used to show the connect server password dialog when
 // launch from Schema Diff tool.
 export function showSchemaDiffServerPassword() {
-  var docker = arguments[0],
+  let docker = arguments[0],
     title = arguments[1],
     formJson = arguments[2],
     serverID = arguments[3],
@@ -132,7 +132,7 @@ export function showSchemaDiffServerPassword() {
         data={formJson}
         onOK={(formData)=>{
           const api = getApiInstance();
-          var _url = url_for('schema_diff.connect_server', {'sid': serverID});
+          let _url = url_for('schema_diff.connect_server', {'sid': serverID});
 
           api.post(_url, formData)
             .then(res=>{
@@ -191,7 +191,7 @@ export function showMasterPassword(isPWDPresent, errmsg, masterpass_callback_que
             gettext('This will remove all the saved passwords. This will also remove established connections to '
             + 'the server and you may need to reconnect again. Do you wish to continue?'),
             function() {
-              var _url = url_for('browser.reset_master_password');
+              let _url = url_for('browser.reset_master_password');
 
               api.delete(_url)
                 .then(() => {
@@ -219,7 +219,7 @@ export function showMasterPassword(isPWDPresent, errmsg, masterpass_callback_que
 }
 
 export function showChangeServerPassword() {
-  var title = arguments[0],
+  let title = arguments[0],
     nodeData = arguments[1],
     nodeObj = arguments[2],
     itemNodeData = arguments[3],
@@ -234,7 +234,7 @@ export function showChangeServerPassword() {
         onSave={(isNew, data)=>{
           return new Promise((resolve, reject)=>{
             const api = getApiInstance();
-            var _url = nodeObj.generate_url(itemNodeData, 'change_password', nodeData, true);
+            let _url = nodeObj.generate_url(itemNodeData, 'change_password', nodeData, true);
 
             api.post(_url, data)
               .then(({data: respData})=>{
@@ -265,7 +265,7 @@ export function showChangeServerPassword() {
 }
 
 export function showNamedRestorePoint() {
-  var title = arguments[0],
+  let title = arguments[0],
     nodeData = arguments[1],
     nodeObj = arguments[2],
     itemNodeData = arguments[3];
@@ -281,7 +281,7 @@ export function showNamedRestorePoint() {
         }}
         onOK={(formData)=>{
           const api = getApiInstance();
-          var _url = nodeObj.generate_url(itemNodeData, 'restore_point', nodeData, true);
+          let _url = nodeObj.generate_url(itemNodeData, 'restore_point', nodeData, true);
 
           api.post(_url, formData)
             .then(res=>{
@@ -298,7 +298,7 @@ export function showNamedRestorePoint() {
 }
 
 export function showChangeOwnership() {
-  var title = arguments[0],
+  let title = arguments[0],
     userList = arguments[1],
     noOfSharedServers = arguments[2],
     deletedUser = arguments[3],
diff --git a/web/pgadmin/static/js/Explain/Graphical.jsx b/web/pgadmin/static/js/Explain/Graphical.jsx
index 0f54ee1ec..bb7851153 100644
--- a/web/pgadmin/static/js/Explain/Graphical.jsx
+++ b/web/pgadmin/static/js/Explain/Graphical.jsx
@@ -24,20 +24,20 @@ import clsx from 'clsx';
 import PropTypes from 'prop-types';
 
 // Some predefined constants used to calculate image location and its border
-var pWIDTH = 100.;
-var pHEIGHT = 100.;
-var IMAGE_WIDTH = 50;
-var IMAGE_HEIGHT = 50;
-var ARROW_WIDTH = 10,
+let pWIDTH = 100.;
+let pHEIGHT = 100.;
+let IMAGE_WIDTH = 50;
+let IMAGE_HEIGHT = 50;
+let ARROW_WIDTH = 10,
   ARROW_HEIGHT = 10;
-var TXT_ALIGN = 5,
+let TXT_ALIGN = 5,
   TXT_SIZE = '15px';
-var xMargin = 25,
+let xMargin = 25,
   yMargin = 25;
-var MIN_ZOOM_FACTOR = 0.3,
+let MIN_ZOOM_FACTOR = 0.3,
   MAX_ZOOM_FACTOR = 2,
   INIT_ZOOM_FACTOR = 1;
-var ZOOM_RATIO = 0.05;
+let ZOOM_RATIO = 0.05;
 
 const AUXILIARY_KEYS = ['image', 'Plans', 'level', 'image_text', 'xpos', 'ypos', 'width', 'height', 'total_time', 'parent_node', '_serial', 'arr_id'];
 
@@ -66,11 +66,11 @@ PolyLine.propTypes = {
 function Multitext({currentXpos, currentYpos, label, maxWidth}) {
   const theme = useTheme();
   let abc = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-  var xmlns = 'http://www.w3.org/2000/svg';
-  var svgElem = document.createElementNS(xmlns, 'svg');
+  let xmlns = 'http://www.w3.org/2000/svg';
+  let svgElem = document.createElementNS(xmlns, 'svg');
   svgElem.setAttributeNS(xmlns, 'height', '100%');
   svgElem.setAttributeNS(xmlns, 'width', '100%');
-  var text = document.createElementNS(xmlns, 'text');
+  let text = document.createElementNS(xmlns, 'text');
   text.innerHTML = abc;
   text.setAttributeNS(xmlns, 'x', 0);
   text.setAttributeNS(xmlns, 'y', 0);
@@ -88,11 +88,11 @@ function Multitext({currentXpos, currentYpos, label, maxWidth}) {
   * Find letter width in pixels and
   * index from where the text should be broken
   */
-  var letterWidth = text.getBBox().width / abc.length,
+  let letterWidth = text.getBBox().width / abc.length,
     wordBreakIndex = Math.round((maxWidth / letterWidth)) - 1;
   svgElem.remove();
 
-  var words = label.split(' '),
+  let words = label.split(' '),
     widthSoFar = 0,
     lines = [],
     currLine = '',
@@ -102,7 +102,7 @@ function Multitext({currentXpos, currentYpos, label, maxWidth}) {
     * the max-width boundary.
     */
     splitTextInMultiLine = function(leading, so_far, line) {
-      var l = line.length,
+      let l = line.length,
         res = [];
 
       if (l == 0)
@@ -126,8 +126,8 @@ function Multitext({currentXpos, currentYpos, label, maxWidth}) {
       return res;
     };
 
-  for (var i = 0; i < words.length; i++) {
-    var tmpArr = splitTextInMultiLine(
+  for (let i = 0; i < words.length; i++) {
+    let tmpArr = splitTextInMultiLine(
       currLine, widthSoFar, words[i]
     );
 
diff --git a/web/pgadmin/static/js/Explain/index.jsx b/web/pgadmin/static/js/Explain/index.jsx
index 96efa3cf1..aaa44413a 100644
--- a/web/pgadmin/static/js/Explain/index.jsx
+++ b/web/pgadmin/static/js/Explain/index.jsx
@@ -27,11 +27,11 @@ const useStyles = makeStyles((theme)=>({
 }));
 
 // Some predefined constants used to calculate image location and its border
-var pWIDTH = 100.;
-var pHEIGHT = 100.;
-var offsetX = 200,
+let pWIDTH = 100.;
+let pHEIGHT = 100.;
+let offsetX = 200,
   offsetY = 60;
-var xMargin = 25,
+let xMargin = 25,
   yMargin = 25;
 
 const DEFAULT_ARROW_SIZE = 2;
@@ -154,7 +154,7 @@ function nodeExplainTableData(_planData, _ctx) {
   }
 
   if ('Peak Memory Usage' in _planData) {
-    var buffer = [
+    let buffer = [
       '<strong>' + gettext('Buckets') + '</strong>:', _.escape(_planData['Hash Buckets']),
       '<strong>' + gettext('Batches') + '</strong>:', _.escape(_planData['Hash Batches']),
       '<strong>' + gettext('Memory Usage') + '</strong>:', _.escape(_planData['Peak Memory Usage']), 'kB',
@@ -246,7 +246,7 @@ function parseExplainTableData(plan, ctx) {
 }
 
 function parsePlan(data, ctx) {
-  var idx = 1,
+  let idx = 1,
     lvl = data.level = data.level || [idx],
     plans = [],
     nodeType = data['Node Type'],
@@ -292,7 +292,7 @@ function parsePlan(data, ctx) {
     nodeType = nodeType.substring(0, 7);
 
   // Get the image information for current node
-  var mappedImage = (_.isFunction(ImageMapper[nodeType]) &&
+  let mappedImage = (_.isFunction(ImageMapper[nodeType]) &&
       ImageMapper[nodeType].apply(undefined, [data])) ||
     ImageMapper[nodeType] || {
     'image': 'ex_unknown.svg',
@@ -378,7 +378,7 @@ function parsePlan(data, ctx) {
         }
       }
 
-      var childHeight = plan.height;
+      let childHeight = plan.height;
 
       if (idx !== 1) {
         data['height'] = data['height'] + childHeight + offsetY;
diff --git a/web/pgadmin/static/js/alertify.pgadmin.defaults.js b/web/pgadmin/static/js/alertify.pgadmin.defaults.js
deleted file mode 100644
index 3501a7568..000000000
--- a/web/pgadmin/static/js/alertify.pgadmin.defaults.js
+++ /dev/null
@@ -1,316 +0,0 @@
-/////////////////////////////////////////////////////////////
-//
-// pgAdmin 4 - PostgreSQL Tools
-//
-// Copyright (C) 2013 - 2022, The pgAdmin Development Team
-// This software is released under the PostgreSQL Licence
-//
-//////////////////////////////////////////////////////////////
-
-define([
-  'sources/gettext', 'alertify', 'jquery', 'sources/utils',
-], function(gettext, alertify, $, commonUtils) {
-  alertify.defaults.transition = 'zoom';
-  alertify.defaults.theme.ok = 'btn btn-primary fa fa-lg fa-check pg-alertify-button';
-  alertify.defaults.theme.cancel = 'btn btn-secondary fa fa-lg fa-times pg-alertify-button';
-  alertify.defaults.theme.input = 'form-control';
-  alertify.defaults.closable = false;
-
-  var alertifyDialogResized = function(stop) {
-    var self = this;
-
-    if (stop) {
-      self.pgResizeRecursion = false;
-    }
-
-    if (self.pgResizeTimeout) {
-      return;
-    }
-
-    self.pgResizeTimeout = setTimeout(
-      function() {
-        var $el = $(this.elements.dialog),
-          w = $el.width(),
-          elAttr = 'xs';
-
-        this.pgResizeTimeout = null;
-
-        /** Calculations based on https://getbootstrap.com/docs/4.1/layout/grid/#grid-options **/
-        if (w >= 480) {
-          elAttr = 'sm';
-        }
-        if (w >= 768) {
-          elAttr = 'md';
-        }
-        if (w >= 992) {
-          elAttr = 'lg';
-        }
-        if (w >=1200) {
-          elAttr = 'xl';
-        }
-
-        $el.attr('el', elAttr);
-      }.bind(self),
-      100
-    );
-  };
-
-  var alertifyDialogStartResizing = function(start) {
-    var self = this;
-
-    if (start) {
-      self.pgResizeRecursion = true;
-    }
-
-    setTimeout(
-      function() {
-        alertifyDialogResized.apply(self);
-
-        if (self.pgResizeRecursion) {
-          alertifyDialogStartResizing.apply(self, [false]);
-        }
-      }, 100
-    );
-  };
-
-  alertify.pgDialogBuild = function() {
-    this.set('onshow', function() {
-      this.elements.dialog.classList.add('pg-el-container');
-      $(this.elements.commands.close).attr('title', gettext('Close'));
-      $(this.elements.commands.maximize).attr('title', gettext('Maximize'));
-      $(this.elements.commands.close).attr('aria-label', gettext('Close'));
-      $(this.elements.commands.maximize).attr('aria-label', gettext('Maximize'));
-      alertifyDialogResized.apply(this, arguments);
-      let _self = this;
-
-      let cmds = Object.values(this.elements.commands);
-      $(cmds).on('keydown', 'button', (event) => {
-        if (event.shiftKey && event.keyCode == 9 && $(this).nextAll('button:not([disabled])').length == 0){
-          let container = $(_self.elements.footer);
-          commonUtils.findAndSetFocus(container.find('button:not([disabled]):last'));
-        }
-      });
-    });
-    this.set('onresize', alertifyDialogStartResizing.bind(this, true));
-    this.set('onresized', alertifyDialogResized.bind(this, true));
-    this.set('onmaximized', alertifyDialogResized);
-    this.set('onrestored', alertifyDialogResized);
-
-    /* Set the key to null if it is not defined
-     * When Browser autofill drop down value is clicked it raises a keyup event
-     * with undefined keyCode. The undefined keyCode matches the undefined key
-     * of alertify and triggers the button
-     */
-    for(let btn_val of this.__internal.buttons) {
-      if(_.isUndefined(btn_val['key'])) {
-        btn_val['key'] = null;
-      }
-    }
-    let self = this;
-
-    $(this.elements.footer).on('keydown', 'button', function(event) {
-      if (!event.shiftKey && event.keyCode == 9 && $(this).nextAll('button:not([disabled])').length == 0) {
-        // set focus back to first editable input element of current active tab once we cycle through all enabled buttons.
-        commonUtils.findAndSetFocus($(self.elements.dialog));
-        return false;
-      }
-    });
-  };
-
-  alertify.pgHandleItemError = function(xhr, error, message, args) {
-    var pgBrowser = window.pgAdmin.Browser;
-
-    if (!xhr || !pgBrowser) {
-      return;
-    }
-
-    var contentType = xhr.getResponseHeader('Content-Type'),
-      jsonResp = contentType &&
-      contentType.indexOf('application/json') == 0 &&
-      JSON.parse(xhr.responseText);
-
-    if (
-      jsonResp && (
-        xhr.status == 503 ? (
-          jsonResp.info == 'CONNECTION_LOST' &&
-          'server' in args.info && jsonResp.data.sid >= 0 &&
-          jsonResp.data.sid == args.info.server._id
-        ) : (
-          xhr.status == 428 &&
-          jsonResp.errormsg &&
-          jsonResp.errormsg == gettext('Connection to the server has been lost.')
-        )
-      )
-    ) {
-      if (
-        args.preHandleConnectionLost &&
-        typeof(args.preHandleConnectionLost) == 'function'
-      ) {
-        args.preHandleConnectionLost.apply(this, arguments);
-      }
-
-      // Check the status of the maintenance server connection.
-      var server = pgBrowser.Nodes['server'],
-        ctx = {
-          resp: jsonResp,
-          xhr: xhr,
-          args: args,
-        },
-        reconnectServer = function() {
-          var ctx_local = this,
-            onServerConnect = function(_sid, _i, _d) {
-              // Yay - server is reconnected.
-              if (this.args.info.server._id == _sid) {
-                pgBrowser.Events.off(
-                  'pgadmin:server:connected', onServerConnect
-                );
-                pgBrowser.Events.off(
-                  'pgadmin:server:connect:cancelled', onConnectCancel
-                );
-
-                // Do we need to connect the disconnected server now?
-                if (
-                  this.resp.data.database &&
-                  this.resp.data.database != _d.db
-                ) {
-                  // Server is connected now, we will need to inform the
-                  // database to connect it now.
-                  pgBrowser.Events.trigger(
-                    'pgadmin:database:connection:lost', this.args.item,
-                    this.resp, true
-                  );
-                }
-              }
-            }.bind(ctx_local),
-            onConnectCancel = function(_sid, _item, _data) {
-              // User has cancelled the operation in between.
-              if (_sid == this.args.info.server.id) {
-                pgBrowser.Events.off('pgadmin:server:connected', onServerConnect);
-                pgBrowser.Events.off('pgadmin:server:connect:cancelled', onConnectCancel);
-
-                // Connection to the database will also be cancelled
-                pgBrowser.Events.trigger(
-                  'pgadmin:database:connect:cancelled', _sid,
-                  this.resp.data.database || _data.db, _item, _data
-                );
-              }
-            }.bind(ctx_local);
-
-          pgBrowser.Events.on('pgadmin:server:connected', onServerConnect);
-          pgBrowser.Events.on('pgadmin:server:connect:cancelled', onConnectCancel);
-
-          // Connection to the server has been lost, we need to inform the
-          // server first to take the action first.
-          pgBrowser.Events.trigger(
-            'pgadmin:server:connection:lost', this.args.item, this.resp
-          );
-        }.bind(ctx);
-
-      $.ajax({
-        url: server.generate_url(
-          null, 'connect', args.info.server, true, args.info
-        ),
-        dataType: 'json',
-      })
-        .done(function(res) {
-          if (res.success && 'connected' in res.data) {
-            if (res.data.connected) {
-            // Server is connected, but - the connection with the
-            // particular database has been lost.
-              pgBrowser.Events.trigger(
-                'pgadmin:database:connection:lost', args.item, jsonResp
-              );
-              return;
-            }
-          }
-
-          // Serever was not connected, we should first try to connect
-          // the server.
-          reconnectServer();
-        })
-        .fail(function() {
-          reconnectServer();
-        });
-      return true;
-    } else if (jsonResp && jsonResp.info == 'CRYPTKEY_MISSING' && xhr.status == 503) {
-      /* Suppress the error here and handle in Alertify.pgNotifier wherever
-       * required, as it has callback option
-       */
-      return false;
-    }
-    return false;
-  };
-
-  // Confirm dialogue: Set title attribute
-  alertify.confirm().set({
-    onshow:function() {
-      $(this.elements.commands.close).attr('title', gettext('Close'));
-      $(this.elements.commands.maximize).attr('title', gettext('Maximize'));
-      $(this.elements.content).addClass('ajs-wrap-text');
-      $(this.elements.header).attr('id', 'confirm-dialog-header');
-      $(this.elements.body).attr('id', 'confirm-dialog-body');
-      $(this.elements.dialog).attr({
-        role: 'alertdialog',
-        'aria-modal': 'true',
-        'aria-labelledby': 'confirm-dialog-header',
-        'aria-describedby': 'confirm-dialog-body',
-      });
-    },
-    reverseButtons: true,
-  });
-
-  alertify.prompt().set({
-    reverseButtons: true,
-  });
-
-  alertify.alert().set({
-    onshow:function() {
-      $(this.elements.header).attr('id', 'alert-dialog-header');
-      $(this.elements.body).attr('id', 'alert-dialog-body');
-      $(this.elements.modal).attr({
-        role: 'alertdialog',
-        'aria-modal': 'true',
-        'aria-labelledby': 'alert-dialog-header',
-        'aria-describedby': 'alert-dialog-body',
-      });
-    },
-  });
-
-  /* Suppress the enter key events occurring from select2 boxes
-   * so that the dialog does not close.
-   * Alertify listens to keyup events on the body element unfortunately
-   * instead of alertify dialog
-   */
-  $('body').off('keyup').on('keyup', function(ev){
-    if(ev.which === 13 || ev.which === 27) {
-      let suppressForClasses = ['select2-selection', 'select2-search__field'];
-      let $el = $(ev.target);
-      for(let class_val of suppressForClasses){
-        if($el.hasClass(class_val)){
-          ev.preventDefault();
-          ev.stopImmediatePropagation();
-          ev.stopPropagation();
-          break;
-        }
-      }
-
-      let el_name = ev.target.name;
-      if(el_name == 'key'){
-        let $parentDiv = $el.closest('.value'),
-          $nextField = $parentDiv.find('.shift .btn-checkbox');
-
-        if ($nextField.length == 0) {
-          $nextField = $el.closest('.value').next().find('input.form-control');
-        }
-
-        if ($nextField.length) {
-          $nextField.focus();
-          ev.preventDefault();
-          ev.stopImmediatePropagation();
-          ev.stopPropagation();
-        }
-      }
-    }
-  });
-  return alertify;
-});
diff --git a/web/pgadmin/static/js/alertify/dialog.js b/web/pgadmin/static/js/alertify/dialog.js
deleted file mode 100644
index aa8723193..000000000
--- a/web/pgadmin/static/js/alertify/dialog.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/////////////////////////////////////////////////////////////
-//
-// pgAdmin 4 - PostgreSQL Tools
-//
-// Copyright (C) 2013 - 2022, The pgAdmin Development Team
-// This software is released under the PostgreSQL Licence
-//
-//////////////////////////////////////////////////////////////
-
-import gettext from '../gettext';
-import {DialogFactory} from './dialog_factory';
-import Backform from '../backform.pgadmin';
-
-/**
- * This class can be extended to create new dialog boxes.
- * Examples of this can be found in:
- * `web/pgadmin/static/js/backup/backup_dialog.js`
- *
- * Do not forget to add the new Dialog type to the `DialogFactory`
- */
-export class Dialog {
-  constructor(errorAlertTitle,
-    dialogContainerSelector,
-    pgBrowser, $, alertify, DialogModel,
-    backform = Backform) {
-    this.errorAlertTitle = errorAlertTitle;
-    this.alertify = alertify;
-    this.pgBrowser = pgBrowser;
-    this.jquery = $;
-    this.dialogModel = DialogModel;
-    this.backform = backform;
-    this.dialogContainerSelector = dialogContainerSelector;
-  }
-
-  retrieveAncestorOfTypeServer(item) {
-    let serverInformation = null;
-    let treeItem = item || this.pgBrowser.tree.selected();
-    let treeNode = this.pgBrowser.tree.findNodeByDomElement(treeItem);
-
-    if (treeNode) {
-      let nodeData;
-      let databaseNode = treeNode.ancestorNode(
-        (node) => {
-          nodeData = node.getData();
-          return (nodeData._type === 'database');
-        }
-      );
-      let isServerNode = (node) => {
-        nodeData = node.getData();
-        return nodeData._type === 'server';
-      };
-
-      if (databaseNode !== null) {
-        if (nodeData._label.indexOf('=') >= 0) {
-          this.alertify.alert(
-            gettext(this.errorAlertTitle),
-            gettext(
-              'Databases with = symbols in the name cannot be backed up or restored using this utility.'
-            )
-          );
-        } else {
-          if (databaseNode.anyParent(isServerNode))
-            serverInformation = nodeData;
-        }
-      } else {
-        if (treeNode.anyFamilyMember(isServerNode))
-          serverInformation = nodeData;
-      }
-    }
-
-    if (serverInformation === null) {
-      this.alertify.alert(
-        gettext(this.errorAlertTitle),
-        gettext('Please select server or child node from the browser tree.')
-      );
-    }
-
-    return serverInformation;
-  }
-
-  dialogName() {
-    return undefined;
-  }
-
-  createOrGetDialog(dialogTitle, typeOfDialog) {
-    const dialogName = this.dialogName(typeOfDialog);
-
-    if (!this.alertify[dialogName]) {
-      const self = this;
-      this.alertify.dialog(dialogName, function factory() {
-        return self.dialogFactory(dialogTitle, typeOfDialog);
-      });
-    }
-    return this.alertify[dialogName];
-  }
-
-  dialogFactory(dialogTitle, typeOfDialog) {
-    const factory = new DialogFactory(
-      this.pgBrowser,
-      this.jquery,
-      this.alertify,
-      this.dialogModel,
-      this.backform,
-      this.dialogContainerSelector);
-    return factory.create(dialogTitle, typeOfDialog);
-  }
-
-  canExecuteOnCurrentDatabase(treeItem) {
-    const treeInfo = this.pgBrowser.tree.getTreeNodeHierarchy(treeItem);
-
-    if (treeInfo.database && treeInfo.database._label.indexOf('=') >= 0) {
-      this.alertify.alert(
-        gettext(this.errorAlertTitle),
-        gettext('Databases with = symbols in the name cannot be backed up or restored using this utility.')
-      );
-      return false;
-    }
-
-    return true;
-  }
-}
diff --git a/web/pgadmin/static/js/alertify/dialog_factory.js b/web/pgadmin/static/js/alertify/dialog_factory.js
deleted file mode 100644
index 36eac74c2..000000000
--- a/web/pgadmin/static/js/alertify/dialog_factory.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////
-//
-// pgAdmin 4 - PostgreSQL Tools
-//
-// Copyright (C) 2013 - 2022, The pgAdmin Development Team
-// This software is released under the PostgreSQL Licence
-//
-//////////////////////////////////////////////////////////////
-
-import SearchObjectsDialogWrapper from '../../../tools/search_objects/static/js/search_objects_dialog_wrapper';
-
-export class DialogFactory {
-  constructor(pgBrowser, $,
-    alertify, DialogModel,
-    backform, dialogContainerSelector) {
-    this.pgBrowser = pgBrowser;
-    this.jquery = $;
-    this.alertify = alertify;
-    this.dialogModel = DialogModel;
-    this.backform = backform;
-    this.dialogContainerSelector = dialogContainerSelector;
-  }
-
-  create(dialogTitle, typeOfDialog) {
-    if (typeOfDialog === 'restore') {
-      return this.createRestoreDialog(dialogTitle, typeOfDialog);
-    } else if (typeOfDialog === 'search_objects') {
-      return this.createSearchObjectsDialog(dialogTitle, typeOfDialog);
-    }
-  }
-
-  createSearchObjectsDialog(dialogTitle, typeOfDialog) {
-    return new SearchObjectsDialogWrapper(
-      this.dialogContainerSelector, dialogTitle, typeOfDialog,
-      this.jquery,
-      this.pgBrowser,
-      this.alertify,
-      this.dialogModel,
-      this.backform);
-  }
-}
diff --git a/web/pgadmin/static/js/alertify/dialog_wrapper.js b/web/pgadmin/static/js/alertify/dialog_wrapper.js
deleted file mode 100644
index 6567060a0..000000000
--- a/web/pgadmin/static/js/alertify/dialog_wrapper.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/////////////////////////////////////////////////////////////
-//
-// pgAdmin 4 - PostgreSQL Tools
-//
-// Copyright (C) 2013 - 2022, The pgAdmin Development Team
-// This software is released under the PostgreSQL Licence
-//
-//////////////////////////////////////////////////////////////
-
-import * as commonUtils from '../utils';
-import $ from 'jquery';
-
-export class DialogWrapper {
-  constructor(
-    dialogContainerSelector, dialogTitle, jquery, pgBrowser,
-    alertify, dialogModel, backform) {
-    this.hooks = {
-      onclose: function () {
-        if (this.view) {
-          this.view.remove({
-            data: true,
-            internal: true,
-            silent: true,
-          });
-        }
-      },
-    };
-    this.dialogContainerSelector = dialogContainerSelector;
-    this.dialogTitle = dialogTitle;
-    this.jquery = jquery;
-    this.pgBrowser = pgBrowser;
-    this.alertify = alertify;
-    this.dialogModel = dialogModel;
-    this.backform = backform;
-  }
-
-  build() {
-    this.alertify.pgDialogBuild.apply(this);
-  }
-
-  wasHelpButtonPressed(e) {
-    return e.button.element.name === 'dialog_help'
-      || e.button.element.name === 'object_help';
-  }
-
-  getSelectedNodeData(selectedTreeNode) {
-    if (!this.isNodeSelected(selectedTreeNode)) {
-      return undefined;
-    }
-    const treeNodeData = selectedTreeNode.getData();
-    if (treeNodeData) {
-      return treeNodeData;
-    }
-    return undefined;
-  }
-
-  focusOnDialog(alertifyDialog) {
-    let backform_tab = $(alertifyDialog.elements.body).find('.backform-tab');
-    backform_tab.attr('tabindex', -1);
-    this.pgBrowser.keyboardNavigation.getDialogTabNavigator($(alertifyDialog.elements.dialog));
-    let container = backform_tab.find('.tab-content:first > .tab-pane.active:first');
-
-    if(container.length === 0 && alertifyDialog.elements.content.innerHTML) {
-      container = $(alertifyDialog.elements.content);
-    }
-    commonUtils.findAndSetFocus(container);
-  }
-
-  isNodeSelected(selectedTreeNode) {
-    return selectedTreeNode;
-  }
-}
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index 352ec9a6a..f0ea21ee3 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -7,13 +7,15 @@
 //
 //////////////////////////////////////////////////////////////
 
+import { calcFontSize } from './utils';
+
 define([
   'sources/gettext', 'underscore', 'jquery',
-  'backbone', 'backform', 'backgrid', 'codemirror', 'sources/sqleditor_utils',
+  'backbone', 'backform', 'backgrid', 'codemirror',
   'sources/keyboard_shortcuts', 'sources/window', 'sources/select2/configure_show_on_scroll',
   'color-picker', 'pgadmin.backgrid', 'select2', 'bootstrap.toggle',
 ], function(gettext, _, $, Backbone, Backform, Backgrid, CodeMirror,
-  SqlEditorUtils, keyboardShortcuts, pgWindow, configure_show_on_scroll,
+  keyboardShortcuts, pgWindow, configure_show_on_scroll,
   Pickr) {
 
   var pgAdmin = (window.pgAdmin = window.pgAdmin || {}),
@@ -1889,7 +1891,7 @@ define([
         let sqlEditPreferences = pgAdmin.Browser.get_preferences_for_module('sqleditor');
 
         $(self.sqlCtrl.getWrapperElement()).css(
-          'font-size',SqlEditorUtils.calcFontSize(sqlEditPreferences.sql_font_size)
+          'font-size', calcFontSize(sqlEditPreferences.sql_font_size)
         );
         self.sqlCtrl.setOption('tabSize', sqlEditPreferences.tab_size);
         self.sqlCtrl.setOption('lineWrapping', sqlEditPreferences.wrap_code);
@@ -2623,7 +2625,7 @@ define([
         let sqlEditPreferences = browser.get_preferences_for_module('sqleditor');
 
         $(self.sqlCtrl.getWrapperElement()).css(
-          'font-size',SqlEditorUtils.calcFontSize(sqlEditPreferences.sql_font_size)
+          'font-size', calcFontSize(sqlEditPreferences.sql_font_size)
         );
         self.sqlCtrl.setOption('indentWithTabs', !sqlEditPreferences.use_spaces);
         self.sqlCtrl.setOption('indentUnit', sqlEditPreferences.tab_size);
diff --git a/web/pgadmin/static/js/backgrid.pgadmin.js b/web/pgadmin/static/js/backgrid.pgadmin.js
index 0eadfa606..5fba5a041 100644
--- a/web/pgadmin/static/js/backgrid.pgadmin.js
+++ b/web/pgadmin/static/js/backgrid.pgadmin.js
@@ -10,11 +10,11 @@
 import Notify from '../../static/js/helpers/Notifier';
 
 define([
-  'sources/gettext', 'underscore', 'jquery', 'backbone', 'backform', 'backgrid', 'alertify',
+  'sources/gettext', 'underscore', 'jquery', 'backbone', 'backform', 'backgrid',
   'moment', 'bignumber', 'codemirror', 'sources/utils', 'sources/keyboard_shortcuts', 'sources/select2/configure_show_on_scroll',
   'sources/window', 'bootstrap.datetimepicker', 'backgrid.filter', 'bootstrap.toggle',
 ], function(
-  gettext, _, $, Backbone, Backform, Backgrid, Alertify, moment, BigNumber, CodeMirror,
+  gettext, _, $, Backbone, Backform, Backgrid, moment, BigNumber, CodeMirror,
   commonUtils, keyboardShortcuts, configure_show_on_scroll, pgWindow
 ) {
   /*
diff --git a/web/pgadmin/static/js/browser/generate_url.js b/web/pgadmin/static/js/browser/generate_url.js
index b68e2e816..9603c3bb6 100644
--- a/web/pgadmin/static/js/browser/generate_url.js
+++ b/web/pgadmin/static/js/browser/generate_url.js
@@ -7,13 +7,13 @@
 //
 //////////////////////////////////////////////////////////////
 
-import _ from 'underscore';
+import _ from 'lodash';
 
 function generate_url(baseUrl, treeInfo, actionType, nodeType, pickFunction, itemDataID) {
   let ref = '';
   _.each(
     _.sortBy(
-      _.pick(treeInfo, pickFunction),
+      _.pickBy(treeInfo, pickFunction),
       function (treeInfoItems) {
         return treeInfoItems.priority;
       }
diff --git a/web/pgadmin/static/js/check_node_visibility.js b/web/pgadmin/static/js/check_node_visibility.js
index 682fd50d6..2226504bd 100644
--- a/web/pgadmin/static/js/check_node_visibility.js
+++ b/web/pgadmin/static/js/check_node_visibility.js
@@ -6,9 +6,10 @@
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////////////////
+import _ from 'lodash';
 
-define(['jquery', 'underscore'],
-  function ($, _) {
+define([],
+  function () {
 
     return function (pgBrowser, node_type) {
       if(_.isUndefined(node_type) || _.isNull(node_type)) {
diff --git a/web/pgadmin/static/js/components/FormComponents.jsx b/web/pgadmin/static/js/components/FormComponents.jsx
index 3265c767e..d5dd84a4c 100644
--- a/web/pgadmin/static/js/components/FormComponents.jsx
+++ b/web/pgadmin/static/js/components/FormComponents.jsx
@@ -843,7 +843,7 @@ export const InputSelect = forwardRef(({
   const theme = useTheme();
 
 
-  /* React will always take options var as changed parameter. So,
+  /* React will always take options let as changed parameter. So,
   We cannot run the below effect with options dependency as it will keep on
   loading the options. optionsReloadBasis is helpful to avoid repeated
   options load. If optionsReloadBasis value changes, then options will be loaded again.
diff --git a/web/pgadmin/static/js/helpers/Notifier.jsx b/web/pgadmin/static/js/helpers/Notifier.jsx
index 0969421ca..1b1305c2f 100644
--- a/web/pgadmin/static/js/helpers/Notifier.jsx
+++ b/web/pgadmin/static/js/helpers/Notifier.jsx
@@ -118,7 +118,7 @@ AlertContent.propTypes = {
 };
 
 
-var Notifier = {
+let Notifier = {
   success(msg, autoHideDuration = AUTO_HIDE_DURATION) {
     this._callNotify(msg, MESSAGE_TYPE.SUCCESS, autoHideDuration);
   },
@@ -151,7 +151,7 @@ var Notifier = {
   },
 
   pgRespErrorNotify(xhr, error, prefixMsg='') {
-    var contentType = xhr.getResponseHeader('Content-Type');
+    let contentType = xhr.getResponseHeader('Content-Type');
     if (xhr.status === 410) {
       const pgBrowser = window.pgAdmin.Browser;
       pgBrowser.report_error(gettext('Error: Object not found - %s.', xhr.statusText), xhr.responseJSON.errormsg);
@@ -162,7 +162,7 @@ var Notifier = {
         } else {
           if(contentType){
             if(contentType.indexOf('application/json') >= 0) {
-              var resp = JSON.parse(xhr.responseText);
+              let resp = JSON.parse(xhr.responseText);
               error = _.escape(resp.result) || _.escape(resp.errormsg) || gettext('Unknown error');
             }
           }
@@ -181,7 +181,7 @@ var Notifier = {
   },
 
   pgNotifier(type, xhr, promptmsg, onJSONResult) {
-    var msg = xhr.responseText,
+    let msg = xhr.responseText,
       contentType = xhr.getResponseHeader('Content-Type');
 
     if (xhr.status == 0) {
@@ -191,10 +191,10 @@ var Notifier = {
       if (contentType) {
         try {
           if (contentType.indexOf('application/json') == 0) {
-            var resp = JSON.parse(msg);
+            let resp = JSON.parse(msg);
 
             if(resp.info == 'CRYPTKEY_MISSING') {
-              var pgBrowser = window.pgAdmin.Browser;
+              let pgBrowser = window.pgAdmin.Browser;
               pgBrowser.set_master_password('', ()=> {
                 if(onJSONResult && typeof(onJSONResult) == 'function') {
                   onJSONResult('CRYPTKEY_SET');
diff --git a/web/pgadmin/static/js/modify_animation.js b/web/pgadmin/static/js/modify_animation.js
deleted file mode 100644
index 622cef170..000000000
--- a/web/pgadmin/static/js/modify_animation.js
+++ /dev/null
@@ -1,71 +0,0 @@
-//////////////////////////////////////////////////////////////////////////
-//
-// pgAdmin 4 - PostgreSQL Tools
-//
-// Copyright (C) 2013 - 2022, The pgAdmin Development Team
-// This software is released under the PostgreSQL Licence
-//
-//////////////////////////////////////////////////////////////////////////
-
-import $ from 'jquery';
-import _ from 'underscore';
-import pgWindow from 'sources/window';
-
-function getBrowserInstance() {
-  return pgWindow.pgAdmin.Browser;
-}
-
-function modifyTreeAnimation(pgBrowser, tree) {
-  let enableTreeAnimation = pgBrowser.get_preference(
-    'browser', 'enable_acitree_animation'
-  ).value;
-
-  if (_.isUndefined(tree)) {
-    tree = pgBrowser.tree;
-  }
-
-  if(enableTreeAnimation) {
-    tree.options({
-      animateRoot: true,
-      unanimated: false,
-      show: _.extend(tree.options().show, {duration: 75}),
-      hide: _.extend(tree.options().hide, {duration: 75}),
-      view: _.extend(tree.options().view, {duration: 75}),
-    });
-  } else {
-    tree.options({
-      animateRoot: false,
-      unanimated: true,
-      show: _.extend(tree.options().show, {duration: 0}),
-      hide: _.extend(tree.options().hide, {duration: 0}),
-      view: _.extend(tree.options().view, {duration: 0}),
-    });
-  }
-}
-
-function modifyAlertifyAnimation(pgBrowser) {
-  if(_.isUndefined(pgBrowser) || _.isNull(pgBrowser)) {
-    pgBrowser = getBrowserInstance();
-  }
-
-  let enableTreeAnimation = pgBrowser.get_preference(
-    'browser', 'enable_alertify_animation'
-  ).value;
-
-  if(enableTreeAnimation) {
-    $(document).find('body').removeClass('alertify-no-animation');
-    _.each(document.getElementsByTagName('iframe'), function(frame) {
-      $(frame.contentDocument).find('body').removeClass('alertify-no-animation');
-    });
-  } else {
-    $(document).find('body').addClass('alertify-no-animation');
-    _.each(document.getElementsByTagName('iframe'), function(frame) {
-      $(frame.contentDocument).find('body').addClass('alertify-no-animation');
-    });
-  }
-}
-
-module.exports = {
-  modifyTreeAnimation : modifyTreeAnimation,
-  modifyAlertifyAnimation: modifyAlertifyAnimation,
-};
diff --git a/web/pgadmin/static/js/sqleditor_utils.js b/web/pgadmin/static/js/sqleditor_utils.js
deleted file mode 100644
index fa63a9ab2..000000000
--- a/web/pgadmin/static/js/sqleditor_utils.js
+++ /dev/null
@@ -1,22 +0,0 @@
-//////////////////////////////////////////////////////////////////////////
-//
-// pgAdmin 4 - PostgreSQL Tools
-//
-// Copyright (C) 2013 - 2022, The pgAdmin Development Team
-// This software is released under the PostgreSQL Licence
-//
-//////////////////////////////////////////////////////////////////////////
-// This file contains common utilities functions used in sqleditor modules
-
-module.exports = {
-  calcFontSize: function(fontSize) {
-    if(fontSize) {
-      fontSize = parseFloat((Math.round(parseFloat(fontSize + 'e+2')) + 'e-2'));
-      let rounded = Number(fontSize);
-      if(rounded > 0) {
-        return rounded + 'em';
-      }
-    }
-    return '1em';
-  },
-};
diff --git a/web/pgadmin/static/js/tree/pgadmin_tree_save_state.js b/web/pgadmin/static/js/tree/pgadmin_tree_save_state.js
index 5f55a2308..5181610cd 100644
--- a/web/pgadmin/static/js/tree/pgadmin_tree_save_state.js
+++ b/web/pgadmin/static/js/tree/pgadmin_tree_save_state.js
@@ -7,7 +7,7 @@
 //
 //////////////////////////////////////////////////////////////
 
-import _ from 'underscore';
+import _ from 'lodash';
 import $ from 'jquery';
 import url_for from 'sources/url_for';
 import gettext from 'sources/gettext';
diff --git a/web/pgadmin/static/js/tree/preference_nodes.ts b/web/pgadmin/static/js/tree/preference_nodes.ts
index 42717dbd4..88e5469af 100644
--- a/web/pgadmin/static/js/tree/preference_nodes.ts
+++ b/web/pgadmin/static/js/tree/preference_nodes.ts
@@ -9,7 +9,7 @@
 
 import * as BrowserFS from 'browserfs'
 import pgAdmin from 'sources/pgadmin';
-import _ from 'underscore';
+import _ from 'lodash';
 import { FileType } from 'react-aspen'
 import { findInTree } from './tree';
 
diff --git a/web/pgadmin/static/js/tree/tree_nodes.ts b/web/pgadmin/static/js/tree/tree_nodes.ts
index 6a903385d..4e12f7fc4 100644
--- a/web/pgadmin/static/js/tree/tree_nodes.ts
+++ b/web/pgadmin/static/js/tree/tree_nodes.ts
@@ -10,7 +10,7 @@
 import * as BrowserFS from 'browserfs'
 import url_for from 'sources/url_for';
 import pgAdmin from 'sources/pgadmin';
-import _ from 'underscore';
+import _ from 'lodash';
 import { FileType } from 'react-aspen'
 import { findInTree } from './tree';
 
diff --git a/web/pgadmin/static/js/utils.js b/web/pgadmin/static/js/utils.js
index 8eec34905..3dca104d5 100644
--- a/web/pgadmin/static/js/utils.js
+++ b/web/pgadmin/static/js/utils.js
@@ -523,3 +523,138 @@ export function compareSizeVals(val1, val2) {
   if(val1 > val2) return 1;
   return (val1 < val2 ? -1 : 0);
 }
+
+export function calcFontSize(fontSize) {
+  if(fontSize) {
+    fontSize = parseFloat((Math.round(parseFloat(fontSize + 'e+2')) + 'e-2'));
+    let rounded = Number(fontSize);
+    if(rounded > 0) {
+      return rounded + 'em';
+    }
+  }
+  return '1em';
+}
+
+export function pgHandleItemError(xhr, args) {
+  var pgBrowser = window.pgAdmin.Browser;
+
+  if (!xhr || !pgBrowser) {
+    return;
+  }
+
+  var contentType = xhr.getResponseHeader('Content-Type'),
+    jsonResp = contentType &&
+    contentType.indexOf('application/json') == 0 &&
+    JSON.parse(xhr.responseText);
+
+  if (
+    jsonResp && (
+      xhr.status == 503 ? (
+        jsonResp.info == 'CONNECTION_LOST' &&
+        'server' in args.info && jsonResp.data.sid >= 0 &&
+        jsonResp.data.sid == args.info.server._id
+      ) : (
+        xhr.status == 428 &&
+        jsonResp.errormsg &&
+        jsonResp.errormsg == gettext('Connection to the server has been lost.')
+      )
+    )
+  ) {
+    if (
+      args.preHandleConnectionLost &&
+      typeof(args.preHandleConnectionLost) == 'function'
+    ) {
+      args.preHandleConnectionLost.apply(this, arguments);
+    }
+
+    // Check the status of the maintenance server connection.
+    var server = pgBrowser.Nodes['server'],
+      ctx = {
+        resp: jsonResp,
+        xhr: xhr,
+        args: args,
+      },
+      reconnectServer = function() {
+        var ctx_local = this,
+          onServerConnect = function(_sid, _i, _d) {
+            // Yay - server is reconnected.
+            if (this.args.info.server._id == _sid) {
+              pgBrowser.Events.off(
+                'pgadmin:server:connected', onServerConnect
+              );
+              pgBrowser.Events.off(
+                'pgadmin:server:connect:cancelled', onConnectCancel
+              );
+
+              // Do we need to connect the disconnected server now?
+              if (
+                this.resp.data.database &&
+                this.resp.data.database != _d.db
+              ) {
+                // Server is connected now, we will need to inform the
+                // database to connect it now.
+                pgBrowser.Events.trigger(
+                  'pgadmin:database:connection:lost', this.args.item,
+                  this.resp, true
+                );
+              }
+            }
+          }.bind(ctx_local),
+          onConnectCancel = function(_sid, _item, _data) {
+            // User has cancelled the operation in between.
+            if (_sid == this.args.info.server.id) {
+              pgBrowser.Events.off('pgadmin:server:connected', onServerConnect);
+              pgBrowser.Events.off('pgadmin:server:connect:cancelled', onConnectCancel);
+
+              // Connection to the database will also be cancelled
+              pgBrowser.Events.trigger(
+                'pgadmin:database:connect:cancelled', _sid,
+                this.resp.data.database || _data.db, _item, _data
+              );
+            }
+          }.bind(ctx_local);
+
+        pgBrowser.Events.on('pgadmin:server:connected', onServerConnect);
+        pgBrowser.Events.on('pgadmin:server:connect:cancelled', onConnectCancel);
+
+        // Connection to the server has been lost, we need to inform the
+        // server first to take the action first.
+        pgBrowser.Events.trigger(
+          'pgadmin:server:connection:lost', this.args.item, this.resp
+        );
+      }.bind(ctx);
+
+    $.ajax({
+      url: server.generate_url(
+        null, 'connect', args.info.server, true, args.info
+      ),
+      dataType: 'json',
+    })
+      .done(function(res) {
+        if (res.success && 'connected' in res.data) {
+          if (res.data.connected) {
+          // Server is connected, but - the connection with the
+          // particular database has been lost.
+            pgBrowser.Events.trigger(
+              'pgadmin:database:connection:lost', args.item, jsonResp
+            );
+            return;
+          }
+        }
+
+        // Server was not connected, we should first try to connect
+        // the server.
+        reconnectServer();
+      })
+      .fail(function() {
+        reconnectServer();
+      });
+    return true;
+  } else if (jsonResp && jsonResp.info == 'CRYPTKEY_MISSING' && xhr.status == 503) {
+    /* Suppress the error here and handle in pgNotifier wherever
+     * required, as it has callback option
+     */
+    return false;
+  }
+  return false;
+}
diff --git a/web/pgadmin/static/scss/_alert.scss b/web/pgadmin/static/scss/_alert.scss
index 537675c7f..178171d1f 100644
--- a/web/pgadmin/static/scss/_alert.scss
+++ b/web/pgadmin/static/scss/_alert.scss
@@ -87,13 +87,6 @@
     }
   }
 }
-.alertify_tools_dialog_properties .pg-prop-status-bar {
-  position: absolute;
-  right: 0;
-  left: 0;
-  bottom: 0;
-  z-index: 1;
-}
 
 .error-in-grid {
     border-radius: $border-radius !important;
diff --git a/web/pgadmin/static/scss/_alertify.overrides.scss b/web/pgadmin/static/scss/_alertify.overrides.scss
deleted file mode 100644
index b2392adf2..000000000
--- a/web/pgadmin/static/scss/_alertify.overrides.scss
+++ /dev/null
@@ -1,303 +0,0 @@
-/* Overrides alertify js headers */
-.alertify {
-  z-index: 3000;
-  position: fixed;
-
-  .ajs-header {
-    padding: 6px 10px !important;
-    //margin is calculated with -$alertify-borderremove-margin, adjust the header
-    min-height: $title-height + $alertify-borderremove-margin !important;
-    max-height: $title-height + $alertify-borderremove-margin !important;
-    background-color: $alert-header-bg;
-    font-size: $font-size-base;
-    font-weight: bold;
-    color: $alert-header-fg;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    border-radius: 0rem;
-    border-top-left-radius: $panel-border-radius;
-    border-top-right-radius: $panel-border-radius;
-    border-bottom: none;
-    margin: -24px - $alertify-borderremove-margin; //-24px is default by alertify
-    margin-bottom: 0px;
-    &:hover {
-      background-color: $alert-header-bg;
-    }
-  }
-
-  .ajs-body {
-    background-color: $alert-dialog-body-bg !important;
-    color: $color-fg !important;
-  }
-
-  &.ajs-resizable,
-  &.ajs-maximized {
-    & .ajs-body {
-      & .ajs-content {
-        top: $title-height;
-      }
-    }
-
-    & .ajs-header{
-      //default is 0, to override the borders
-      margin: -$alertify-borderremove-margin;
-    }
-
-    & .ajs-handle {
-      z-index: 1020;
-    }
-  }
-
-  &.ajs-frameless {
-    & .ajs-body {
-      & .ajs-content {
-        top: 0 !important;
-        bottom: 0px !important;
-        padding: 0px;
-      }
-    }
-  }
-  &:not(.ajs-frameless) .ajs-body .ajs-content {
-    top: $title-height !important;
-  }
-  .ajs-body .ajs-content {
-    bottom: $footer-height-calc !important;
-  }
-  .ajs-wrap-text {
-    word-break: normal;
-    word-wrap: break-word;
-  }
-  /* Removes padding from alertify footer */
-  .ajs-footer {
-    padding: 0;
-    min-height: $footer-min-height;
-    border-top: $panel-border;
-    background-color: $color-bg !important;
-    color: $color-fg !important;
-    & .ajs-buttons {
-      border: none;
-      border-radius: 0rem;
-      border-bottom-left-radius: $panel-border-radius;
-      border-bottom-right-radius: $panel-border-radius;
-      padding: $footer-padding;
-
-      &.ajs-auxiliary .ajs-button,
-      &.ajs-primary .ajs-button {
-        margin: 0px 2px;
-      }
-
-      & .ajs-button {
-        font-family: $font-family-primary;
-        font-size: $font-size-base;
-        -webkit-font-smoothing: auto;
-        min-width: 0;
-        min-height: 0;
-      }
-    }
-  }
-
-  .ajs-commands {
-    margin: -22px 4px 0 0;
-  }
-
-  /* Replaces alertify button icons */
-  .ajs-commands button {
-    margin-left: 5px;
-  }
-
-  /* Prevent text blur in the runtime */
-  .ajs-dimmer,
-  .ajs-modal {
-    -webkit-transform: none;
-  }
-
-  .ajs-commands button.ajs-maximize {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAZklEQVQ4jcWTuw2AMAxEn5jBs7B/e0gpmAiKEGRS5QDBSS7v+Q8fSsCWQgDTA+DsGgJYuypumTNkWCWZg9q/HIAOSDim/xTUcu0exXXaxQG0teRVWQPLx2Gbe8B55yNqv7C4GV/TDq//J11odoZgAAAAAElFTkSuQmCC);
-    background-size: 14px;
-  }
-
-  .ajs-commands button.ajs-close {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAdklEQVQ4jd2SwQnAIAxF36GH0pOTFHEgF3IkR5LO0F4SCGJVEHroAy/f/E+igV+yAa6hO7nrcgAZuIBg9CBalppXEnDL0RA1q556ASdQqhBrLlLTxVch1uxHZiU2AuKs2Vdt23GGHSy/wfIvzOzBPhpjaRO/5wG/szevJ+ZXzAAAAABJRU5ErkJggg==);
-  }
-
-  /* Restyling alertify dialogue panel boundaries */
-  .ajs-dialog {
-    border: $panel-border;
-    border-radius: $panel-border-radius;
-    box-shadow: $dialog-box-shadow;
-    background-color: $alert-dialog-body-bg !important;
-    color: $color-fg !important;
-  }
-  .ajs-content {
-    padding-left: 0 !important;
-    padding-right: 0 !important;
-  }
-}
-
-.alertify.ajs-maximized .ajs-commands,
-.alertify.ajs-resizable .ajs-commands {
-  margin: 2px 0px 0 0;
-}
-
-.ajs-commands {
-  position: absolute;
-  width: auto !important;
-}
-
-.ajs-pin, .ajs-maximize, .ajs-close {
-  width: 20px;
-  height: 20px;
-  border: $input-btn-border-width solid $btn-secondary-border !important;
-  background-color: $alert-action-bg !important;
-  font-size: 12px;
-  border-radius: $btn-border-radius;
-  position: relative;
-  cursor: pointer;
-  text-align: center;
-  overflow: hidden;
-  z-index: 1;
-}
-
-.ajs-pin:hover, .ajs-maximize:hover, .ajs-close:hover {
-  background-color: $alert-action-hover-bg !important;
-}
-
-.alertify.ajs-modeless.ajs-pinnable .ajs-commands button.ajs-pin {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAkElEQVQ4jWNkwAR8DAwMBxkYGMTQxF8xMDDYMzAwfMKiBwMYMDAw3GRgYPgPxTehYiSBKCQDonApYiLV1KFjABsDA4MpEt8UKkYUkGBgYDjPgAhAGD4PlSPooqNYNMPwUXRXM+IwBAbaoXQlktg/ZMUsWAxAVvASmyZCBiCDNwTkCRrwasANIOgFQoADinECAAtnIEoWoODLAAAAAElFTkSuQmCC);
-  background-size: 13px;
-}
-
-.alertify.ajs-maximized .ajs-commands button.ajs-maximize {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA8klEQVQ4jZ3QMUpDQRCH8V+ewULQE4iERTyCrQiDCpbaCKKljbV4A89gqVgGrCMDWlpaWwVPoFYiIjYv8hBJXjLN7s7u9+3wZ4aKiOWI2IJOi8dHuM7MXxj3WMHe3CRBKeUGvVJKllJG8CrmoNty6jMsYKeGoY/jtgI4bez7OMjMr2oKwaieRzDMIljDRUSgXQZPeG2cv7GOffQ7ETGPcyw2HozWQWY+jLN3M/MzIu4wwNKf+zeMFVSQmY/YbfzeuiqIiAonZgi1quErHNa9F7xPM8FlAx5iA9ttJRVu8VHDm5k5rDNpLRERWxHR+6c/MZMfLIJDwzY66IkAAAAASUVORK5CYII=);
-}
-
-/* Restyling alertify query results messages */
-.alertify-notifier.ajs-right {
-  min-width: 250px;
-  width: auto;
-  width: initial;
-  max-width: 800px;
-}
-
-.alertify-notifier.ajs-right .ajs-message.ajs-visible {
-  padding: 0;
-  right: 0;
-  width: auto;
-  width: initial;
-}
-
-.alertify-notifier .ajs-message {
-  border-radius: $card-border-radius;
-  width: 100%;
-}
-
-.pg-alertify-button:before {
-  font-size: $font-size-base;
-  @at-root .ajs-button#{&} {
-    font-family: $font-family-icon;
-    margin-right: 5px;
-    font-weight: 900;
-  }
-}
-
-.pg-alertify-icon-button {
-  &:before {
-    line-height: 1.2;
-    font-family: $font-family-icon;
-    font-weight: 900;
-  }
-}
-
-.ajs-text-smoothing {
-  text-shadow: none;
-  -webkit-font-smoothing: antialiased;
-}
-
-.ajs-message.ajs-error.ajs-visible {
-  background: $alert-danger-bg;
-  border: $border-width solid $alert-danger-color;
-  color: $alert-danger-color;
-  @extend .ajs-text-smoothing;
-}
-
-.ajs-message.ajs-success.ajs-visible {
-  background: $alert-success-bg;
-  border: $border-width solid $alert-success-color;
-  color: $alert-success-color;
-  @extend .ajs-text-smoothing;
-}
-
-.ajs-message.ajs-warning.ajs-visible {
-  background: $alert-warning-bg;
-  border: $border-width solid $alert-warning-color;
-  color: $alert-warning-color;
-  @extend .ajs-text-smoothing;
-}
-
-.ajs-message.ajs-visible {
-  background: $alert-primary-bg;
-  border: $border-width solid $alert-primary-color;
-  color: $alert-primary-color;
-  @extend .ajs-text-smoothing;
-}
-
-.ajs-message > .media > .media-body.media-middle {
-  display: flex;
-}
-
-.alertify .ajs-dimmer {
-  background-color: $loading-bg;
-}
-
-/* It sometimes is applied to dialog and blocks the dialog from editing */
-.alertify .ajs-dialog.ajs-capture:before {
-  display: none;
-}
-
-.alertify-no-animation {
-  .alertify .ajs-dimmer,
-  .alertify .ajs-modal,
-  .alertify-notifier,
-  .alertify-notifier .ajs-message.ajs-visible,
-  .alertify-notifier .ajs-message,
-  .alertify-notifier.ajs-center .ajs-message.ajs-visible,
-  .alertify-notifier.ajs-center .ajs-message
-  {
-    -moz-transition: none;
-    -webkit-transition: none;
-    -o-transition: none;
-    transition: none;
-    -webkit-transform: none;
-    transform: none;
-  }
-
-  .alertify.ajs-zoom.ajs-in:not(.ajs-hidden) .ajs-dialog {
-    -webkit-animation-name: ajs-noanimate;
-    animation-name: ajs-noanimate;
-  }
-  .alertify.ajs-zoom.ajs-out.ajs-hidden .ajs-dialog {
-    -webkit-animation-name: ajs-noanimate;
-    animation-name: ajs-noanimate;
-  }
-
-  @-webkit-keyframes ajs-noanimate {
-    -webkit-transform: none;
-    transform: none;
-  }
-  @keyframes ajs-noanimate {
-    -webkit-transform: none;
-    transform: none;
-  }
-}
-
-.alert-text-body {
-  color: $alert-color-fg;
-}
-
-.ajs-commands, .ajs-close {
-  button {
-    @extend .btn-secondary;
-    outline: none !important;
-  }
-}
diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss
index f2fe85be7..14816ad21 100644
--- a/web/pgadmin/static/scss/_pgadmin.style.scss
+++ b/web/pgadmin/static/scss/_pgadmin.style.scss
@@ -130,15 +130,6 @@
 .opacity-5 {
   opacity: 0.5;  }
 
-.alertify .ajs-header,
-.alertify .ajs-body {
-  font-family: $font-family-primary;
-}
-
-.alertify .ajs-body {
-  min-height: $footer-height-calc*1.5;
-}
-
 .pg-navbar {
   font-size: $navbar-font-size;
   background-color: $navbar-bg;
diff --git a/web/pgadmin/static/scss/pgadmin.scss b/web/pgadmin/static/scss/pgadmin.scss
index 2abb70f11..e98c58344 100644
--- a/web/pgadmin/static/scss/pgadmin.scss
+++ b/web/pgadmin/static/scss/pgadmin.scss
@@ -25,7 +25,6 @@ $theme-colors: (
 @import 'select2.overrides';
 @import 'codemirror.overrides';
 @import 'alert';
-@import 'alertify.overrides';
 @import 'backform.overrides';
 @import 'pgadmin.grid';
 @import 'pgadmin.style';
diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss
index dec233aac..a44e0fbdc 100644
--- a/web/pgadmin/static/scss/resources/_default.variables.scss
+++ b/web/pgadmin/static/scss/resources/_default.variables.scss
@@ -274,7 +274,6 @@ $alert-header-bg: $color-primary !default;
 $alert-header-fg: $white !default;
 $alert-action-bg: $color-secondary !default;
 $alert-action-hover-bg: $color-gray-light !default;
-$alertify-borderremove-margin: $panel-border-width;
 $alert-color-fg: $color-fg !default;
 $alert-dialog-body-bg: $color-bg !default;
 
diff --git a/web/pgadmin/tools/backup/static/js/backup.js b/web/pgadmin/tools/backup/static/js/backup.js
index ca2642fbe..91b2f06a4 100644
--- a/web/pgadmin/tools/backup/static/js/backup.js
+++ b/web/pgadmin/tools/backup/static/js/backup.js
@@ -16,11 +16,11 @@ import {retrieveAncestorOfTypeServer} from 'sources/tree/tree_utils';
 
 // Backup dialog
 define([
-  'sources/gettext', 'sources/url_for', 'underscore', 'pgadmin.browser',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'tools/backup/static/js/menu_utils',
   'sources/nodes/supported_database_node',
 ], function(
-  gettext, url_for, _, pgBrowser, menuUtils, supportedNodes
+  gettext, url_for, pgBrowser, menuUtils, supportedNodes
 ) {
 
   // if module is already initialized, refer to that.
@@ -307,10 +307,6 @@ define([
         if (nodeData._type === 'table' || nodeData._type === 'partition') {
           extraData['tables'] = [[treeInfo.schema._label, nodeData._label]];
         }
-
-        /*(if (_.isEmpty(this.view.model.get('ratio'))) {
-          this.view.model.unset('ratio');
-        }*/
       } else if(typeOfDialog === 'server') {
         extraData['type'] = 'server';
       } else if(typeOfDialog === 'globals') {
diff --git a/web/pgadmin/tools/debugger/static/js/DebuggerModule.js b/web/pgadmin/tools/debugger/static/js/DebuggerModule.js
index 68ef75bfa..332474e9c 100644
--- a/web/pgadmin/tools/debugger/static/js/DebuggerModule.js
+++ b/web/pgadmin/tools/debugger/static/js/DebuggerModule.js
@@ -8,7 +8,7 @@
 //////////////////////////////////////////////////////////////
 
 import $ from 'jquery';
-
+import _ from 'lodash';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
@@ -282,7 +282,7 @@ export default class DebuggerModule {
     _.each(
       _.sortBy(
         _.values(
-          _.pick(treeInfo,
+          _.pickBy(treeInfo,
             function (v, k) {
               return (k != 'server_group');
             })
@@ -343,7 +343,7 @@ export default class DebuggerModule {
     }
     return db_label;
   }
-  
+
   getTreeNodeData(item) {
     let t = this.pgBrowser.tree,
       i = item || t.selected(),
diff --git a/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx b/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx
index 16daa8b7e..fbfaf6e9f 100644
--- a/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx
+++ b/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx
@@ -81,14 +81,14 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
   const wcDocker = window.wcDocker;
 
   function getURL() {
-    var _Url = null;
+    let _Url = null;
 
     if (restartDebug == 0) {
 
       if (!pgData)
         return;
 
-      var treeInfo = pgTreeInfo;
+      let treeInfo = pgTreeInfo;
 
       if (pgData._type == 'function') {
         // Get the existing function parameters available from sqlite database
@@ -156,7 +156,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
   function checkModesAndTypes() {
     // Check modes and type in the arguments.
     if (debuggerInfo['proargmodes'] != null) {
-      var argmodes = debuggerInfo['proargmodes'].split(',');
+      let argmodes = debuggerInfo['proargmodes'].split(',');
       argmodes.forEach((NULL, indx) => {
         if (argmodes[indx] == 'i' || argmodes[indx] == 'b' ||
           (isEdbProc && argmodes[indx] == 'o')) {
@@ -164,7 +164,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
         }
       });
     } else {
-      var argtypes = debuggerInfo['proargtypenames'].split(',');
+      let argtypes = debuggerInfo['proargtypenames'].split(',');
       argtypes.forEach((NULL, indx) => {
         InputArgIds.current.push(indx);
       });
@@ -224,7 +224,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
   }
 
   function getArgsList(argType, argMode, defValList, argName, useDefValue) {
-    var myObj = [];
+    let myObj = [];
     if (argType.length != 0) {
       for (let i = 0; i < argType.length; i++) {
         if (debuggerInfo['proargmodes'] != null) {
@@ -379,15 +379,15 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
     })
       .then(function (res) {
         funcArgsData = setArgs(res);
-        var argName;
+        let argName;
 
-        var defValList = [];
-        var myObj = [];
-        var funcObj = [];
+        let defValList = [];
+        let myObj = [];
+        let funcObj = [];
 
-        var [argType, argMode, argCnt, defaultArgs] = checkModesAndTypes();
+        let [argType, argMode, argCnt, defaultArgs] = checkModesAndTypes();
 
-        var useDefValue;
+        let useDefValue;
 
         if (debuggerInfo['proargnames'] != null) {
           argName = debuggerInfo['proargnames'].split(',');
@@ -405,7 +405,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
         else {
           /* Generate the name parameter if function do not have arguments name
           like dbgparam1, dbgparam2 etc. */
-          var myargname = generateArgsNames(argType);
+          let myargname = generateArgsNames(argType);
 
           // If there is no default arguments
           if (!debuggerInfo['pronargdefaults']) {
@@ -547,7 +547,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
     }
   }
   function getFunctionID(d, treeInfo) {
-    var functionId;
+    let functionId;
     if (d._type == 'function') {
       functionId = treeInfo.function._id;
     } else if (d._type == 'procedure') {
@@ -562,7 +562,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
 
   function setSqliteFuncArgs(d, treeInfo, arg, intCount, sqliteFuncArgsList) {
     if (restartDebug == 0) {
-      var functionId = getFunctionID(d, treeInfo);
+      let functionId = getFunctionID(d, treeInfo);
       // Below will format the data to be stored in sqlite database
       sqliteFuncArgsList.push({
         'server_id': treeInfo.server._id,
@@ -596,7 +596,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
   }
 
   function checkTypeAndGetUrl(d, treeInfo) {
-    var baseUrl;
+    let baseUrl;
     if (d && d._type == 'function') {
       baseUrl = url_for('debugger.initialize_target_for_function', {
         'debug_type': 'direct',
@@ -639,7 +639,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
   }
 
   function getSetArgsUrl(d, treeInfo) {
-    var baseUrl;
+    let baseUrl;
     if (d._type == 'function') {
       baseUrl = url_for('debugger.set_arguments', {
         'sid': treeInfo.server._id,
@@ -680,12 +680,12 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
     try {
       /* Initialize the target once the debug button is clicked and create asynchronous connection
         and unique transaction ID If the debugging is started again then treeInfo is already stored. */
-      var treeInfo = pgTreeInfo;
+      let treeInfo = pgTreeInfo;
       if (!pgData) return;
 
-      var argsValueList = [];
-      var sqliteFuncArgsList = [];
-      var intCount = 0;
+      let argsValueList = [];
+      let sqliteFuncArgsList = [];
+      let intCount = 0;
 
       let argsList = [];
       let argSet = [];
@@ -698,7 +698,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
         intCount = intCount + 1;
       });
 
-      var baseUrl;
+      let baseUrl;
 
       /* If debugging is not started again then we should initialize the target otherwise not */
       if (restartDebug == 0) {
@@ -711,14 +711,14 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
         })
           .then(function (res_post) {
 
-            var url = url_for(
+            let url = url_for(
               'debugger.direct', {
                 'trans_id': res_post.data.data.debuggerTransId,
               }
             );
 
-            var browserPreferences = pgAdmin.Browser.get_preferences_for_module('browser');
-            var open_new_tab = browserPreferences.new_browser_tab_open;
+            let browserPreferences = pgAdmin.Browser.get_preferences_for_module('browser');
+            let open_new_tab = browserPreferences.new_browser_tab_open;
             if (open_new_tab && open_new_tab.includes('debugger')) {
               window.open(url, '_blank');
               // Send the signal to runtime, so that proper zoom level will be set.
@@ -733,18 +733,18 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
                 });
 
               // Create the debugger panel as per the data received from user input dialog.
-              var propertiesPanel = pgAdmin.Browser.docker.findPanels('properties');
-              var panel = pgAdmin.Browser.docker.addPanel(
+              let propertiesPanel = pgAdmin.Browser.docker.findPanels('properties');
+              let panel = pgAdmin.Browser.docker.addPanel(
                 'frm_debugger', wcDocker.DOCK.STACKED, propertiesPanel[0]
               );
-              var browser_pref = pgAdmin.Browser.get_preferences_for_module('browser');
-              var label = getAppropriateLabel(treeInfo);
+              let browser_pref = pgAdmin.Browser.get_preferences_for_module('browser');
+              let label = getAppropriateLabel(treeInfo);
               setDebuggerTitle(panel, browser_pref, label, treeInfo.schema.label, treeInfo.database.label, null, pgAdmin.Browser);
               panel.focus();
 
               // Panel Closed event
               panel.on(wcDocker.EVENT.CLOSED, function () {
-                var closeUrl = url_for('debugger.close', {
+                let closeUrl = url_for('debugger.close', {
                   'trans_id': res_post.data.data.debuggerTransId,
                 });
                 api({
@@ -761,7 +761,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
               });
             }
 
-            var _url = getSetArgsUrl(pgData, treeInfo);
+            let _url = getSetArgsUrl(pgData, treeInfo);
 
             api({
               url: _url,
@@ -814,7 +814,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
           });
         setLoaderText('');
         // Set the new input arguments given by the user during debugging
-        var _Url = url_for('debugger.set_arguments', {
+        let _Url = url_for('debugger.set_arguments', {
           'sid': debuggerInfo.server_id,
           'did': debuggerInfo.database_id,
           'scid': debuggerInfo.schema_id,
diff --git a/web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx b/web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx
index 826609ecc..6173a9a37 100644
--- a/web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx
+++ b/web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx
@@ -85,10 +85,10 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
 
   // Function to get the breakpoint information from the server
   const getBreakpointInformation = (transId, callBackFunc) => {
-    var result = '';
+    let result = '';
 
     // Make ajax call to listen the database message
-    var baseUrl = url_for('debugger.execute_query', {
+    let baseUrl = url_for('debugger.execute_query', {
       'trans_id': transId,
       'query_type': 'get_breakpoints',
     });
@@ -112,16 +112,16 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
   };
 
   const clearAllBreakpoint = (transId) => {
-    var clearBreakpoint = (br_list) => {
+    let clearBreakpoint = (br_list) => {
       // If there is no break point to clear then we should return from here.
       if ((br_list.length == 1) && (br_list[0].linenumber == -1))
         return;
 
       disableToolbarButtons();
-      var breakpoint_list = getBreakpointList(br_list);
+      let breakpoint_list = getBreakpointList(br_list);
 
       // Make ajax call to listen the database message
-      var baseUrl = url_for('debugger.clear_all_breakpoint', {
+      let baseUrl = url_for('debugger.clear_all_breakpoint', {
         'trans_id': transId,
       });
 
@@ -146,7 +146,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
 
   const raiseJSONError = (xhr) => {
     try {
-      var err = xhr.response.data;
+      let err = xhr.response.data;
       if (err.success == 0) {
         Notify.alert(gettext('Debugger Error'), err.errormsg, () => {
           if (panel) {
@@ -187,7 +187,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
 
   const messages = (transId) => {
     // Make ajax call to listen the database message
-    var baseUrl = url_for('debugger.messages', {
+    let baseUrl = url_for('debugger.messages', {
       'trans_id': transId,
     });
 
@@ -221,7 +221,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
 
   const startExecution = (transId, port_num) => {
     // Make ajax call to listen the database message
-    var baseUrl = url_for(
+    let baseUrl = url_for(
       'debugger.start_execution', {
         'trans_id': transId,
         'port_num': port_num,
@@ -251,7 +251,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
 
   const executeQuery = (transId) => {
     // Make ajax call to listen the database message
-    var baseUrl = url_for(
+    let baseUrl = url_for(
       'debugger.execute_query', {
         'trans_id': transId,
         'query_type': 'wait_for_breakpoint',
@@ -318,7 +318,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
 
   const selectFrame = (frameId) => {
     // Make ajax call to listen the database message
-    var baseUrl = url_for('debugger.select_frame', {
+    let baseUrl = url_for('debugger.select_frame', {
       'trans_id': params.transId,
       'frame_id': frameId,
     });
@@ -342,7 +342,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
   };
 
   useEffect(() => {
-    var baseUrl = '';
+    let baseUrl = '';
     if (params.transId != undefined && !params.directDebugger.debug_type) {
       // Make ajax call to execute the and start the target for execution
       baseUrl = url_for('debugger.start_listener', {
@@ -382,7 +382,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
   const setUnsetBreakpoint = (res, breakpoint_list) => {
     if (res.data.data.status) {
       for (let brk_val of breakpoint_list) {
-        var info = editor.current.lineInfo((brk_val - 1));
+        let info = editor.current.lineInfo((brk_val - 1));
 
         if (info) {
           if (info.gutterMarkers != undefined) {
@@ -394,16 +394,16 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
   };
 
   const triggerClearBreakpoint = () => {
-    var clearBreakpoint = (br_list) => {
+    let clearBreakpoint = (br_list) => {
       // If there is no break point to clear then we should return from here.
       if ((br_list.length == 1) && (br_list[0].linenumber == -1))
         return;
 
       disableToolbarButtons();
-      var breakpoint_list = getBreakpointList(br_list);
+      let breakpoint_list = getBreakpointList(br_list);
 
       // Make ajax call to listen the database message
-      var _baseUrl = url_for('debugger.clear_all_breakpoint', {
+      let _baseUrl = url_for('debugger.clear_all_breakpoint', {
         'trans_id': params.transId,
       });
 
@@ -421,7 +421,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
         .catch(raiseClearBrekpointError);
     };
     // Make ajax call to listen the database message
-    var baseUrl = url_for('debugger.execute_query', {
+    let baseUrl = url_for('debugger.execute_query', {
       'trans_id': params.transId,
       'query_type': 'get_breakpoints',
     });
@@ -442,7 +442,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
   };
 
   const debuggerMark = () => {
-    var marker = document.createElement('div');
+    let marker = document.createElement('div');
     marker.style.color = '#822';
     marker.innerHTML = '●';
     return marker;
@@ -450,8 +450,8 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
 
   const triggerToggleBreakpoint = () => {
     disableToolbarButtons();
-    var info = editor.current.lineInfo(editor.current.activeLineNo);
-    var baseUrl = '';
+    let info = editor.current.lineInfo(editor.current.activeLineNo);
+    let baseUrl = '';
 
     // If gutterMarker is undefined that means there is no marker defined previously
     // So we need to set the breakpoint command here...
@@ -476,7 +476,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
       .then(function (res) {
         if (res.data.data.status) {
           // Call function to create and update local variables ....
-          var info_local = editor.current.lineInfo(editor.current.activeLineNo);
+          let info_local = editor.current.lineInfo(editor.current.activeLineNo);
 
           if (info_local.gutterMarkers != undefined) {
             editor.current.setGutterMarker(editor.current.activeLineNo, 'breakpoints', null);
@@ -503,7 +503,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
   const stopDebugging = () => {
     disableToolbarButtons();
     // Make ajax call to listen the database message
-    var baseUrl = url_for(
+    let baseUrl = url_for(
       'debugger.execute_query', {
         'trans_id': params.transId,
         'query_type': 'abort_target',
@@ -526,7 +526,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
           // We will give same behaviour as pgAdmin3 and disable all buttons
           disableToolbarButtons();
 
-          // Set the Alertify message to inform the user that execution
+          // Set the message to inform the user that execution
           // is completed.
           Notify.success(res.data.info, 3000);
         } else if (res.data.data.status === 'NotConnected') {
@@ -545,7 +545,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
   };
 
   const restart = (transId) => {
-    var baseUrl = url_for('debugger.restart', { 'trans_id': transId });
+    let baseUrl = url_for('debugger.restart', { 'trans_id': transId });
     disableToolbarButtons();
 
     api({
@@ -553,7 +553,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
     })
       .then(function (res) {
         // Restart the same function debugging with previous arguments
-        var restart_dbg = res.data.data.restart_debug ? 1 : 0;
+        let restart_dbg = res.data.data.restart_debug ? 1 : 0;
 
         // Start pooling again
         params.directDebugger.polling_timeout_idle = false;
@@ -654,7 +654,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
       params.directDebugger.direct_execution_completed = true;
       params.directDebugger.polling_timeout_idle = true;
 
-      //Set the alertify message to inform the user that execution is completed.
+      //Set the message to inform the user that execution is completed.
       Notify.success(res.data.info, 3000);
 
       // Update the message tab of the debugger
@@ -683,7 +683,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
     }
 
     // Make ajax call to listen the database message
-    var baseUrl = url_for('debugger.poll_end_execution_result', {
+    let baseUrl = url_for('debugger.poll_end_execution_result', {
         'trans_id': transId,
       }),
       poll_end_timeout;
@@ -721,7 +721,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
                 params.directDebugger.direct_execution_completed = true;
                 params.directDebugger.polling_timeout_idle = true;
 
-                //Set the alertify message to inform the user that execution is completed.
+                //Set the message to inform the user that execution is completed.
                 Notify.success(res.data.info, 3000);
 
                 // Update the message tab of the debugger
@@ -775,7 +775,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
       restart(params.transId);
     } else {
       // Make ajax call to listen the database message
-      var baseUrl = url_for('debugger.execute_query', {
+      let baseUrl = url_for('debugger.execute_query', {
         'trans_id': params.transId,
         'query_type': 'continue',
       });
@@ -806,7 +806,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
     disableToolbarButtons();
 
     // Make ajax call to listen the database message
-    var baseUrl = url_for('debugger.execute_query', {
+    let baseUrl = url_for('debugger.execute_query', {
       'trans_id': params.transId,
       'query_type': 'step_over',
     });
@@ -834,7 +834,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
   };
 
   const getBreakpointList = (br_list) => {
-    var breakpoint_list = new Array();
+    let breakpoint_list = new Array();
     for (let val of br_list) {
       if (val.linenumber != -1) {
         breakpoint_list.push(val.linenumber);
@@ -847,16 +847,16 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
   // Function to get the latest breakpoint information and update the
   // gutters of codemirror
   const updateBreakpoint = (transId, updateLocalVar = false) => {
-    var callBackFunc = (br_list) => {
+    let callBackFunc = (br_list) => {
       // If there is no break point to clear then we should return from here.
       if ((br_list.length == 1) && (br_list[0].linenumber == -1))
         return;
 
-      var breakpoint_list = getBreakpointList(br_list);
+      let breakpoint_list = getBreakpointList(br_list);
 
 
       for (let brk_val of breakpoint_list) {
-        var info = editor.current.lineInfo((brk_val - 1));
+        let info = editor.current.lineInfo((brk_val - 1));
 
         if (info.gutterMarkers != undefined) {
           editor.current.setGutterMarker((brk_val - 1), 'breakpoints', null);
@@ -875,7 +875,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
   // Get the local variable information of the functions and update the grid
   const getLocalVariables = (transId) => {
     // Make ajax call to listen the database message
-    var baseUrl = url_for(
+    let baseUrl = url_for(
       'debugger.execute_query', {
         'trans_id': transId,
         'query_type': 'get_variables',
@@ -922,7 +922,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
 
   const getStackInformation = (transId) => {
     // Make ajax call to listen the database message
-    var baseUrl = url_for(
+    let baseUrl = url_for(
       'debugger.execute_query', {
         'trans_id': transId,
         'query_type': 'get_stack_info',
@@ -1010,7 +1010,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
     }
 
     // Make ajax call to listen the database message
-    var baseUrl = url_for('debugger.poll_result', {
+    let baseUrl = url_for('debugger.poll_result', {
         'trans_id': transId,
       }),
       poll_timeout;
@@ -1067,7 +1067,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
   const stepInto = () => {
     disableToolbarButtons();
     // Make ajax call to listen the database message
-    var baseUrl = url_for('debugger.execute_query', {
+    let baseUrl = url_for('debugger.execute_query', {
       'trans_id': params.transId,
       'query_type': 'step_into',
     });
@@ -1096,7 +1096,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
 
   const onChangesLocalVarParameters = (data) => {
     // Make api call to listen the database message
-    var baseUrl = url_for('debugger.deposit_value', {
+    let baseUrl = url_for('debugger.deposit_value', {
       'trans_id': params.transId,
     });
     api({
diff --git a/web/pgadmin/tools/debugger/static/js/components/DebuggerEditor.jsx b/web/pgadmin/tools/debugger/static/js/components/DebuggerEditor.jsx
index 3d236c1a3..95fc346a2 100644
--- a/web/pgadmin/tools/debugger/static/js/components/DebuggerEditor.jsx
+++ b/web/pgadmin/tools/debugger/static/js/components/DebuggerEditor.jsx
@@ -36,7 +36,7 @@ export default function DebuggerEditor({ getEditor, params }) {
   const api = getApiInstance();
 
   function makeMarker() {
-    var marker = document.createElement('div');
+    let marker = document.createElement('div');
     marker.style.color = '#822';
     marker.innerHTML = '●';
     return marker;
@@ -44,7 +44,7 @@ export default function DebuggerEditor({ getEditor, params }) {
 
   function setBreakpoint(lineNo, setType) {
     // Make ajax call to set/clear the break point by user
-    var baseUrl = url_for('debugger.set_breakpoint', {
+    let baseUrl = url_for('debugger.set_breakpoint', {
       'trans_id': params.transId,
       'line_no': lineNo,
       'set_type': setType,
@@ -69,7 +69,7 @@ export default function DebuggerEditor({ getEditor, params }) {
   function onBreakPoint(cm, n, gutter) {
     // If breakpoint gutter is clicked and execution is not completed then only set the breakpoint
     if (gutter == 'breakpoints' && !params.debuggerDirect.polling_timeout_idle) {
-      var info = cm.lineInfo(n);
+      let info = cm.lineInfo(n);
       // If gutterMarker is undefined that means there is no marker defined previously
       // So we need to set the breakpoint command here...
       if (info.gutterMarkers == undefined) {
@@ -84,7 +84,7 @@ export default function DebuggerEditor({ getEditor, params }) {
 
       // If line folding is defined then gutterMarker will be defined so
       // we need to find out 'breakpoints' information
-      var markers = info.gutterMarkers;
+      let markers = info.gutterMarkers;
       if (markers != undefined && info.gutterMarkers.breakpoints == undefined)
         markers = info.gutterMarkers.breakpoints;
       cm.setGutterMarker(n, 'breakpoints', markers ? null : makeMarker());
diff --git a/web/pgadmin/tools/debugger/templates/debugger/direct.html b/web/pgadmin/tools/debugger/templates/debugger/direct.html
index 2a217aa59..318572bf7 100644
--- a/web/pgadmin/tools/debugger/templates/debugger/direct.html
+++ b/web/pgadmin/tools/debugger/templates/debugger/direct.html
@@ -47,10 +47,6 @@ try {
 {% if is_desktop_mode and is_linux %}
 <style>
     body
-    .alertify .ajs-dimmer,.alertify .ajs-modal{-webkit-transform: none;}
-    .alertify-notifier{-webkit-transform: none;}
-    .alertify-notifier .ajs-message{-webkit-transform: none;}
-    .alertify .ajs-dialog.ajs-shake{-webkit-animation-name: none;}
 </style>
 {% endif %}
 <div id="debugger-main-container" tabindex="0">
diff --git a/web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx b/web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx
index 116df9dda..48be677b8 100644
--- a/web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx
+++ b/web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx
@@ -565,7 +565,7 @@ class ERDTool extends React.Component {
     if(this.state.current_file && !isSaveAs) {
       this.saveFile(this.state.current_file);
     } else {
-      var params = {
+      let params = {
         'supported_types': ['*','pgerd'],
         'dialog_type': 'create_file',
         'dialog_title': 'Save File',
diff --git a/web/pgadmin/tools/erd/static/js/index.js b/web/pgadmin/tools/erd/static/js/index.js
index 71616c6c5..17976d75c 100644
--- a/web/pgadmin/tools/erd/static/js/index.js
+++ b/web/pgadmin/tools/erd/static/js/index.js
@@ -6,6 +6,7 @@
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
+
 import pgAdmin from 'sources/pgadmin';
 import pgBrowser from 'top/browser/static/js/browser';
 import 'pgadmin.tools.file_manager';
diff --git a/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx b/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx
index 9fedec760..6d9bea766 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx
+++ b/web/pgadmin/tools/grant_wizard/static/js/GrantWizard.jsx
@@ -60,7 +60,7 @@ const useStyles = makeStyles(() =>
 
 export default function GrantWizard({ sid, did, nodeInfo, nodeData, onClose }) {
   const classes = useStyles();
-  var columns = [
+  let columns = [
     {
 
       Header: 'Object Type',
@@ -112,7 +112,7 @@ export default function GrantWizard({ sid, did, nodeInfo, nodeData, onClose }) {
       isVisible: false
     }
   ];
-  var steps = [gettext('Object Selection'), gettext('Privilege Selection'), gettext('Review')];
+  let steps = [gettext('Object Selection'), gettext('Privilege Selection'), gettext('Review')];
   const [selectedObject, setSelectedObject] = React.useState([]);
   const [selectedAcl, setSelectedAcl] = React.useState({});
   const [msqlData, setSQL] = React.useState('');
@@ -125,7 +125,7 @@ export default function GrantWizard({ sid, did, nodeInfo, nodeData, onClose }) {
 
   const api = getApiInstance();
   const validatePrivilege = () => {
-    var isValid = true;
+    let isValid = true;
     selectedAcl.privilege.forEach((priv) => {
       if ((_.isUndefined(priv.grantee) || _.isUndefined(priv.privileges) || priv.privileges.length === 0) && isValid) {
         isValid = false;
@@ -153,10 +153,10 @@ export default function GrantWizard({ sid, did, nodeInfo, nodeData, onClose }) {
       setPrivOptions(res.data);
     });
 
-    var node_type = nodeData._type.replace('coll-', '').replace(
+    let node_type = nodeData._type.replace('coll-', '').replace(
       'materialized_', ''
     );
-    var _url = url_for(
+    let _url = url_for(
       'grant_wizard.objects', {
         'sid': encodeURI(sid),
         'did': encodeURI(did),
@@ -165,7 +165,7 @@ export default function GrantWizard({ sid, did, nodeInfo, nodeData, onClose }) {
       });
     api.get(_url)
       .then(res => {
-        var data = res.data.result;
+        let data = res.data.result;
         data.forEach(element => {
           if (element.icon)
             element['icon'] = {
@@ -189,12 +189,12 @@ export default function GrantWizard({ sid, did, nodeInfo, nodeData, onClose }) {
   const wizardStepChange = (data) => {
     if (data.currentStep == 2) {
       setLoaderText('Loading SQL ...');
-      var msql_url = url_for(
+      let msql_url = url_for(
         'grant_wizard.modified_sql', {
           'sid': encodeURI(sid),
           'did': encodeURI(did),
         });
-      var post_data = {
+      let post_data = {
         acl: selectedAcl.privilege,
         objects: selectedObject
       };
@@ -211,7 +211,7 @@ export default function GrantWizard({ sid, did, nodeInfo, nodeData, onClose }) {
 
   const onSave = () => {
     setLoaderText('Saving...');
-    var _url = url_for(
+    let _url = url_for(
       'grant_wizard.apply', {
         'sid': encodeURI(sid),
         'did': encodeURI(did),
@@ -244,12 +244,12 @@ export default function GrantWizard({ sid, did, nodeInfo, nodeData, onClose }) {
   };
 
   const getTableSelectedRows = (selRows) => {
-    var selObj = [];
-    var objectTypes = new Set();
+    let selObj = [];
+    let objectTypes = new Set();
     if (selRows.length > 0) {
 
       selRows.forEach((row) => {
-        var object_type = '';
+        let object_type = '';
         switch (row.values.object_type) {
         case 'Function':
           object_type = 'function';
@@ -286,7 +286,7 @@ export default function GrantWizard({ sid, did, nodeInfo, nodeData, onClose }) {
         selObj.push(row.values);
       });
     }
-    var privs = new Set();
+    let privs = new Set();
     objectTypes.forEach((objType) => {
       privOptions[objType]?.acl.forEach((priv) => {
         privs.add(priv);
diff --git a/web/pgadmin/tools/import_export/static/js/import_export.js b/web/pgadmin/tools/import_export/static/js/import_export.js
index b46626a10..918512977 100644
--- a/web/pgadmin/tools/import_export/static/js/import_export.js
+++ b/web/pgadmin/tools/import_export/static/js/import_export.js
@@ -147,7 +147,7 @@ define([
               res.data.errormsg
             );
           }else{
-            // Open the Alertify dialog for the import/export module
+            // Open the dialog for the import/export module
             pgBrowser.Node.registerUtilityPanel();
             var panel = pgBrowser.Node.addUtilityPanel(pgBrowser.stdW.md, pgBrowser.stdH.lg),
               j = panel.$container.find('.obj_properties').first();
diff --git a/web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx b/web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx
index 89c3fba30..67a6160aa 100644
--- a/web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx
+++ b/web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx
@@ -57,7 +57,7 @@ export default function ImportExportServers({onClose}) {
   const classes = useStyles();
   const tableClasses = commonTableStyles();
 
-  var steps = [gettext('Import/Export'), gettext('Database Servers'), gettext('Summary')];
+  let steps = [gettext('Import/Export'), gettext('Database Servers'), gettext('Summary')];
   const [loaderText, setLoaderText] = React.useState('');
   const [errMsg, setErrMsg] = React.useState('');
   const [selectionFormData, setSelectionFormData] = React.useState({});
@@ -165,7 +165,7 @@ export default function ImportExportServers({onClose}) {
       if(activeStep == 0) {
         setLoaderText('Loading Servers/Server Groups ...');
         if (selectionFormData.imp_exp == 'e') {
-          var get_servers_url = url_for('import_export_servers.get_servers');
+          let get_servers_url = url_for('import_export_servers.get_servers');
           api.get(get_servers_url)
             .then(res => {
               setLoaderText('');
@@ -179,7 +179,7 @@ export default function ImportExportServers({onClose}) {
               reject();
             });
         } else if (selectionFormData.imp_exp == 'i') {
-          var load_servers_url = url_for('import_export_servers.load_servers');
+          let load_servers_url = url_for('import_export_servers.load_servers');
           const post_data = {
             filename: selectionFormData.filename
           };
diff --git a/web/pgadmin/tools/psql/static/js/index.js b/web/pgadmin/tools/psql/static/js/index.js
index e63a04c42..cdf61eda9 100644
--- a/web/pgadmin/tools/psql/static/js/index.js
+++ b/web/pgadmin/tools/psql/static/js/index.js
@@ -10,7 +10,7 @@
 import gettext from 'sources/gettext';
 import url_for from 'sources/url_for';
 import $ from 'jquery';
-import _ from 'underscore';
+import _ from 'lodash';
 import pgAdmin from 'sources/pgadmin';
 import pgBrowser from 'top/browser/static/js/browser';
 import * as csrfToken from 'sources/csrf';
diff --git a/web/pgadmin/tools/psql/templates/editor_template.html b/web/pgadmin/tools/psql/templates/editor_template.html
index e60575098..66a17e5f3 100644
--- a/web/pgadmin/tools/psql/templates/editor_template.html
+++ b/web/pgadmin/tools/psql/templates/editor_template.html
@@ -8,10 +8,6 @@
 <style>
     body {padding: 0px;}
     {% if is_desktop_mode and is_linux %}
-    .alertify .ajs-dimmer,.alertify .ajs-modal{-webkit-transform: none;}
-    .alertify-notifier{-webkit-transform: none;}
-    .alertify-notifier .ajs-message{-webkit-transform: none;}
-    .alertify .ajs-dialog.ajs-shake{-webkit-animation-name: none;}
     .sql-editor-busy-icon.fa-pulse{-webkit-animation: none;}
     {% endif %}
 </style>
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/Editors.jsx b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/Editors.jsx
index 69cf01bdc..836058337 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/Editors.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/Editors.jsx
@@ -327,7 +327,7 @@ export function JsonTextEditor({row, column, onRowChange, onClose}) {
     if(column.column_type_internal === 'jsonb' && !Array.isArray(newVal) && newVal != null) {
       newVal = JSONBigNumber.stringify(JSONBigNumber.parse(newVal), null, 2);
     } else if (Array.isArray(newVal)) {
-      var temp = newVal.map((ele)=>{
+      let temp = newVal.map((ele)=>{
         if (typeof ele === 'object') {
           return JSONBigNumber.stringify(ele, null, 2);
         }
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/Query.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/Query.jsx
index 366384fc7..509cfe023 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/sections/Query.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/Query.jsx
@@ -32,7 +32,7 @@ function registerAutocomplete(api, transId, sqlEditorPref, onFailure) {
   let loadingEle;
   let prevSearch = null;
   OrigCodeMirror.registerHelper('hint', 'sql', function (editor) {
-    var data = [],
+    let data = [],
       doc = editor.getDoc(),
       cur = doc.getCursor(),
       // function context
@@ -50,7 +50,7 @@ function registerAutocomplete(api, transId, sqlEditorPref, onFailure) {
          * and icon as per the object type.
          */
         hint_render: function (elt, data_arg, cur_arg) {
-          var el = document.createElement('span');
+          let el = document.createElement('span');
           switch (cur_arg.type) {
           case 'database':
             el.className = 'sqleditor-hint pg-icon-' + cur_arg.type;
@@ -90,15 +90,15 @@ function registerAutocomplete(api, transId, sqlEditorPref, onFailure) {
       }
 
       if(!loadingEle) {
-        var ownerDocument = editor.getInputField().ownerDocument;
+        let ownerDocument = editor.getInputField().ownerDocument;
         loadingEle = ownerDocument.createElement('div');
         loadingEle.className = 'CodeMirror-hints';
-        var iconEle = ownerDocument.createElement('div');
+        let iconEle = ownerDocument.createElement('div');
         iconEle.className = 'icon-spinner';
         iconEle.style.marginTop = '4px';
         iconEle.style.marginLeft = '2px';
 
-        var spanEle = ownerDocument.createElement('span');
+        let spanEle = ownerDocument.createElement('span');
         spanEle.innerText = gettext('Loading...');
         spanEle.style.marginLeft = '17px';
 
@@ -106,7 +106,7 @@ function registerAutocomplete(api, transId, sqlEditorPref, onFailure) {
         loadingEle.appendChild(iconEle);
         ownerDocument.body.appendChild(loadingEle);
       }
-      var pos = editor.cursorCoords(true);
+      let pos = editor.cursorCoords(true);
       loadingEle.style.left = pos.left + 'px';
       loadingEle.style.top = pos.bottom + 'px';
       loadingEle.style.height = '25px';
@@ -120,7 +120,7 @@ function registerAutocomplete(api, transId, sqlEditorPref, onFailure) {
 
     return {
       then: function (cb) {
-        var self_local = this;
+        let self_local = this;
 
         // This function is used to filter the data and call the callback
         // function with that filtered data.
@@ -146,7 +146,7 @@ function registerAutocomplete(api, transId, sqlEditorPref, onFailure) {
          * Below logic find the start and end point
          * to replace the selected auto complete suggestion.
          */
-        var token = self_local.editor.getTokenAt(cur),
+        let token = self_local.editor.getTokenAt(cur),
           start, end, search;
         if (token.end > cur.ch) {
           token.end = cur.ch;
@@ -211,7 +211,7 @@ function registerAutocomplete(api, transId, sqlEditorPref, onFailure) {
           api.post(self_local.url, JSON.stringify(self_local.data))
             .then((res) => {
               hideLoading();
-              var result = [];
+              let result = [];
 
               _.each(res.data.data.result, function (obj, key) {
                 result.push({
@@ -264,21 +264,21 @@ export default function Query() {
       selectedLineNo = cmObj.getCursor(true).line;
 
     // Fetch the LINE string using regex from the result
-    var line = /LINE (\d+)/.exec(result),
+    let line = /LINE (\d+)/.exec(result),
       // Fetch the Character string using regex from the result
       char = /Character: (\d+)/.exec(result);
 
     // If line and character is null then no need to mark
     if (line != null && char != null) {
       errorLineNo = (parseInt(line[1]) - 1) + selectedLineNo;
-      var errorCharNo = (parseInt(char[1]) - 1);
+      let errorCharNo = (parseInt(char[1]) - 1);
 
       /* We need to loop through each line till the error line and
         * count the total no of character to figure out the actual
         * starting/ending marker point for the individual line. We
         * have also added 1 per line for the "\n" character.
         */
-      var prevLineChars = 0;
+      let prevLineChars = 0;
       for (let i = selectedLineNo > 0 ? selectedLineNo : 0; i < errorLineNo; i++)
         prevLineChars += cmObj.getLine(i).length + 1;
 
@@ -289,7 +289,7 @@ export default function Query() {
       startMarker = errorCharNo - prevLineChars;
 
       // Find the next space from the character or end of line
-      var errorLine = cmObj.getLine(errorLineNo);
+      let errorLine = cmObj.getLine(errorLineNo);
 
       if (_.isUndefined(errorLine)) return;
       endMarker = errorLine.indexOf(' ', startMarker);
diff --git a/web/pgadmin/tools/sqleditor/static/js/show_view_data.js b/web/pgadmin/tools/sqleditor/static/js/show_view_data.js
index 619435686..6b9afe548 100644
--- a/web/pgadmin/tools/sqleditor/static/js/show_view_data.js
+++ b/web/pgadmin/tools/sqleditor/static/js/show_view_data.js
@@ -10,7 +10,7 @@ import gettext from '../../../../static/js/gettext';
 import url_for from '../../../../static/js/url_for';
 import {getDatabaseLabel, generateTitle} from './sqleditor_title';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
-import _ from 'underscore';
+import _ from 'lodash';
 import Notify from '../../../../static/js/helpers/Notifier';
 import { isEmptyString } from 'sources/validators';
 import { getUtilityView } from '../../../../browser/static/js/utility_view';
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor_title.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor_title.js
index c7372b03a..fc2db8688 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor_title.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor_title.js
@@ -8,9 +8,9 @@
 //////////////////////////////////////////////////////////////
 
 import gettext from 'sources/gettext';
-import Alertify from 'pgadmin.alertifyjs';
 import pgWindow from 'sources/window';
 import { retrieveNameSpaceName, retrieveNodeName } from './show_view_data';
+import Notify from '../../../../static/js/helpers/Notifier';
 
 const pgAdmin = pgWindow.pgAdmin;
 
@@ -139,14 +139,7 @@ export function generateTitle(title_placeholder, title_data) {
  * This function is used refresh the db node after showing alert to the user
  */
 export function refresh_db_node(message, dbNode) {
-  Alertify.alert()
-    .setting({
-      'title': gettext('Database moved/renamed'),
-      'label':gettext('OK'),
-      'message': gettext(message),
-      'onok': function(){
-        //Set the original db name as soon as user clicks ok button
-        pgAdmin.Browser.Nodes.database.callbacks.refresh(undefined, dbNode);
-      },
-    }).show();
+  Notify.alert(gettext('Database moved/renamed'), gettext(message), ()=>{
+    pgAdmin.Browser.Nodes.database.callbacks.refresh(undefined, dbNode);
+  });
 }
diff --git a/web/regression/feature_tests/browser_tool_bar_test.py b/web/regression/feature_tests/browser_tool_bar_test.py
index 2ad9efa1a..e9a62849f 100644
--- a/web/regression/feature_tests/browser_tool_bar_test.py
+++ b/web/regression/feature_tests/browser_tool_bar_test.py
@@ -91,7 +91,7 @@ class BrowserToolBarFeatureTest(BaseFeatureTest):
         self.assertTrue(self.page.retry_click(
             (By.CSS_SELECTOR,
              BrowserToolBarLocators.filter_data_button_css),
-            (By.XPATH, BrowserToolBarLocators.filter_alertify_box_css)),
+            (By.XPATH, BrowserToolBarLocators.filter_box_css)),
             'Filter dialogue did not open on clicking filter button.')
         self.page.click_modal('Close', True)
         self.page.close_query_tool(prompt=False)
diff --git a/web/regression/feature_utils/locators.py b/web/regression/feature_utils/locators.py
index 20eac9bc4..cd7171634 100644
--- a/web/regression/feature_utils/locators.py
+++ b/web/regression/feature_utils/locators.py
@@ -24,7 +24,7 @@ class BrowserToolBarLocators():
     filter_data_button_css = \
         ".wcFrameButton[title='Filtered Rows']:not(.disabled)"
 
-    filter_alertify_box_css = "//*[@id='0']/div[contains(text()," \
+    filter_box_css = "//*[@id='0']/div[contains(text()," \
                               "'Data Filter')]"
 
 
@@ -271,14 +271,13 @@ class ConnectToServerDiv:
     password_field = "//input[@id='password']"
 
     ok_button = \
-        "//button[@class='ajs-button btn btn-primary fa fa-check " \
-        "pg-alertify-button']"
+        "//button[@class='ajs-button btn btn-primary fa fa-check']"
 
     error_message = \
         "//form[@id='frmPassword']/div/div//div[@class='alert-text']"
 
     cancel_button = \
-        "//div [@class='alertify  ajs-modeless ajs-movable ajs-zoom']" \
+        "//div [@class='ajs-modeless ajs-movable ajs-zoom']" \
         "//button[text()='Cancel']"
 
 
diff --git a/web/regression/feature_utils/pgadmin_page.py b/web/regression/feature_utils/pgadmin_page.py
index cb4e12935..9edd22015 100644
--- a/web/regression/feature_utils/pgadmin_page.py
+++ b/web/regression/feature_utils/pgadmin_page.py
@@ -83,18 +83,12 @@ class PgadminPage:
 
     def click_modal(self, button_text, react_dialog=False):
         time.sleep(0.5)
-        # Find active alertify dialog in case of multiple alertify dialog
+        # Find active dialog in case of multiple dialog
         # & click on that dialog
 
         # In case of react dialog we use different xpath
-        if react_dialog:
-            modal_button = self.find_by_xpath(
-                "//span[text()='{}']".format(button_text))
-        else:
-            modal_button = self.find_by_xpath(
-                "//div[contains(@class, 'alertify') and "
-                "not(contains(@class, 'ajs-hidden'))]//button[.='%s']"
-                % button_text)
+        modal_button = self.find_by_xpath(
+            "//span[text()='{}']".format(button_text))
 
         self.click_element(modal_button)
 
diff --git a/web/regression/javascript/browser/modify_animation_spec.js b/web/regression/javascript/browser/modify_animation_spec.js
deleted file mode 100644
index e023bc058..000000000
--- a/web/regression/javascript/browser/modify_animation_spec.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/////////////////////////////////////////////////////////////
-//
-// pgAdmin 4 - PostgreSQL Tools
-//
-// Copyright (C) 2013 - 2022, The pgAdmin Development Team
-// This software is released under the PostgreSQL Licence
-//
-//////////////////////////////////////////////////////////////
-
-import $ from 'jquery';
-import modifyAnimation from 'sources/modify_animation';
-
-
-describe('modifyAnimation', function () {
-  let pgBrowser;
-  let dummyElement;
-
-  beforeEach(() => {
-    pgBrowser = jasmine.createSpyObj('pgBrowser', ['get_preference', 'tree']);
-    pgBrowser.tree = jasmine.createSpyObj('tree', ['options']);
-    pgBrowser.tree.options.and.returnValue({
-      show: {},
-      hide: {},
-      view: {},
-    });
-    dummyElement = document.createElement('link');
-    spyOn($.fn, 'find').and.returnValue($(dummyElement));
-    spyOn($.fn, 'removeClass');
-    spyOn($.fn, 'addClass');
-  });
-
-  describe('When browser tree animation is disabled', () => {
-    beforeEach(() => {
-      pgBrowser.get_preference.and.returnValue({value: false});
-      modifyAnimation.modifyTreeAnimation(pgBrowser);
-    });
-    it('tree options to animate should be disabled', function() {
-      expect(pgBrowser.get_preference).toHaveBeenCalled();
-      expect(pgBrowser.tree.options).toHaveBeenCalledTimes(4);
-      expect(pgBrowser.tree.options).toHaveBeenCalledWith({
-        animateRoot: false,
-        unanimated: true,
-        show: {duration: 0},
-        hide: {duration: 0},
-        view: {duration: 0},
-      });
-    });
-  });
-
-  describe('When browser tree animation is enabled', () => {
-    beforeEach(() => {
-      pgBrowser.get_preference.and.returnValue({value: true});
-      modifyAnimation.modifyTreeAnimation(pgBrowser);
-    });
-    it('tree options to animate should be enabled', function() {
-      expect(pgBrowser.get_preference).toHaveBeenCalled();
-      expect(pgBrowser.tree.options).toHaveBeenCalledTimes(4);
-      expect(pgBrowser.tree.options).toHaveBeenCalledWith({
-        animateRoot: true,
-        unanimated: false,
-        show: {duration: 75},
-        hide: {duration: 75},
-        view: {duration: 75},
-      });
-    });
-  });
-
-  describe('When alertify animation is disabled', () => {
-    beforeEach(() => {
-      pgBrowser.get_preference.and.returnValue({value: false});
-      modifyAnimation.modifyAlertifyAnimation(pgBrowser);
-
-    });
-    it('alertify disalogue/notification animation should be disabled', function() {
-      expect(pgBrowser.get_preference).toHaveBeenCalled();
-      expect($.fn.find).toHaveBeenCalled();
-      expect($.fn.addClass).toHaveBeenCalledWith('alertify-no-animation');
-    });
-  });
-
-  describe('When alertify animation is enabled', () => {
-    beforeEach(() => {
-      pgBrowser.get_preference.and.returnValue({value: true});
-      modifyAnimation.modifyAlertifyAnimation(pgBrowser);
-    });
-    it('alertify disalogue/notification animation should be enabled', function() {
-      expect(pgBrowser.get_preference).toHaveBeenCalled();
-      expect($.fn.find).toHaveBeenCalled();
-      expect($.fn.removeClass).toHaveBeenCalledWith('alertify-no-animation');
-    });
-  });
-
-});
-
diff --git a/web/regression/javascript/jasmine_capture_warnings_beforeall.js b/web/regression/javascript/jasmine_capture_warnings_beforeall.js
index ac133ef67..2eab2d9ac 100644
--- a/web/regression/javascript/jasmine_capture_warnings_beforeall.js
+++ b/web/regression/javascript/jasmine_capture_warnings_beforeall.js
@@ -13,14 +13,6 @@ beforeAll(function () {
   spyOn(console, 'warn').and.callThrough();
   spyOn(console, 'error').and.callThrough();
   jasmine.getEnv().allowRespy(true);
-
-  window.addEventListener('error', e => {
-    console.log(e.message);
-    if(e.message === 'ResizeObserver loop completed with undelivered notifications.' ||
-        e.message === 'ResizeObserver loop limit exceeded') {
-      e.stopPropagation();
-    }
-  });
 });
 
 afterEach(function (done) {
diff --git a/web/regression/javascript/sqleditor_utils_spec.js b/web/regression/javascript/sqleditor_utils_spec.js
deleted file mode 100644
index 886625769..000000000
--- a/web/regression/javascript/sqleditor_utils_spec.js
+++ /dev/null
@@ -1,21 +0,0 @@
-//////////////////////////////////////////////////////////////////////////
-//
-// pgAdmin 4 - PostgreSQL Tools
-//
-// Copyright (C) 2013 - 2022, The pgAdmin Development Team
-// This software is released under the PostgreSQL Licence
-//
-//////////////////////////////////////////////////////////////////////////
-
-define(['sources/sqleditor_utils'],
-  function (SqlEditorUtils) {
-    describe('SqlEditorUtils', function () {
-      describe('Calculate font size of input number passed', function () {
-        it('calcFontSize', function () {
-          expect(SqlEditorUtils.calcFontSize(1.456)).toEqual('1.46em');
-          expect(SqlEditorUtils.calcFontSize()).toEqual('1em');
-          expect(SqlEditorUtils.calcFontSize(2)).toEqual('2em');
-        });
-      });
-    });
-  });
diff --git a/web/webpack.shim.js b/web/webpack.shim.js
index 750751d35..c94b81337 100644
--- a/web/webpack.shim.js
+++ b/web/webpack.shim.js
@@ -72,9 +72,6 @@ var webpackShimConfig = {
       'deps': ['jquery'], 'exports': 'jQuery.fn.drag',
     },
     'jquery.ui': {'deps': ['jquery']},
-    'alertify': {
-      'exports': 'alertify',
-    },
     'jqueryui.position': {
       'deps': ['jquery'],
       'exports': 'jQuery.ui.position',
@@ -120,7 +117,6 @@ var webpackShimConfig = {
     // Vendor JS
     'jquery': path.join(__dirname, './node_modules/jquery/dist/jquery'),
     'wcdocker': path.join(__dirname, './node_modules/webcabin-docker/Build/wcDocker.min'),
-    'alertify': path.join(__dirname, './node_modules/alertifyjs/build/alertify'),
     'moment': path.join(__dirname, './node_modules/moment/moment'),
     'jqueryui.position': path.join(__dirname, './node_modules/jquery-contextmenu/dist/jquery.ui.position'),
     'jquery.contextmenu': path.join(__dirname, './node_modules/jquery-contextmenu/dist/jquery.contextMenu'),
@@ -160,7 +156,6 @@ var webpackShimConfig = {
     'select2': path.join(__dirname, './node_modules/select2/dist/js/select2.full'),
     'backgrid.filter': path.join(__dirname, './node_modules/backgrid-filter/backgrid-filter'),
     'backgrid.select.all': path.join(__dirname, './pgadmin/static/vendor/backgrid/backgrid-select-all'),
-    'pgadmin.alertifyjs': path.join(__dirname, './pgadmin/static/js/alertify.pgadmin.defaults'),
     'pgadmin.backform': path.join(__dirname, './pgadmin/static/js/backform.pgadmin'),
     'pgadmin.backgrid': path.join(__dirname, './pgadmin/static/js/backgrid.pgadmin'),
 
@@ -292,7 +287,7 @@ var webpackShimConfig = {
     'pgadmin.browser.datamodel', 'pgadmin.browser.menu', 'pgadmin.browser.panel', 'pgadmin',
     'pgadmin.browser.frame', 'pgadmin.backform', 'pgadmin.backgrid', 'pgadmin.browser',
     'pgadmin.browser.node',
-    'pgadmin.alertifyjs', 'pgadmin.settings', 'pgadmin.preferences', 'pgadmin.sqlfoldcode',
+    'pgadmin.settings', 'pgadmin.preferences', 'pgadmin.sqlfoldcode',
   ],
   // Checks whether JS module is npm module or not
   isExternal: function(module) {
diff --git a/web/webpack.test.config.js b/web/webpack.test.config.js
index 73f5abe7e..40ef92477 100644
--- a/web/webpack.test.config.js
+++ b/web/webpack.test.config.js
@@ -117,7 +117,6 @@ module.exports = {
       'top': path.join(__dirname, './pgadmin'),
       'jquery': path.join(__dirname, './node_modules/jquery/dist/jquery'),
       'wcdocker': path.join(__dirname, './node_modules/webcabin-docker/Build/wcDocker'),
-      'alertify': path.join(__dirname, './node_modules/alertifyjs/build/alertify'),
       'color-picker': path.join(__dirname, './node_modules/@simonwep/pickr/dist/pickr.min'),
       'bignumber': path.join(__dirname, './node_modules/bignumber.js/bignumber'),
       'bootstrap.datetimepicker': path.join(__dirname, './node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min'),
@@ -138,7 +137,6 @@ module.exports = {
       'browser': path.resolve(__dirname, 'pgadmin/browser/static/js'),
       'pgadmin': sourcesDir + '/js/pgadmin',
       'pgadmin.sqlfoldcode': sourcesDir + '/js/codemirror/addon/fold/pgadmin-sqlfoldcode',
-      'pgadmin.alertifyjs': sourcesDir + '/js/alertify.pgadmin.defaults',
       'pgadmin.backgrid': sourcesDir + '/js/backgrid.pgadmin',
       'pgadmin.backform': sourcesDir + '/js/backform.pgadmin',
       'pgadmin4-tree': path.join(__dirname, 'node_modules/pgadmin4-tree'),
diff --git a/web/yarn.lock b/web/yarn.lock
index 4ddda44a6..092060568 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -2984,10 +2984,6 @@ ajv@^8.8.2:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-"alertifyjs@git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263":
-  version "1.7.1"
-  resolved "git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263"
-
 alphanum-sort@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"