MBH: cleanup of graphs