SES-2077: WIP: Remove Graph