Cleanup ready for d3 module re-import