More cleanup of callflow/decisiontree/ivr prior to real IVR work

Change-Id: Ic1afbd951f7ab96a30bec144e3f95cf22763ad51