diff --git a/controller/nucleus/principalNetworkDomain.go b/controller/nucleus/principalNetworkDomain.go
index 871bab11b97def0f749bb19ae768c3e3d4312757..af588ae77bc6383d2aaba920c1b27a3f18807108 100644
--- a/controller/nucleus/principalNetworkDomain.go
+++ b/controller/nucleus/principalNetworkDomain.go
@@ -278,15 +278,7 @@ func (pnd *pndImplementation) GetDevice(identifier string) (device.Device, error
 		return nil, err
 	}
 
-	// TODO: We should investigate why we copy the device here.
-	copiedDevice := &CommonDevice{
-		name:  d.Name(),
-		UUID:  d.ID(),
-		Model: d.GetModel(),
-		sbi:   d.SBI(),
-	}
-
-	return copiedDevice, nil
+	return d, nil
 }
 
 // RemoveDevice removes a device from the PND