remove/reworked parts that were SVG related