pre-graph refactoring completed
pre-graph codebase refactoring completed