Self-Intersection Removal