diff --git a/vehicle/kamereon/api.go b/vehicle/kamereon/api.go
index 1bff4a722..e3f3538a6 100644
--- a/vehicle/kamereon/api.go
+++ b/vehicle/kamereon/api.go
@@ -84,10 +84,7 @@ func (v *API) FinishTime() (time.Time, error) {
 	res, err := v.apiG()
 
 	if res, ok := res.(Response); err == nil && ok {
-		var timestamp time.Time
-		if err == nil {
-			timestamp, err = time.Parse(time.RFC3339, res.Data.Attributes.Timestamp)
-		}
+		timestamp, err := time.Parse(time.RFC3339, res.Data.Attributes.Timestamp)
 
 		if res.Data.Attributes.RemainingTime == nil {
 			return time.Time{}, api.ErrNotAvailable
diff --git a/vehicle/renault.go b/vehicle/renault.go
index 059a8b9fa..a4cefb5f3 100644
--- a/vehicle/renault.go
+++ b/vehicle/renault.go
@@ -359,10 +359,7 @@ func (v *Renault) FinishTime() (time.Time, error) {
 	res, err := v.apiG()
 
 	if res, ok := res.(kamereonResponse); err == nil && ok {
-		var timestamp time.Time
-		if err == nil {
-			timestamp, err = time.Parse(time.RFC3339, res.Data.Attributes.Timestamp)
-		}
+		timestamp, err := time.Parse(time.RFC3339, res.Data.Attributes.Timestamp)
 
 		if res.Data.Attributes.RemainingTime == nil {
 			return time.Time{}, api.ErrNotAvailable
diff --git a/vehicle/volvo.go b/vehicle/volvo.go
index 4454c2b10..7320d334b 100644
--- a/vehicle/volvo.go
+++ b/vehicle/volvo.go
@@ -169,7 +169,7 @@ func (v *Volvo) vehicles() ([]string, error) {
 	return vehicles, err
 }
 
-func (v *Volvo) status() (volvoStatus, error) {
+func (v *Volvo) status() (interface{}, error) {
 	var res volvoStatus
 
 	req, err := v.request(fmt.Sprintf("%s/vehicles/%s/status", volvoAPI, v.vin))
@@ -199,3 +199,14 @@ func (v *Volvo) VehicleRange() (int64, error) {
 
 	return 0, err
 }
+
+// // FinishTime implements the ChargeFinishTimer interface
+// func (v *Volvo) FinishTime() (time.Time, error) {
+// 	res, err := v.statusG()
+// 	if res, ok := res.(volvoStatus); err == nil && ok {
+// 		timestamp, err := time.Parse(time.RFC3339, res.HvBattery.TimeToHVBatteryFullyChargedTimestamp)
+// 		return timestamp.Add(time.Duration(res.HvBattery.DistanceToHVBatteryEmpty) * time.Minute), err
+// 	}
+
+// 	return time.Time{}, err
+// }
diff --git a/vehicle/vw/provider.go b/vehicle/vw/provider.go
index 817b123bb..295732c15 100644
--- a/vehicle/vw/provider.go
+++ b/vehicle/vw/provider.go
@@ -65,9 +65,7 @@ func (v *Provider) FinishTime() (time.Time, error) {
 			return time.Time{}, api.ErrNotAvailable
 		}
 
-		var timestamp time.Time
-		timestamp, err = time.Parse(time.RFC3339, rct.Timestamp)
-
+		timestamp, err := time.Parse(time.RFC3339, rct.Timestamp)
 		return timestamp.Add(time.Duration(rct.Content) * time.Minute), err
 	}