delete-legacy-promotion - a few commits to improve behavior

This PR contains a few small commits to improve behavior after deleting legacy promotion.  See commit list for details.