cleanup, and reverted to passing selector untouched to d3.selectAll