diff --git a/requirements-dev.in b/requirements-dev.in
index e4b002de8dfdad..22b24c8bff7a45 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -24,6 +24,7 @@ fakeredis[lua]==2.11.0
 freezegun==1.2.2
 packaging==23.1
 black~=22.8.0
+boto3-stubs[s3]
 types-markdown==3.3.9
 types-PyYAML==6.0.1
 types-freezegun==1.1.10
diff --git a/requirements-dev.txt b/requirements-dev.txt
index ff1fb56f11aebb..7da8f1e851a489 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -37,6 +37,10 @@ black==22.8.0
     # via
     #   -r requirements-dev.in
     #   datamodel-code-generator
+boto3-stubs[s3]==1.34.84
+    # via -r requirements-dev.in
+botocore-stubs==1.34.84
+    # via boto3-stubs
 build==0.10.0
     # via pip-tools
 certifi==2019.11.28
@@ -138,6 +142,8 @@ mypy==1.8.0
     #   djangorestframework-stubs
 mypy-baseline==0.6.1
     # via -r requirements-dev.in
+mypy-boto3-s3==1.34.65
+    # via boto3-stubs
 mypy-extensions==1.0.0
     # via
     #   -r requirements-dev.in
@@ -253,6 +259,8 @@ tomli==1.2.3
     #   pip-tools
     #   pyproject-hooks
     #   pytest
+types-awscrt==0.20.9
+    # via botocore-stubs
 types-freezegun==1.1.10
     # via -r requirements-dev.in
 types-markdown==3.3.9
@@ -273,16 +281,20 @@ types-requests==2.26.1
     # via -r requirements-dev.in
 types-retry==0.9.9.4
     # via -r requirements-dev.in
+types-s3transfer==0.10.1
+    # via boto3-stubs
 types-tzlocal==5.1.0.1
     # via -r requirements-dev.in
 typing-extensions==4.7.1
     # via
     #   -c requirements.txt
     #   asgiref
+    #   boto3-stubs
     #   django-stubs
     #   django-stubs-ext
     #   djangorestframework-stubs
     #   mypy
+    #   mypy-boto3-s3
     #   pydantic
     #   pydantic-core
 uritemplate==4.1.1
diff --git a/requirements.in b/requirements.in
index cc594c762fe16b..b9b00d04925623 100644
--- a/requirements.in
+++ b/requirements.in
@@ -8,9 +8,7 @@ aiohttp>=3.9.0
 aioboto3==12.0.0
 aiokafka>=0.8
 antlr4-python3-runtime==4.13.1
-amqp==5.1.1
 boto3==1.28.16
-boto3-stubs[s3]
 brotli==1.1.0
 celery==5.3.4
 celery-redbeat==2.1.1
@@ -40,23 +38,17 @@ dnspython==2.2.1
 drf-exceptions-hog==0.4.0
 drf-extensions==0.7.0
 drf-spectacular==0.27.1
-gevent==23.9.1
-geoip2==4.6.0
 google-cloud-bigquery==3.11.4
 gunicorn==20.1.0
-importlib-metadata==6.8.0
 infi-clickhouse-orm@ git+https://github.com/PostHog/infi.clickhouse_orm@9578c79f29635ee2c1d01b7979e89adab8383de2
 kafka-python==2.0.2
-kafka-helper==0.2
 kombu==5.3.2
 lzstring==1.0.4
 natsort==8.4.0
 numpy==1.23.3
-openapi-spec-validator==0.7.1
 openpyxl==3.1.2
 orjson==3.9.10
 pandas==2.2.0
-parso==0.8.1
 Pillow==10.2.0
 posthoganalytics==3.5.0
 prance==23.06.21.0
@@ -66,12 +58,10 @@ pyarrow==15.0.0
 pydantic==2.5.3
 pyjwt==2.4.0
 python-dateutil>=2.8.2
-python3-saml==1.12.0
 pytz==2023.3
 redis==4.5.4
 retry==0.9.2
 requests~=2.31.0
-requests-oauthlib==1.3.0
 s3fs==2023.10.0
 stripe==7.4.0
 selenium==4.1.5
@@ -94,9 +84,7 @@ whitenoise==6.5.0
 mimesis==5.2.1
 more-itertools==9.0.0
 django-two-factor-auth==1.14.0
-phonenumberslite==8.13.6
 openai==1.10.0
 tiktoken==0.6.0
 nh3==0.2.14
 hogql-parser==1.0.7
-urllib3[secure,socks]==1.26.18
diff --git a/requirements.txt b/requirements.txt
index 84f626477786d0..f5c9b909e60def 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,6 @@ aiohttp==3.9.3
     # via
     #   -r requirements.in
     #   aiobotocore
-    #   geoip2
     #   s3fs
 aioitertools==0.11.0
     # via aiobotocore
@@ -23,9 +22,7 @@ aiokafka==0.8.1
 aiosignal==1.2.0
     # via aiohttp
 amqp==5.1.1
-    # via
-    #   -r requirements.in
-    #   kombu
+    # via kombu
 annotated-types==0.5.0
     # via pydantic
 antlr4-python3-runtime==4.13.1
@@ -64,15 +61,11 @@ boto3==1.28.16
     # via
     #   -r requirements.in
     #   aiobotocore
-boto3-stubs[s3]==1.26.138
-    # via -r requirements.in
 botocore==1.31.64
     # via
     #   aiobotocore
     #   boto3
     #   s3transfer
-botocore-stubs==1.29.130
-    # via boto3-stubs
 brotli==1.1.0
     # via -r requirements.in
 cachetools==5.3.1
@@ -124,7 +117,6 @@ cryptography==37.0.2
     # via
     #   -r requirements.in
     #   django-fernet-encrypted-fields
-    #   kafka-helper
     #   pyopenssl
     #   snowflake-connector-python
     #   social-auth-core
@@ -239,10 +231,6 @@ fsspec==2023.10.0
     #   s3fs
 future==0.18.3
     # via lzstring
-geoip2==4.6.0
-    # via -r requirements.in
-gevent==23.9.1
-    # via -r requirements.in
 gitdb==4.0.11
     # via gitpython
 gitpython==3.1.40
@@ -269,8 +257,6 @@ googleapis-common-protos==1.60.0
     # via
     #   google-api-core
     #   grpcio-status
-greenlet==3.0.3
-    # via gevent
 grpcio==1.57.0
     # via
     #   google-api-core
@@ -303,16 +289,12 @@ idna==2.8
     #   trio
     #   urllib3
     #   yarl
-importlib-metadata==6.8.0
-    # via -r requirements.in
 infi-clickhouse-orm @ git+https://github.com/PostHog/infi.clickhouse_orm@9578c79f29635ee2c1d01b7979e89adab8383de2
     # via -r requirements.in
 inflection==0.5.1
     # via drf-spectacular
 iso8601==0.1.12
     # via infi-clickhouse-orm
-isodate==0.6.1
-    # via python3-saml
 jmespath==1.0.0
     # via
     #   boto3
@@ -322,18 +304,9 @@ joblib==1.3.2
 jsonpath-ng==1.6.0
     # via dlt
 jsonschema==4.20.0
-    # via
-    #   drf-spectacular
-    #   openapi-schema-validator
-    #   openapi-spec-validator
-jsonschema-path==0.3.2
-    # via openapi-spec-validator
+    # via drf-spectacular
 jsonschema-specifications==2023.12.1
-    # via
-    #   jsonschema
-    #   openapi-schema-validator
-kafka-helper==0.2
-    # via -r requirements.in
+    # via jsonschema
 kafka-python==2.0.2
     # via
     #   -r requirements.in
@@ -342,19 +315,12 @@ kombu==5.3.2
     # via
     #   -r requirements.in
     #   celery
-lazy-object-proxy==1.10.0
-    # via openapi-spec-validator
 lxml==4.9.4
-    # via
-    #   python3-saml
-    #   toronado
-    #   xmlsec
+    # via toronado
 lzstring==1.0.4
     # via -r requirements.in
 makefun==1.15.2
     # via dlt
-maxminddb==2.2.0
-    # via geoip2
 mimesis==5.2.1
     # via -r requirements.in
 monotonic==1.5
@@ -365,8 +331,6 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-mypy-boto3-s3==1.26.127
-    # via boto3-stubs
 natsort==8.4.0
     # via -r requirements.in
 nh3==0.2.14
@@ -384,10 +348,6 @@ oauthlib==3.1.0
     #   social-auth-core
 openai==1.10.0
     # via -r requirements.in
-openapi-schema-validator==0.6.2
-    # via openapi-spec-validator
-openapi-spec-validator==0.7.1
-    # via -r requirements.in
 openpyxl==3.1.2
     # via -r requirements.in
 orjson==3.9.10
@@ -406,16 +366,10 @@ packaging==23.1
     #   webdriver-manager
 pandas==2.2.0
     # via -r requirements.in
-parso==0.8.1
-    # via -r requirements.in
-pathable==0.4.3
-    # via jsonschema-path
 pathvalidate==3.2.0
     # via dlt
 pendulum==2.1.2
     # via dlt
-phonenumberslite==8.13.6
-    # via -r requirements.in
 pillow==10.2.0
     # via -r requirements.in
 platformdirs==3.11.0
@@ -494,8 +448,6 @@ python-statsd==2.1.0
     # via django-statsd
 python3-openid==3.1.0
     # via social-auth-core
-python3-saml==1.12.0
-    # via -r requirements.in
 pytz==2023.3
     # via
     #   -r requirements.in
@@ -512,7 +464,6 @@ pyyaml==6.0.1
     # via
     #   dlt
     #   drf-spectacular
-    #   jsonschema-path
 qrcode==7.4.2
     # via django-two-factor-auth
 redis==4.5.4
@@ -523,7 +474,6 @@ redis==4.5.4
 referencing==0.31.1
     # via
     #   jsonschema
-    #   jsonschema-path
     #   jsonschema-specifications
 regex==2023.12.25
     # via tiktoken
@@ -531,11 +481,9 @@ requests==2.31.0
     # via
     #   -r requirements.in
     #   dlt
-    #   geoip2
     #   google-api-core
     #   google-cloud-bigquery
     #   infi-clickhouse-orm
-    #   jsonschema-path
     #   posthoganalytics
     #   prance
     #   requests-oauthlib
@@ -545,15 +493,11 @@ requests==2.31.0
     #   tiktoken
     #   webdriver-manager
 requests-oauthlib==1.3.0
-    # via
-    #   -r requirements.in
-    #   social-auth-core
+    # via social-auth-core
 requirements-parser==0.5.0
     # via dlt
 retry==0.9.2
     # via -r requirements.in
-rfc3339-validator==0.1.4
-    # via openapi-schema-validator
 rpds-py==0.16.2
     # via
     #   jsonschema
@@ -587,11 +531,9 @@ six==1.16.0
     #   astunparse
     #   djangorestframework-csv
     #   google-auth
-    #   isodate
     #   posthoganalytics
     #   prance
     #   python-dateutil
-    #   rfc3339-validator
 slack-sdk==3.17.1
     # via -r requirements.in
 smmap==5.0.1
@@ -654,14 +596,8 @@ trio==0.20.0
     #   trio-websocket
 trio-websocket==0.9.2
     # via selenium
-types-awscrt==0.16.17
-    # via
-    #   botocore-stubs
-    #   types-s3transfer
 types-protobuf==4.22.0.0
     # via temporalio
-types-s3transfer==0.6.1
-    # via boto3-stubs
 types-setuptools==69.0.0.0
     # via requirements-parser
 typing-extensions==4.7.1
@@ -691,10 +627,8 @@ uritemplate==4.1.1
     # via drf-spectacular
 urllib3[secure,socks]==1.26.18
     # via
-    #   -r requirements.in
     #   botocore
     #   django-revproxy
-    #   geoip2
     #   google-auth
     #   requests
     #   selenium
@@ -718,16 +652,8 @@ wrapt==1.15.0
     # via aiobotocore
 wsproto==1.1.0
     # via trio-websocket
-xmlsec==1.3.13
-    # via python3-saml
 yarl==1.7.2
     # via aiohttp
-zipp==3.17.0
-    # via importlib-metadata
-zope-event==5.0
-    # via gevent
-zope-interface==6.1
-    # via gevent
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools