Cleanup utilities were added for #1164.

Unfortunately, I didn't find time yet to add an example for this new functionality. It is good to have some examples, also for the Delft Software Days.