Removed threading from master branch