Cleanup after Graph events refactor.