diff --git a/.gitmodules b/.gitmodules
index 6dab35482..e69de29bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "vendor/haskell-tree-sitter"]
-	path = vendor/haskell-tree-sitter
-	url = https://github.com/tree-sitter/haskell-tree-sitter.git
diff --git a/.travis.yml b/.travis.yml
index 0fcfe68a2..27aa6de54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ before_install:
 - cabal --version
 
 install:
-- cabal new-update
+- cabal new-update hackage.haskell.org,HEAD
 - cabal new-configure --enable-tests --write-ghc-environment-files=always
 - cabal new-build --only-dependencies -j
 
diff --git a/cabal.project b/cabal.project
index 7db9d1e8e..07a001910 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1,4 +1,4 @@
-packages: vendor/* vendor/haskell-tree-sitter/languages/* . semantic-core
+packages: . semantic-core
 
 source-repository-package
   type: git
diff --git a/semantic.cabal b/semantic.cabal
index ccb96efc0..5442e37b1 100644
--- a/semantic.cabal
+++ b/semantic.cabal
@@ -55,7 +55,7 @@ common dependencies
                      , fused-effects ^>= 0.4.0.0
                      , fused-effects-exceptions ^>= 0.1.1.0
                      , hashable ^>= 1.2.7.0
-                     , haskell-tree-sitter
+                     , tree-sitter ^>= 0.1.0.0
                      , machines ^>= 0.6.4
                      , mtl ^>= 2.2.2
                      , network ^>= 2.8.0.0
@@ -304,7 +304,7 @@ library
                      , reducers ^>= 3.12.3
                      , semigroupoids ^>= 5.3.2
                      , servant ^>= 0.15
-                     , shelly
+                     , shelly >= 1.5 && <2
                      , split ^>= 0.2.3.3
                      , stm-chans ^>= 3.0.0.4
                      , template-haskell ^>= 2.14
@@ -312,16 +312,15 @@ library
                      , unliftio-core
                      , unordered-containers ^>= 0.2.9.0
                      , vector ^>= 0.12.0.2
-                     , haskell-tree-sitter
-                     , tree-sitter-go
+                     , tree-sitter-go ^>= 0.1.0.0
                      , tree-sitter-haskell
-                     , tree-sitter-json
-                     , tree-sitter-php
-                     , tree-sitter-python
-                     , tree-sitter-ruby
-                     , tree-sitter-typescript
-                     , tree-sitter-tsx
-                     , tree-sitter-java
+                     , tree-sitter-json ^>= 0.1.0.0
+                     , tree-sitter-php ^>= 0.1.0.0
+                     , tree-sitter-python ^>= 0.1.0.1
+                     , tree-sitter-ruby ^>= 0.1.0.0
+                     , tree-sitter-typescript ^>= 0.1.0.0
+                     , tree-sitter-tsx ^>= 0.1.0.0
+                     , tree-sitter-java ^>= 0.1.0.0
   ghc-options:         -Wall -Wmissing-export-lists -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -fno-warn-name-shadowing -j
   if flag(release)
     ghc-options:       -Werror -O1
diff --git a/vendor/haskell-tree-sitter b/vendor/haskell-tree-sitter
deleted file mode 160000
index aa1b3c744..000000000
--- a/vendor/haskell-tree-sitter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aa1b3c74410a71648a5301d6241566dfe79165a4