get rid of old stuff
some cleanup
misc cleanup, graph, etc.