More d3 cleanup