diff --git a/source/_components/ups.markdown b/source/_components/ups.markdown
deleted file mode 100644
index 9a1c385bcd6..00000000000
--- a/source/_components/ups.markdown
+++ /dev/null
@@ -1,59 +0,0 @@
----
-title: UPS Sensor
-description: "Instructions on how to set up UPS sensors within Home Assistant."
-logo: ups.png
-ha_category:
- - Postal Service
-ha_release: 0.39
-ha_iot_class: Cloud Polling
-redirect_from:
- - /components/sensor.ups/
----
-
-
-
-This integration is deprecated and will be removed in Home Assistant 0.100.0.
-
-For more information see [Architecture Decision Record: 0004](https://github.com/home-assistant/architecture/blob/master/adr/0004-webscraping.md).
-
-
-
-The `ups` platform allows one to track deliveries by the [UPS](https://www.ups.com/). To use this sensor, you need a [My UPS Account](https://www.ups.com/mychoice).
-
-## Configuration
-
-To enable this sensor, add the following lines to your `configuration.yaml`:
-
-```yaml
-# Example configuration.yaml entry
-sensor:
- - platform: ups
- username: YOUR_USERNAME
- password: YOUR_PASSWORD
-```
-
-Configuration options for the UPS Sensor:
-
-- **username** (*Required*): The username to access the UPS My Choice service.
-- **password** (*Required*): The password for the given username.
-- **name** (*Optional*): Name the sensor.
-- **scan_inverval** (*Optional*): Minimum time interval between updates. Default is 1 hour. Supported formats:
- - `scan_interval: 'HH:MM:SS'`
- - `scan_interval: 'HH:MM'`
- - Time period dictionary, e.g.:
- scan_interval:
- # At least one of these must be specified:
- days: 0
- hours: 0
- minutes: 3
- seconds: 30
- milliseconds: 0
-
-
-
-The UPS sensor logs into the UPS My Choice website to scrape package data. It does not use an API. Use at your own risk.
-
-
-
-If the UPS sensor is throwing an error about not being able to login to the UPS My Choice website, it's likely because there is a new UPS Technology Agreement (UTA) preventing the scraper from accessing the package data. Login to UPS My Choice manually and accept the UTA to resolve this.
-
diff --git a/source/_posts/2017-02-25-config-panel-and-state-restoration.markdown b/source/_posts/2017-02-25-config-panel-and-state-restoration.markdown
index a71496711bd..06a3b70afcd 100644
--- a/source/_posts/2017-02-25-config-panel-and-state-restoration.markdown
+++ b/source/_posts/2017-02-25-config-panel-and-state-restoration.markdown
@@ -115,7 +115,7 @@ And a final shout out to [Pascal][@pvizeli]. He keeps improving the performance
- [Telegram] webhooks ([@scipioni])
- Added [Openhome][openhome] support ([@bazwilliams])
-- [UPS][ups] sensor ([@happyleavesaoc])
+- UPS sensor ([@happyleavesaoc])
- [FEDex][fedex] sensor ([@happyleavesaoc])
- [Gstreamer][gstreamer] media player ([@happyleavesaoc])
- [iTach Remote][itach] Platform ([@alanfischer])
@@ -286,7 +286,6 @@ Experiencing issues introduced by this release? Please report them in our [issue
[telegram]: /components/webhooks/
[pushsafer]: /components/notify.pushsafer/
[openhome]: /components/media_player.openhome/
-[ups]: /components/sensor.ups/
[fedex]: /components/sensor.fedex/
[fido]: /components/sensor.fido/
[gstreamer]: /components/media_player.gstreamer/
diff --git a/source/_posts/2017-04-22-ikea-tradfri--spotify.markdown b/source/_posts/2017-04-22-ikea-tradfri--spotify.markdown
index d2721040083..55451d8171f 100644
--- a/source/_posts/2017-04-22-ikea-tradfri--spotify.markdown
+++ b/source/_posts/2017-04-22-ikea-tradfri--spotify.markdown
@@ -138,7 +138,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
- Replace 'vendor_id' with 'arch' (fixes #7003) ([@fabaff] - [#7023])
- more tests for slugify ([@micw] - [#7027])
- Additional ZWave coverage ([@armills] - [#7024]) ([zwave docs])
-- bump ups version ([@happyleavesaoc] - [#7033]) ([sensor.ups docs])
+- bump ups version ([@happyleavesaoc] - [#7033])
- update usps version ([@happyleavesaoc] - [#7035]) ([sensor.usps docs])
- update fedex ([@happyleavesaoc] - [#7034]) ([sensor.fedex docs])
- Google TTS can't read percent sign (#6971) ([@pezinek] - [#7030]) ([tts.google docs])
@@ -467,7 +467,6 @@ Experiencing issues introduced by this release? Please report them in our [issue
[sensor.qnap docs]: /components/sensor.qnap/
[sensor.speedtest docs]: /components/sensor.speedtest/
[sensor.systemmonitor docs]: /components/sensor.systemmonitor/
-[sensor.ups docs]: /components/sensor.ups/
[sensor.usps docs]: /components/sensor.usps/
[sensor.vera docs]: /components/sensor.vera/
[sun docs]: /components/sun/
diff --git a/source/_posts/2017-06-17-release-47.markdown b/source/_posts/2017-06-17-release-47.markdown
index 88e66b3c131..aa7410a1fe8 100644
--- a/source/_posts/2017-06-17-release-47.markdown
+++ b/source/_posts/2017-06-17-release-47.markdown
@@ -272,7 +272,7 @@ automation:
- Fix EntityComponent handle entities without a name ([@balloob] - [#8065])
- Update pyunifi component to use APIError passed from pyunifi 2.13. Better accommodate login failures with wrapper in pyunifi 2.13. ([@finish06] - [#7899]) ([device_tracker.unifi docs])
- bump usps version ([@happyleavesaoc] - [#8074]) ([sensor.usps docs])
-- bump ups ([@happyleavesaoc] - [#8075]) ([sensor.ups docs])
+- bump ups ([@happyleavesaoc] - [#8075])
[#7152]: https://github.com/home-assistant/home-assistant/pull/7152
[#7318]: https://github.com/home-assistant/home-assistant/pull/7318
@@ -538,7 +538,6 @@ automation:
[sensor.snmp docs]: /components/sensor.snmp/
[sensor.statistics docs]: /components/sensor.statistics/
[sensor.template docs]: /components/sensor.template/
-[sensor.ups docs]: /components/sensor.ups/
[sensor.usps docs]: /components/sensor.usps/
[sensor.waqi docs]: /components/sensor.waqi/
[sensor.wunderground docs]: /components/sensor.wunderground/
diff --git a/source/_posts/2017-07-02-release-48.markdown b/source/_posts/2017-07-02-release-48.markdown
index ac9cc2897b6..b79e876f515 100644
--- a/source/_posts/2017-07-02-release-48.markdown
+++ b/source/_posts/2017-07-02-release-48.markdown
@@ -131,7 +131,7 @@ light:
- Add initial support for Shiftr.io ([@fabaff] - [#7974]) ([shiftr docs]) (new-platform)
- Add option to set language of openweathermap sensor, and handle updating errors ([@azogue] - [#8046]) ([sensor.openweathermap docs])
- Bump pyEmby version to account for API changes ([@mezz64] - [#8070]) ([media_player.emby docs])
-- bump ups ([@happyleavesaoc] - [#8075]) ([sensor.ups docs])
+- bump ups ([@happyleavesaoc] - [#8075])
- bump usps version ([@happyleavesaoc] - [#8074]) ([sensor.usps docs])
- Add to zwave services descriptions ([@andrey-git] - [#8072])
- Fix attribute entity ([@pvizeli] - [#8066]) (breaking change)
@@ -496,7 +496,6 @@ light:
[sensor.openweathermap docs]: /components/sensor.openweathermap/
[sensor.pi_hole docs]: /components/sensor.pi_hole/
[sensor.upnp docs]: /components/sensor.upnp/
-[sensor.ups docs]: /components/sensor.ups/
[sensor.usps docs]: /components/sensor.usps/
[sensor.verisure docs]: /components/sensor.verisure/
[sensor.wunderground docs]: /components/sensor.wunderground/
diff --git a/source/_posts/2017-10-07-release-55.markdown b/source/_posts/2017-10-07-release-55.markdown
index c36885896ab..67ef95a5833 100644
--- a/source/_posts/2017-10-07-release-55.markdown
+++ b/source/_posts/2017-10-07-release-55.markdown
@@ -105,7 +105,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
- Upgrade Sphinx to 1.6.4 ([@fabaff] - [#9584])
- Bump pyatv to 0.3.5 ([@postlund] - [#9586]) ([apple_tv docs]) ([media_player.apple_tv docs])
- New Wink services. pair new device, rename, and delete, add new lock key code. Add water heater support ([@w1ll1am23] - [#9303]) ([wink docs]) ([binary_sensor.wink docs]) ([lock.wink docs]) (breaking change)
-- Fixes UPS MyChoice exception ([@bachya] - [#9587]) ([sensor.ups docs])
+- Fixes UPS MyChoice exception ([@bachya] - [#9587])
- FedEx: Adds "packages" as a unit ([@bachya] - [#9588]) ([sensor.fedex docs])
- Cleanup entity & remove warning ([@pvizeli] - [#9606])
- Add OwnTracks over HTTP ([@balloob] - [#9582]) ([http docs]) ([device_tracker.owntracks docs]) ([device_tracker.owntracks_http docs]) (new-platform)
@@ -369,7 +369,6 @@ Experiencing issues introduced by this release? Please report them in our [issue
[sensor.systemmonitor docs]: /components/sensor.systemmonitor/
[sensor.thethingsnetwork docs]: /components/sensor.thethingsnetwork/
[sensor.tibber docs]: /components/sensor.tibber/
-[sensor.ups docs]: /components/sensor.ups/
[sensor.usps docs]: /components/sensor.usps/
[sensor.vera docs]: /components/sensor.vera/
[sensor.wunderground docs]: /components/sensor.wunderground/
diff --git a/source/_posts/2019-08-28-release-98.markdown b/source/_posts/2019-08-28-release-98.markdown
index fa2c075c2ae..3afa6a8cabd 100644
--- a/source/_posts/2019-08-28-release-98.markdown
+++ b/source/_posts/2019-08-28-release-98.markdown
@@ -220,7 +220,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
Integrations which make use of web scraping and are pending for removal in Home Assistant 0.100.0 [ADR-004](https://github.com/home-assistant/architecture/blob/master/adr/0004-webscraping.md):
- **USPS** - ([@frenck] - [#25743]) ([usps docs])
- **SYTADIN** - ([@frenck] - [#25742])
- - **UPS** - ([@frenck] - [#25746]) ([ups docs])
+ - **UPS** - ([@frenck] - [#25746])
- **FEDEX** - ([@frenck] - [#25745]) ([fedex docs])
- **SRP Energy** - ([@frenck] - [#25754])
- **Linksys AP** - ([@frenck] - [#25804])
@@ -349,7 +349,7 @@ anymore. - ([@abmantis] - [#25971])
- Manufacturer specific channel for SmartThings. ([@Adminiuga] - [#25739]) ([zha docs])
- Deprecates usps integration (ADR-0004) ([@frenck] - [#25743]) ([usps docs]) (breaking change)
- Deprecates sytadin integration (ADR-0004) ([@frenck] - [#25742]) (breaking change)
-- Deprecates ups integration (ADR-0004) ([@frenck] - [#25746]) ([ups docs]) (breaking change)
+- Deprecates ups integration (ADR-0004) ([@frenck] - [#25746]) (breaking change)
- Deprecates fedex integration (ADR-0004) ([@frenck] - [#25745]) ([fedex docs]) (breaking change)
- Deprecates srp_energy integration (ADR-0004) ([@frenck] - [#25754]) (breaking change)
- Updater component is always available and shows on/off depending on whether an update is available or not ([@Santobert] - [#25418]) ([updater docs]) (breaking change)
@@ -877,7 +877,6 @@ anymore. - ([@abmantis] - [#25971])
[unifi docs]: /components/unifi/
[updater docs]: /components/updater/
[upnp docs]: /components/upnp/
-[ups docs]: /components/ups/
[usps docs]: /components/usps/
[vacuum docs]: /components/vacuum/
[velbus docs]: /components/velbus/
diff --git a/source/images/supported_brands/ups.png b/source/images/supported_brands/ups.png
deleted file mode 100644
index 83a19d196b0..00000000000
Binary files a/source/images/supported_brands/ups.png and /dev/null differ