Remove old parallelism code
Remove old parallelism code #2
A bit of refactoring