Removed temporary code.

- Also added work-in-progress code to parallelize the
  support correction process.