ParallelizationDecider is now configurable.
Removed unused TODO
Merge branch 'master' into hints_opt