NXDRIVE-46: Fix threads clean up