WIP on clearing old shapes.  Leaves lots of artifacts.