Cleanup parent data usage

a couple more for parentId -> parent.id, etc.