More cluster-assign-roles clean-up