'Graph' Model cleanup and simplified demo3 by using newer Graph features.