Removed unecassary threading