More cleanup in CardSelectionValidate