more script cleanup in anticipation of NERSC testing