CRAY - more cleanup