diff --git a/src/lib/upnp/ContentDirectoryService.cxx b/src/lib/upnp/ContentDirectoryService.cxx
index 3d3f157c3..d6d09aebd 100644
--- a/src/lib/upnp/ContentDirectoryService.cxx
+++ b/src/lib/upnp/ContentDirectoryService.cxx
@@ -19,17 +19,17 @@
 
 #include <upnptools.h>
 
+using std::string_view_literals::operator""sv;
+
 ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device,
 						 const UPnPService &service) noexcept
 	:m_actionURL(uri_apply_base(service.controlURL, device.URLBase)),
 	 m_serviceType(service.serviceType),
 	 m_deviceId(device.UDN),
 	 m_friendlyName(device.friendlyName),
-	 m_manufacturer(device.manufacturer),
-	 m_modelName(device.modelName),
 	 m_rdreqcnt(200)
 {
-	if (m_modelName == "MediaTomb") {
+	if (device.modelName == "MediaTomb"sv) {
 		// Readdir by 200 entries is good for most, but MediaTomb likes
 		// them really big. Actually 1000 is better but I don't dare
 		m_rdreqcnt = 500;
diff --git a/src/lib/upnp/ContentDirectoryService.hxx b/src/lib/upnp/ContentDirectoryService.hxx
index a6eb544be..7ce9a5087 100644
--- a/src/lib/upnp/ContentDirectoryService.hxx
+++ b/src/lib/upnp/ContentDirectoryService.hxx
@@ -34,8 +34,6 @@ class ContentDirectoryService {
 	std::string m_serviceType;
 	std::string m_deviceId;
 	std::string m_friendlyName;
-	std::string m_manufacturer;
-	std::string m_modelName;
 
 	int m_rdreqcnt; // Slice size to use when reading