Graph service: remove decorator pattern.