Remove some old sequential code that was causing us to do the same thing multiple times