More simplification

Removing threading since we'll be processing sequentially