fixup use of parent data
Merge pull request #712 from Connexions/parent-fixes

Cleanup parent data usage