Remove getOrphanData, fix Save Delegate selection

Merges could cause save delegates to not be told that they were save
delegates