more graph cleanup