diff --git a/core/unifi/devices.go b/core/unifi/devices.go
index 5a3a468f..35003694 100644
--- a/core/unifi/devices.go
+++ b/core/unifi/devices.go
@@ -140,7 +140,6 @@ func (u *Unifi) unmarshallUAP(site *Site, payload json.RawMessage, devices *Devi
 	dev := &UAP{SiteName: site.Name, SourceName: u.URL}
 	if u.unmarshalDevice("uap", payload, dev) == nil {
 		dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac))
-		dev.controller = u
 		dev.site = site
 		devices.UAPs = append(devices.UAPs, dev)
 	}
@@ -150,7 +149,6 @@ func (u *Unifi) unmarshallUSG(site *Site, payload json.RawMessage, devices *Devi
 	dev := &USG{SiteName: site.Name, SourceName: u.URL}
 	if u.unmarshalDevice("ugw", payload, dev) == nil {
 		dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac))
-		dev.controller = u
 		dev.site = site
 		devices.USGs = append(devices.USGs, dev)
 	}
@@ -160,7 +158,6 @@ func (u *Unifi) unmarshallUSW(site *Site, payload json.RawMessage, devices *Devi
 	dev := &USW{SiteName: site.Name, SourceName: u.URL}
 	if u.unmarshalDevice("usw", payload, dev) == nil {
 		dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac))
-		dev.controller = u
 		dev.site = site
 		devices.USWs = append(devices.USWs, dev)
 	}
@@ -170,7 +167,6 @@ func (u *Unifi) unmarshallUXG(site *Site, payload json.RawMessage, devices *Devi
 	dev := &UXG{SiteName: site.Name, SourceName: u.URL}
 	if u.unmarshalDevice("uxg", payload, dev) == nil {
 		dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac))
-		dev.controller = u
 		dev.site = site
 		devices.UXGs = append(devices.UXGs, dev)
 	}
@@ -180,7 +176,6 @@ func (u *Unifi) unmarshallUDM(site *Site, payload json.RawMessage, devices *Devi
 	dev := &UDM{SiteName: site.Name, SourceName: u.URL}
 	if u.unmarshalDevice("udm", payload, dev) == nil {
 		dev.Name = strings.TrimSpace(pick(dev.Name, dev.Mac))
-		dev.controller = u
 		dev.site = site
 		devices.UDMs = append(devices.UDMs, dev)
 	}
diff --git a/core/unifi/uap.go b/core/unifi/uap.go
index dcca4ae8..5a104607 100644
--- a/core/unifi/uap.go
+++ b/core/unifi/uap.go
@@ -9,7 +9,6 @@ import (
 // This was auto generated then edited by hand to get all the data types right.
 type UAP struct {
 	site         *Site
-	controller   *Unifi
 	SourceName   string   `json:"-"`
 	ID           string   `json:"_id"`
 	Adopted      FlexBool `json:"adopted"`
diff --git a/core/unifi/udm.go b/core/unifi/udm.go
index fcc5ef4d..547c5f0e 100644
--- a/core/unifi/udm.go
+++ b/core/unifi/udm.go
@@ -4,7 +4,6 @@ package unifi
 // The UDM shares several structs/type-data with USW and USG.
 type UDM struct {
 	site                   *Site
-	controller             *Unifi
 	SourceName             string               `json:"-"`
 	SiteID                 string               `json:"site_id"`
 	SiteName               string               `json:"-"`
diff --git a/core/unifi/usg.go b/core/unifi/usg.go
index a8c21008..a718c7b0 100644
--- a/core/unifi/usg.go
+++ b/core/unifi/usg.go
@@ -8,7 +8,6 @@ import (
 // USG represents all the data from the Ubiquiti Controller for a Unifi Security Gateway.
 type USG struct {
 	site                  *Site
-	controller            *Unifi
 	SourceName            string               `json:"-"`
 	ID                    string               `json:"_id"`
 	Adopted               FlexBool             `json:"adopted"`
diff --git a/core/unifi/usw.go b/core/unifi/usw.go
index b8500005..677ee520 100644
--- a/core/unifi/usw.go
+++ b/core/unifi/usw.go
@@ -8,7 +8,6 @@ import (
 // USW represents all the data from the Ubiquiti Controller for a Unifi Switch.
 type USW struct {
 	site                 *Site
-	controller           *Unifi
 	SourceName           string           `json:"-"`
 	SiteName             string           `json:"-"`
 	ID                   string           `json:"_id"`
diff --git a/core/unifi/uxg.go b/core/unifi/uxg.go
index 24ced7e6..ddd6c5b5 100644
--- a/core/unifi/uxg.go
+++ b/core/unifi/uxg.go
@@ -4,7 +4,6 @@ package unifi
 // The UDM shares several structs/type-data with USW and USG.
 type UXG struct {
 	site                       *Site
-	controller                 *Unifi
 	SourceName                 string                  `json:"-"`
 	SiteName                   string                  `json:"-"`
 	ID                         string                  `json:"_id"`