diff --git a/setup.py b/setup.py
index 10567a3b1..de5d748d8 100644
--- a/setup.py
+++ b/setup.py
@@ -39,31 +39,25 @@ setup(
         'aiorpcx==0.9.0',
         'coincurve',
         'pbkdf2',
-        'cryptography'
+        'cryptography',
+        'attrs',
+        'plyvel',
+        'pylru'
     ),
     extras_require={
-        'test': (
-            'mock',
-            'requests',
-        ),
-        'server': (
-            'attrs',
-            'plyvel',
-            'pylru'
-        ),
-        'ui': (
+        'gui': (
             'pyside2',
         )
     },
     entry_points={
         'console_scripts': [
             'torba-client=torba.client.cli:main',
-            'torba-server=torba.server.cli:main [server]',
-            'orchstr8=torba.orchstr8.cli:main [server]',
+            'torba-server=torba.server.cli:main',
+            'orchstr8=torba.orchstr8.cli:main',
         ],
         'gui_scripts': [
-            'torba=torba.ui:main [ui]',
-            'torba-workbench=torba.workbench:main [ui]',
+            'torba=torba.ui:main [gui]',
+            'torba-workbench=torba.workbench:main [gui]',
         ]
     }
 )
diff --git a/tests/client_tests/unit/bitcoin_headers b/tests/client_tests/unit/bitcoin_headers
deleted file mode 100644
index 5cb342901..000000000
Binary files a/tests/client_tests/unit/bitcoin_headers and /dev/null differ
diff --git a/torba/orchstr8/node.py b/torba/orchstr8/node.py
index 46c9b9bb1..7e8d05bf6 100644
--- a/torba/orchstr8/node.py
+++ b/torba/orchstr8/node.py
@@ -9,8 +9,7 @@ import subprocess
 import importlib
 from binascii import hexlify
 from typing import Type, Optional
-
-import requests
+import urllib.request
 
 from torba.server.server import Server
 from torba.server.env import Env
@@ -256,9 +255,9 @@ class BlockchainNode:
 
         if not os.path.exists(downloaded_file):
             self.log.info('Downloading: %s', self.latest_release_url)
-            response = requests.get(self.latest_release_url, stream=True)
-            with open(downloaded_file, 'wb') as f:
-                shutil.copyfileobj(response.raw, f)
+            with urllib.request.urlopen(self.latest_release_url) as response:
+                with open(downloaded_file, 'wb') as out_file:
+                    shutil.copyfileobj(response, out_file)
 
         self.log.info('Extracting: %s', downloaded_file)