CRAY - fix NHC cleanup with correct options
bug 450