diff --git a/src/components/CardStack.jsx b/src/components/CardStack.jsx
index c4dd233..1f6c371 100644
--- a/src/components/CardStack.jsx
+++ b/src/components/CardStack.jsx
@@ -66,7 +66,6 @@ class CardStack extends React.Component {
         language={this.props.language}
         isLoading={this.props.isLoading}
         isSelected={selections[idx]}
-        // getNarrativeLinks={this.props.getNarrativeLinks}
         getCategoryGroup={this.props.getCategoryGroup}
         getCategoryColor={this.props.getCategoryColor}
         getCategoryLabel={this.props.getCategoryLabel}
diff --git a/src/components/Layout.js b/src/components/Layout.js
index 36304a9..72cd0bf 100644
--- a/src/components/Layout.js
+++ b/src/components/Layout.js
@@ -119,13 +119,6 @@ class Dashboard extends React.Component {
     }
   }
 
-  // Broken for time being; need clarification on function
-  getNarrativeLinks (event) {
-    const narrative = this.props.narratives.find(nv => nv.id === event.narratives[0])
-    if (narrative) return narrative.byId[event.id]
-    return null
-  }
-
   setNarrative (narrative) {
     // only handleSelect if narrative is not null
     if (narrative) {
@@ -143,17 +136,6 @@ class Dashboard extends React.Component {
       return
     }
 
-    // if (this.props.features.USE_ASSOCIATION_DESCRIPTIONS) {
-    //   activeFilters = activeFilters.reduce((acc, vl) => {
-    //     acc.push({
-    //       name: vl,
-    //       description: findDescriptionInFilterTree(vl, domain.filters)
-    //     })
-    //     return acc
-    //   }, [])
-    // } else {
-    //   activeFilters = activeFilters.map(f => ({ name: f }))
-    // }
     activeFilters = activeFilters.map(f => ({ name: f }))
 
     const evs = domain.events.filter(ev => {
@@ -299,7 +281,6 @@ class Dashboard extends React.Component {
           onSelect={app.associations.narrative ? this.selectNarrativeStep : this.handleSelect}
           onHighlight={this.handleHighlight}
           onToggleCardstack={() => actions.updateSelected([])}
-          getNarrativeLinks={event => this.getNarrativeLinks(event)}
           getCategoryColor={this.getCategoryColor}
         />
         <StateOptions
diff --git a/src/reducers/validate/validators.js b/src/reducers/validate/validators.js
index 4cd1911..ba22fcd 100644
--- a/src/reducers/validate/validators.js
+++ b/src/reducers/validate/validators.js
@@ -25,52 +25,6 @@ function isValidDate (d) {
   return d instanceof Date && !isNaN(d)
 }
 
-/*
-* Traverse a filter tree and check its duplicates. Also recompose as
-* description if `features.USE_ASSOCIATION_DESCRIPTIONS` is true.
-*/
-// function validateFilterTree (node, parent, set, duplicates, hasAssociationDescriptions) {
-//   if (hasAssociationDescriptions) {
-//     if (node.key === '_root') {
-//       node.isDescription = true // setting first set of nodes to values
-//     } else if (!parent.isDescription) {
-//       node.isDescription = true
-//     } else {
-//       node.isDescription = false
-//     }
-
-//     if (node.isDescription && node.key !== 'root') {
-//       parent.description = node.key
-//       parent.children = node.children
-//       delete parent.isDescription
-//     }
-//     if (isFilterLeaf(node)) {
-//       delete parent.isDescription
-//     }
-//   }
-
-//   if (typeof (node) !== 'object' || typeof (node.children) !== 'object') {
-//     return
-//   }
-//   // If it's a leaf, check that it's not duplicate
-//   if (isFilterLeaf(node)) {
-//     if (isFilterDuplicate(node, set)) {
-//       duplicates.push({
-//         id: node.key,
-//         error: makeError('Filters', node.key, 'filter was found more than once in hierarchy. Ignoring duplicate.')
-//       })
-//       delete parent.children[node.key]
-//     } else {
-//       set.add(node.key)
-//     }
-//   } else {
-//     // If it's not a leaf, simply keep going
-//     Object.values(node.children).forEach((childNode) => {
-//       validateFilterTree(childNode, node, set, duplicates, hasAssociationDescriptions)
-//     })
-//   }
-// }
-
 function findDuplicateAssociations (associations) {
   const seenSet = new Set([])
   const duplicates = []
@@ -177,10 +131,6 @@ export function validateDomain (domain, features) {
   })
   )
 
-  // Validate uniqueness of associations
-  // const associationSet = new Set([])
-  // const duplicateAssociations = []
-  // validateFilterTree(domain.associations, {}, associationSet, duplicateAssociations, features.USE_ASSOCIATION_DESCRIPTIONS)
   const duplicateAssociations = findDuplicateAssociations(domain.associations)
   // Duplicated associations
   if (duplicateAssociations.length > 0) {