General clean up and such
Ensure that shapes get deleted properly