Remove some old functions and files, beginning of graph structure