d3-2 clean up