Revert "select/cray step cleanup"

This reverts commit 9a2d863c07eadc78e0dd3c43e3818f4745328954.
Revert "Revert "select/cray step cleanup""

This reverts commit 098a1e506820109e5220d946d2514f5b3122495c.
Change xassert to an if.
Correct check