support make goals after initial {'', dist, data}clean goal(s)