Reduce threading

#743 #677