diff --git a/src/Common/Provider/IpAddressGeocoder.php b/src/Common/Provider/IpAddressGeocoder.php
deleted file mode 100644
index 4a947230c..000000000
--- a/src/Common/Provider/IpAddressGeocoder.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the Geocoder package.
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @license    MIT License
- */
-
-namespace Geocoder\Provider;
-
-/**
- * An geocoder implementing this interface support geocoing of IP addresses.
- *
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- */
-interface IpAddressGeocoder
-{
-}
diff --git a/src/Common/Provider/LocaleAwareGeocoder.php b/src/Common/Provider/LocaleAwareGeocoder.php
deleted file mode 100644
index 9a1e646a7..000000000
--- a/src/Common/Provider/LocaleAwareGeocoder.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of the Geocoder package.
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @license    MIT License
- */
-
-namespace Geocoder\Provider;
-
-/**
- * This provider is locale aware. It will return results in different languages.
- *
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- */
-interface LocaleAwareGeocoder
-{
-}
diff --git a/src/Common/StatefulGeocoder.php b/src/Common/StatefulGeocoder.php
index 29bbd19cd..400f20df0 100644
--- a/src/Common/StatefulGeocoder.php
+++ b/src/Common/StatefulGeocoder.php
@@ -15,13 +15,12 @@
 use Geocoder\Model\Bounds;
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
-use Geocoder\Provider\LocaleAwareGeocoder;
 use Geocoder\Provider\Provider;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-final class StatefulGeocoder implements Geocoder, LocaleAwareGeocoder
+final class StatefulGeocoder implements Geocoder
 {
     /**
      * @var string
diff --git a/src/Provider/BingMaps/BingMaps.php b/src/Provider/BingMaps/BingMaps.php
index 71e587160..3b371d1a3 100644
--- a/src/Provider/BingMaps/BingMaps.php
+++ b/src/Provider/BingMaps/BingMaps.php
@@ -20,14 +20,13 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
-use Geocoder\Provider\LocaleAwareGeocoder;
 use Geocoder\Provider\Provider;
 use Http\Client\HttpClient;
 
 /**
  * @author David Guyon <dguyon@gmail.com>
  */
-final class BingMaps extends AbstractHttpProvider implements LocaleAwareGeocoder, Provider
+final class BingMaps extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string
diff --git a/src/Provider/Chain/Chain.php b/src/Provider/Chain/Chain.php
index 3bad36996..d90c2ef1a 100644
--- a/src/Provider/Chain/Chain.php
+++ b/src/Provider/Chain/Chain.php
@@ -16,7 +16,6 @@
 use Geocoder\Model\AddressCollection;
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
-use Geocoder\Provider\LocaleAwareGeocoder;
 use Geocoder\Provider\Provider;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
@@ -24,7 +23,7 @@
 /**
  * @author Markus Bachmann <markus.bachmann@bachi.biz>
  */
-final class Chain implements LocaleAwareGeocoder, Provider, LoggerAwareInterface
+final class Chain implements Provider, LoggerAwareInterface
 {
     use LoggerAwareTrait;
 
diff --git a/src/Provider/FreeGeoIp/FreeGeoIp.php b/src/Provider/FreeGeoIp/FreeGeoIp.php
index 1354f610e..52d582601 100644
--- a/src/Provider/FreeGeoIp/FreeGeoIp.php
+++ b/src/Provider/FreeGeoIp/FreeGeoIp.php
@@ -19,14 +19,13 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
-use Geocoder\Provider\IpAddressGeocoder;
 use Geocoder\Provider\Provider;
 use Http\Client\HttpClient;
 
 /**
  * @author William Durand <william.durand1@gmail.com>
  */
-final class FreeGeoIp extends AbstractHttpProvider implements Provider, IpAddressGeocoder
+final class FreeGeoIp extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string
diff --git a/src/Provider/GeoIP2/GeoIP2.php b/src/Provider/GeoIP2/GeoIP2.php
index c0f7f88a3..3171f8f29 100644
--- a/src/Provider/GeoIP2/GeoIP2.php
+++ b/src/Provider/GeoIP2/GeoIP2.php
@@ -18,8 +18,6 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Provider\AbstractProvider;
-use Geocoder\Provider\IpAddressGeocoder;
-use Geocoder\Provider\LocaleAwareGeocoder;
 use Geocoder\Provider\Provider;
 use Geocoder\Exception\UnsupportedOperation;
 use Geocoder\Exception\InvalidCredentials;
@@ -31,7 +29,7 @@
 /**
  * @author Jens Wiese <jens@howtrueisfalse.de>
  */
-final class GeoIP2 extends AbstractProvider implements LocaleAwareGeocoder, IpAddressGeocoder, Provider
+final class GeoIP2 extends AbstractProvider implements Provider
 {
     /**
      * @var GeoIP2Adapter
diff --git a/src/Provider/GeoIPs/GeoIPs.php b/src/Provider/GeoIPs/GeoIPs.php
index 38ab91b6f..083492a36 100644
--- a/src/Provider/GeoIPs/GeoIPs.php
+++ b/src/Provider/GeoIPs/GeoIPs.php
@@ -23,7 +23,6 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
-use Geocoder\Provider\IpAddressGeocoder;
 use Geocoder\Provider\Provider;
 use Http\Client\HttpClient;
 
@@ -33,7 +32,7 @@
  *
  * @see http://www.geoips.com/en/developer/api-guide
  */
-final class GeoIPs extends AbstractHttpProvider implements Provider, IpAddressGeocoder
+final class GeoIPs extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string
diff --git a/src/Provider/GeoPlugin/GeoPlugin.php b/src/Provider/GeoPlugin/GeoPlugin.php
index 79f0cc448..b147a8fac 100644
--- a/src/Provider/GeoPlugin/GeoPlugin.php
+++ b/src/Provider/GeoPlugin/GeoPlugin.php
@@ -20,13 +20,12 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
-use Geocoder\Provider\IpAddressGeocoder;
 use Geocoder\Provider\Provider;
 
 /**
  * @author Andrea Cristaudo <andrea.cristaudo@gmail.com>
  */
-final class GeoPlugin extends AbstractHttpProvider implements Provider, IpAddressGeocoder
+final class GeoPlugin extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string
diff --git a/src/Provider/Geoip/Geoip.php b/src/Provider/Geoip/Geoip.php
index a491aab16..9c0cc4850 100644
--- a/src/Provider/Geoip/Geoip.php
+++ b/src/Provider/Geoip/Geoip.php
@@ -20,7 +20,6 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Provider\AbstractProvider;
-use Geocoder\Provider\IpAddressGeocoder;
 use Geocoder\Provider\Provider;
 
 /**
@@ -28,7 +27,7 @@
  *
  * @see http://php.net/manual/ref.geoip.php
  */
-final class Geoip extends AbstractProvider implements Provider, IpAddressGeocoder
+final class Geoip extends AbstractProvider implements Provider
 {
     public function __construct()
     {
diff --git a/src/Provider/Geonames/Geonames.php b/src/Provider/Geonames/Geonames.php
index 51bbe3750..763d328d4 100644
--- a/src/Provider/Geonames/Geonames.php
+++ b/src/Provider/Geonames/Geonames.php
@@ -23,14 +23,13 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
-use Geocoder\Provider\LocaleAwareGeocoder;
 use Geocoder\Provider\Provider;
 use Http\Client\HttpClient;
 
 /**
  * @author Giovanni Pirrotta <giovanni.pirrotta@gmail.com>
  */
-final class Geonames extends AbstractHttpProvider implements LocaleAwareGeocoder, Provider
+final class Geonames extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string
diff --git a/src/Provider/GoogleMaps/GoogleMaps.php b/src/Provider/GoogleMaps/GoogleMaps.php
index 824a19bdf..ffc0e5f0c 100644
--- a/src/Provider/GoogleMaps/GoogleMaps.php
+++ b/src/Provider/GoogleMaps/GoogleMaps.php
@@ -23,14 +23,13 @@
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
 use Geocoder\Provider\GoogleMaps\Model\GoogleAddress;
-use Geocoder\Provider\LocaleAwareGeocoder;
 use Geocoder\Provider\Provider;
 use Http\Client\HttpClient;
 
 /**
  * @author William Durand <william.durand1@gmail.com>
  */
-final class GoogleMaps extends AbstractHttpProvider implements LocaleAwareGeocoder, Provider
+final class GoogleMaps extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string
diff --git a/src/Provider/HostIp/HostIp.php b/src/Provider/HostIp/HostIp.php
index 10eec6068..397edc42d 100644
--- a/src/Provider/HostIp/HostIp.php
+++ b/src/Provider/HostIp/HostIp.php
@@ -19,13 +19,12 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
-use Geocoder\Provider\IpAddressGeocoder;
 use Geocoder\Provider\Provider;
 
 /**
  * @author William Durand <william.durand1@gmail.com>
  */
-final class HostIp extends AbstractHttpProvider implements Provider, IpAddressGeocoder
+final class HostIp extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string
diff --git a/src/Provider/IpInfoDb/IpInfoDb.php b/src/Provider/IpInfoDb/IpInfoDb.php
index 7257e3476..887c03a73 100644
--- a/src/Provider/IpInfoDb/IpInfoDb.php
+++ b/src/Provider/IpInfoDb/IpInfoDb.php
@@ -21,14 +21,13 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
-use Geocoder\Provider\IpAddressGeocoder;
 use Geocoder\Provider\Provider;
 use Http\Client\HttpClient;
 
 /**
  * @author William Durand <william.durand1@gmail.com>
  */
-final class IpInfoDb extends AbstractHttpProvider implements Provider, IpAddressGeocoder
+final class IpInfoDb extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string
diff --git a/src/Provider/MaxMind/MaxMind.php b/src/Provider/MaxMind/MaxMind.php
index 6052a8677..e9aea4ddb 100644
--- a/src/Provider/MaxMind/MaxMind.php
+++ b/src/Provider/MaxMind/MaxMind.php
@@ -21,14 +21,13 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
-use Geocoder\Provider\IpAddressGeocoder;
 use Geocoder\Provider\Provider;
 use Http\Client\HttpClient;
 
 /**
  * @author Andrea Cristaudo <andrea.cristaudo@gmail.com>
  */
-final class MaxMind extends AbstractHttpProvider implements Provider, IpAddressGeocoder
+final class MaxMind extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string Country, City, ISP and Organization
diff --git a/src/Provider/MaxMindBinary/MaxMindBinary.php b/src/Provider/MaxMindBinary/MaxMindBinary.php
index 8ec0124fc..55a42aa25 100644
--- a/src/Provider/MaxMindBinary/MaxMindBinary.php
+++ b/src/Provider/MaxMindBinary/MaxMindBinary.php
@@ -21,10 +21,9 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Provider\AbstractProvider;
-use Geocoder\Provider\IpAddressGeocoder;
 use Geocoder\Provider\Provider;
 
-final class MaxMindBinary extends AbstractProvider implements Provider, IpAddressGeocoder
+final class MaxMindBinary extends AbstractProvider implements Provider
 {
     /**
      * @var string
diff --git a/src/Provider/Nominatim/Nominatim.php b/src/Provider/Nominatim/Nominatim.php
index 5480a8c0a..e4650a120 100644
--- a/src/Provider/Nominatim/Nominatim.php
+++ b/src/Provider/Nominatim/Nominatim.php
@@ -21,14 +21,13 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
-use Geocoder\Provider\LocaleAwareGeocoder;
 use Geocoder\Provider\Provider;
 use Http\Client\HttpClient;
 
 /**
  * @author Niklas Närhinen <niklas@narhinen.net>
  */
-final class Nominatim extends AbstractHttpProvider implements LocaleAwareGeocoder, Provider
+final class Nominatim extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string
diff --git a/src/Provider/OpenCage/OpenCage.php b/src/Provider/OpenCage/OpenCage.php
index 99f9bbb86..c64687b0a 100644
--- a/src/Provider/OpenCage/OpenCage.php
+++ b/src/Provider/OpenCage/OpenCage.php
@@ -22,14 +22,13 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
-use Geocoder\Provider\LocaleAwareGeocoder;
 use Geocoder\Provider\Provider;
 use Http\Client\HttpClient;
 
 /**
  * @author mtm <mtm@opencagedata.com>
  */
-final class OpenCage extends AbstractHttpProvider implements LocaleAwareGeocoder, Provider
+final class OpenCage extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string
diff --git a/src/Provider/TomTom/TomTom.php b/src/Provider/TomTom/TomTom.php
index 8c7783f51..f55c08701 100644
--- a/src/Provider/TomTom/TomTom.php
+++ b/src/Provider/TomTom/TomTom.php
@@ -20,14 +20,13 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
-use Geocoder\Provider\LocaleAwareGeocoder;
 use Geocoder\Provider\Provider;
 use Http\Client\HttpClient;
 
 /**
  * @author Antoine Corcy <contact@sbin.dk>
  */
-final class TomTom extends AbstractHttpProvider implements LocaleAwareGeocoder, Provider
+final class TomTom extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string
diff --git a/src/Provider/Yandex/Yandex.php b/src/Provider/Yandex/Yandex.php
index cfb05b8a9..d958769fb 100644
--- a/src/Provider/Yandex/Yandex.php
+++ b/src/Provider/Yandex/Yandex.php
@@ -20,14 +20,13 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Http\Provider\AbstractHttpProvider;
-use Geocoder\Provider\LocaleAwareGeocoder;
 use Geocoder\Provider\Provider;
 use Http\Client\HttpClient;
 
 /**
  * @author Antoine Corcy <contact@sbin.dk>
  */
-final class Yandex extends AbstractHttpProvider implements LocaleAwareGeocoder, Provider
+final class Yandex extends AbstractHttpProvider implements Provider
 {
     /**
      * @var string