Clean up and Thread consolidation.