Finish removing the Color dep for Graph