Remove in two cases were it wasn't used anymore, and update one to a newer version that doesn't use it anymore. Upstream is deprecated, so unlikely we will get new users for this.
Remove in two cases were it wasn't used anymore, and update one to a newer version that doesn't use it anymore. Upstream is deprecated, so unlikely we will get new users for this.