more cleanup, openmp version too