cleanup
add threads for both models