diff --git a/awx/ui/client/src/inventories/groups/groups.list.js b/awx/ui/client/src/inventories/groups/groups.list.js
index 816a48d92b..412dd737ee 100644
--- a/awx/ui/client/src/inventories/groups/groups.list.js
+++ b/awx/ui/client/src/inventories/groups/groups.list.js
@@ -50,7 +50,6 @@ export default {
             ngDisabled: '!groupsSelected',
             ngClick: 'setAdhocPattern()',
             awToolTip: "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or a selection of multiple groups.",
-            dataTipWatch: "adhocCommandTooltip",
             dataPlacement: 'top',
             actionClass: 'btn List-buttonDefault',
             buttonContent: 'RUN COMMANDS',
diff --git a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.list.js b/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.list.js
index f474e7d595..082eb3bfad 100644
--- a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.list.js
+++ b/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.list.js
@@ -52,7 +52,7 @@ export default {
             ngDisabled: '!groupsSelected',
             ngClick: 'setAdhocPattern()',
             awToolTip: "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups.",
-            dataTipWatch: "adhocCommandTooltip",
+            dataPlacement: 'top',
             actionClass: 'btn List-buttonDefault',
             buttonContent: 'RUN COMMANDS',
             showTipWhenDisabled: true,
diff --git a/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.list.js b/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.list.js
index 7234327573..f713e091a9 100644
--- a/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.list.js
+++ b/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.list.js
@@ -88,7 +88,7 @@ export default {
             ngDisabled: '!hostsSelected',
             ngClick: 'setAdhocPattern()',
             awToolTip: "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups.",
-            dataTipWatch: "adhocCommandTooltip",
+            dataPlacement: 'top',
             actionClass: 'btn List-buttonDefault',
             buttonContent: 'RUN COMMANDS',
             showTipWhenDisabled: true,
diff --git a/awx/ui/client/src/inventories/related-hosts/related-host.list.js b/awx/ui/client/src/inventories/related-hosts/related-host.list.js
index 1b0a970086..3a83afc195 100644
--- a/awx/ui/client/src/inventories/related-hosts/related-host.list.js
+++ b/awx/ui/client/src/inventories/related-hosts/related-host.list.js
@@ -88,7 +88,6 @@ export default {
             ngDisabled: '!hostsSelected',
             ngClick: 'setAdhocPattern()',
             awToolTip: "Select an inventory source by clicking the check box beside it. The inventory source can be a single host or a selection of multiple hosts.",
-            dataTipWatch: "adhocCommandTooltip",
             dataPlacement: 'top',
             actionClass: 'btn List-buttonDefault',
             buttonContent: 'RUN COMMANDS',
diff --git a/awx/ui/client/src/inventories/sources/sources.list.js b/awx/ui/client/src/inventories/sources/sources.list.js
index c8c44bf571..157477bdd1 100644
--- a/awx/ui/client/src/inventories/sources/sources.list.js
+++ b/awx/ui/client/src/inventories/sources/sources.list.js
@@ -47,24 +47,6 @@ export default {
             actionClass: 'btn List-buttonDefault',
             buttonContent: 'REFRESH'
         },
-        // launch: {
-        //     mode: 'all',
-        //     // $scope.$parent is governed by InventoryManageController,
-        //     ngDisabled: '!$parent.groupsSelected && !$parent.hostsSelected',
-        //     ngClick: '$parent.setAdhocPattern()',
-        //     awToolTip: "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups.",
-        //     dataTipWatch: "adhocCommandTooltip",
-        //     actionClass: 'btn List-buttonDefault',
-        //     buttonContent: 'RUN COMMANDS',
-        //     showTipWhenDisabled: true,
-        //     tooltipInnerClass: "Tooltip-wide",
-        //     ngShow: 'canAdhoc'
-        //     // TODO: set up a tip watcher and change text based on when
-        //     // things are selected/not selected.  This is started and
-        //     // commented out in the inventory controller within the watchers.
-        //     // awToolTip: "{{ adhocButtonTipContents }}",
-        //     // dataTipWatch: "adhocButtonTipContents"
-        // },
         create: {
             mode: 'all',
             ngClick: "createSource()",