diff --git a/docs/customize/Settings.md b/docs/customize/Settings.md
index 9bd44f59e..957b10549 100644
--- a/docs/customize/Settings.md
+++ b/docs/customize/Settings.md
@@ -141,85 +141,6 @@ When this setting is enabled, search and reverse queries also take data
 from [Tiger house number data](Tiger.md) into account.
 
 
-#### NOMINATIM_USE_AUX_LOCATION_DATA
-
-| Summary            |                                                     |
-| --------------     | --------------------------------------------------- |
-| **Description:**   | Enable searching in external house number tables |
-| **Format:**        | boolean |
-| **Default:**       | no |
-| **After Changes:** | run `nominatim refresh --functions` |
-| **Comment:**       | Do not use. |
-
-When this setting is enabled, search queries also take data from external
-house number tables into account.
-
-*Warning:* This feature is currently unmaintained and should not be used.
-
-
-#### NOMINATIM_HTTP_PROXY
-
-| Summary            |                                                     |
-| --------------     | --------------------------------------------------- |
-| **Description:**   | Use HTTP proxy when downloading data |
-| **Format:**        | boolean |
-| **Default:**       | no |
-
-When this setting is enabled and at least
-[NOMINATIM_HTTP_PROXY_HOST](#nominatim_http_proxy_host) and
-[NOMINATIM_HTTP_PROXY_PORT](#nominatim_http_proxy_port) are set, the
-configured proxy will be used, when downloading external data like
-replication diffs.
-
-
-#### NOMINATIM_HTTP_PROXY_HOST
-
-| Summary            |                                                     |
-| --------------     | --------------------------------------------------- |
-| **Description:**   | Host name of the proxy to use |
-| **Format:**        | string |
-| **Default:**       | _empty_ |
-
-When [NOMINATIM_HTTP_PROXY](#nominatim_http_proxy) is enabled, this setting
-configures the proxy host name.
-
-
-#### NOMINATIM_HTTP_PROXY_PORT
-
-| Summary            |                                                     |
-| --------------     | --------------------------------------------------- |
-| **Description:**   | Port number of the proxy to use |
-| **Format:**        | integer |
-| **Default:**       | 3128 |
-
-When [NOMINATIM_HTTP_PROXY](#nominatim_http_proxy) is enabled, this setting
-configures the port number to use with the proxy.
-
-
-#### NOMINATIM_HTTP_PROXY_LOGIN
-
-| Summary            |                                                     |
-| --------------     | --------------------------------------------------- |
-| **Description:**   | Username for proxies that require login |
-| **Format:**        | string |
-| **Default:**       | _empty_ |
-
-When [NOMINATIM_HTTP_PROXY](#nominatim_http_proxy) is enabled, use this
-setting to define the username for proxies that require a login.
-
-
-#### NOMINATIM_HTTP_PROXY_PASSWORD
-
-| Summary            |                                                     |
-| --------------     | --------------------------------------------------- |
-| **Description:**   | Password for proxies that require login |
-| **Format:**        | string |
-| **Default:**       | _empty_ |
-
-When [NOMINATIM_HTTP_PROXY](#nominatim_http_proxy) is enabled, use this
-setting to define the password for proxies that require a login.
-
-
 #### NOMINATIM_OSM2PGSQL_BINARY
 
 | Summary            |                                                     |
diff --git a/settings/env.defaults b/settings/env.defaults
index 827e3f2ab..ead943b95 100644
--- a/settings/env.defaults
+++ b/settings/env.defaults
@@ -38,22 +38,6 @@ NOMINATIM_TOKENIZER_CONFIG=
 # Changing this value requires to run ./utils/setup --create-functions.
 NOMINATIM_USE_US_TIGER_DATA=no
 
-# Search in the auxiliary housenumber table.
-# Changing this value requires to run ./utils/setup --create-functions.
-NOMINATIM_USE_AUX_LOCATION_DATA=no
-
-# Proxy settings
-# The following settings allow to set a proxy to use when remotely downloading
-# data. Host and port are required. Login and password are optional.
-NOMINATIM_HTTP_PROXY=no
-NOMINATIM_HTTP_PROXY_HOST=
-NOMINATIM_HTTP_PROXY_PORT=3128
-NOMINATIM_HTTP_PROXY_LOGIN=
-NOMINATIM_HTTP_PROXY_PASSWORD=
-# Also set these standard environment variables.
-# HTTP_PROXY="http://user:pass@10.10.1.10:1080"
-# HTTPS_PROXY="http://user:pass@10.10.1.10:1080"
-
 # Location of the osm2pgsql binary.
 # EXPERT ONLY. You should usually use the supplied osm2pgsql.
 NOMINATIM_OSM2PGSQL_BINARY=
@@ -74,7 +58,7 @@ NOMINATIM_IMPORT_STYLE=extratags
 # Location of the flatnode file used by osm2pgsql to store node locations.
 # When unset, osm2pgsql stores the location in the PostgreSQL database. This
 # is especially useful for imports of larger areas, like continents or the
-# full planet. The file needs at least 70GB storage.
+# full planet. The file needs at least 100GB storage.
 NOMINATIM_FLATNODE_FILE=
 
 ### Tablespace settings