Integrated GraphDB with Routes

and minor cleanup