fix parallelism issue and cleaning. #2