Remove RPN's from graph definitions

Fixes CC-74
Merge pull request #951 from control-center/feature/CC-74

Remove RPN's from graph definitions