Remove RPN's from graph definitions

Fixes CC-74