Cleanup
implement deleting shape