CRAY - more general cleanup