issue #854: Cleanup collection figures