More SVG cleanup