Revert "merge conflict resolution"

This reverts commit 71897ff9e9f5861f643aeb36595fd72d186f8713.
Revert "added thread pool support"

This reverts commit aa8716bd2c30663fada2daa2575a79ab699545e8.
merge conflict resolution