remove Graph class some more