diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index f95c3ecf1b..b7d9bb82e4 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -254,6 +254,7 @@ export const getComponentContexts = (
     delete map[componentId]
   }
 
+  // Only return components which provide at least 1 matching context
   return Object.values(map).filter(x => x.contexts.length > 0)
 }
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
index 7a0315a2fd..bdcd3a7838 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
@@ -25,8 +25,6 @@ export const getDatasourceLikeProviders = ({ asset, componentId, nested }) => {
     }
   )
 
-  console.log(formComponentContexts)
-
   // Check for duplicate contexts by the same component. In this case, attempt
   // to label contexts with their suffixes
   schemaComponentContexts.forEach(schemaContext => {