[#95086] Changes to add new functionality to remove a shape.