Related to issue #99: Clean graph