diff --git a/providers/beamng/beamng.go b/providers/beamng/beamng.go
index faf2b97..d653073 100644
--- a/providers/beamng/beamng.go
+++ b/providers/beamng/beamng.go
@@ -67,47 +67,12 @@ func NewBeamNGProvider(ip string, port int) (*BeamNG, error) {
 		telemetry.ParkingBrakeLight: provider.handbrakeLight,
 		telemetry.TCLight:           provider.tcLight,
 		telemetry.BatteryLight:      provider.batteryLight,
-		// Adjustements
-		telemetry.BrakeBias:       provider.unused,
-		telemetry.ABSSetting:      provider.unused,
-		telemetry.TCSetting:       provider.unused,
-		telemetry.ThrottleSetting: provider.unused,
-		// Lap Data
-		telemetry.LapLastLapTime: provider.unused,
-		telemetry.LapNumber:      provider.unused,
-		// Tire Data
-		telemetry.LFtempL: provider.unused,
-		telemetry.LFtempM: provider.unused,
-		telemetry.LFtempR: provider.unused,
-		telemetry.RFtempL: provider.unused,
-		telemetry.RFtempM: provider.unused,
-		telemetry.RFtempR: provider.unused,
-		telemetry.LRtempL: provider.unused,
-		telemetry.LRtempM: provider.unused,
-		telemetry.LRtempR: provider.unused,
-		telemetry.RRtempL: provider.unused,
-		telemetry.RRtempM: provider.unused,
-		telemetry.RRtempR: provider.unused,
-		// Session Data
-		telemetry.SessionTime:       provider.unused,
-		telemetry.ReplaySessionTime: provider.unused,
-		telemetry.Empty:             provider.unused,
-		// Virtual Fields -- fields derived from primitive fields
-		// RPM Dash Lights
-		telemetry.RPMStateColour: provider.unused,
-		// Fuel Calculator
-		telemetry.FCCurrentLap:   provider.unused,
-		telemetry.FCLastLap:      provider.unused,
-		telemetry.FCAverage:      provider.unused,
-		telemetry.FCExpectedLaps: provider.unused,
 	}
 
+	// Set the unset telemetry fields on the updaters as unused fields
 	for k := range int(telemetry.MaxFields) {
-		// One by one so you won't forget it next time
 		if provider.updaters[k] == nil {
-			msg := fmt.Sprintf("BeamNG updaters aren't all assigned. Currently unassgined: %s",
-				telemetry.FieldNames[k])
-			panic(msg)
+			provider.updaters[k] = provider.unused
 		}
 	}
 
diff --git a/telemetry/data.go b/telemetry/data.go
index 99d72b3..5c3ec38 100644
--- a/telemetry/data.go
+++ b/telemetry/data.go
@@ -29,13 +29,11 @@ type VirtualField interface {
 
 // BoundField is the data structure we use to bind the telemetry provider's data
 // to our internal telemetry fields
-// NOTE: we must deprecate the `Key` member. We used it to map the internal
-// telemetry fields to the providers name. But we shouldn't be using `string` keys.
 type BoundField struct {
-	Key       string // to be deprecated
+	Key       string // NOTE: to be deprecated
 	ID        FieldID
-	Fetch     func() any                 // to be deprecated
-	Transform func(any, *TelemetryField) // to be deprecated
+	Fetch     func() any                 // NOTE: to be deprecated
+	Transform func(any, *TelemetryField) // NOTE: to be deprecated
 	Update    func(out *TelemetryField)
 }