Borrow Threads cleaned up