Goal drilldown cleanup