Cleanup, removed graph references in client. Refactoring of server