new graph model, cleanup