Be safe about removing minion ids

Closes #16782