diff --git a/charger/ocpp/cp_core.go b/charger/ocpp/cp_core.go
index 5635ad50a1..0fd49d128e 100644
--- a/charger/ocpp/cp_core.go
+++ b/charger/ocpp/cp_core.go
@@ -4,7 +4,6 @@ import (
 	"errors"
 
 	"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
-	"github.com/lorenzodonini/ocpp-go/ocpp1.6/firmware"
 	"github.com/lorenzodonini/ocpp-go/ocpp1.6/types"
 )
 
@@ -14,16 +13,6 @@ var (
 	ErrInvalidTransaction = errors.New("invalid transaction")
 )
 
-func (cp *CP) OnAuthorize(request *core.AuthorizeRequest) (*core.AuthorizeConfirmation, error) {
-	res := &core.AuthorizeConfirmation{
-		IdTagInfo: &types.IdTagInfo{
-			Status: types.AuthorizationStatusAccepted,
-		},
-	}
-
-	return res, nil
-}
-
 func (cp *CP) OnBootNotification(request *core.BootNotificationRequest) (*core.BootNotificationConfirmation, error) {
 	res := &core.BootNotificationConfirmation{
 		CurrentTime: types.Now(),
@@ -38,14 +27,6 @@ func (cp *CP) OnBootNotification(request *core.BootNotificationRequest) (*core.B
 	return res, nil
 }
 
-func (cp *CP) OnDiagnosticStatusNotification(request *firmware.DiagnosticsStatusNotificationRequest) (*firmware.DiagnosticsStatusNotificationConfirmation, error) {
-	return new(firmware.DiagnosticsStatusNotificationConfirmation), nil
-}
-
-func (cp *CP) OnFirmwareStatusNotification(request *firmware.FirmwareStatusNotificationRequest) (*firmware.FirmwareStatusNotificationConfirmation, error) {
-	return new(firmware.FirmwareStatusNotificationConfirmation), nil
-}
-
 func (cp *CP) OnStatusNotification(request *core.StatusNotificationRequest) (*core.StatusNotificationConfirmation, error) {
 	if request == nil {
 		return nil, ErrInvalidRequest
@@ -58,22 +39,6 @@ func (cp *CP) OnStatusNotification(request *core.StatusNotificationRequest) (*co
 	return new(core.StatusNotificationConfirmation), nil
 }
 
-func (cp *CP) OnDataTransfer(request *core.DataTransferRequest) (*core.DataTransferConfirmation, error) {
-	res := &core.DataTransferConfirmation{
-		Status: core.DataTransferStatusAccepted,
-	}
-
-	return res, nil
-}
-
-func (cp *CP) OnHeartbeat(request *core.HeartbeatRequest) (*core.HeartbeatConfirmation, error) {
-	res := &core.HeartbeatConfirmation{
-		CurrentTime: types.Now(),
-	}
-
-	return res, nil
-}
-
 func (cp *CP) OnMeterValues(request *core.MeterValuesRequest) (*core.MeterValuesConfirmation, error) {
 	if request == nil {
 		return nil, ErrInvalidRequest
diff --git a/charger/ocpp/cs_core.go b/charger/ocpp/cs_core.go
index ecc6d1048f..35c5264813 100644
--- a/charger/ocpp/cs_core.go
+++ b/charger/ocpp/cs_core.go
@@ -2,19 +2,21 @@ package ocpp
 
 import (
 	"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
-	"github.com/lorenzodonini/ocpp-go/ocpp1.6/firmware"
 	"github.com/lorenzodonini/ocpp-go/ocpp1.6/types"
 )
 
 // cp actions
 
 func (cs *CS) OnAuthorize(id string, request *core.AuthorizeRequest) (*core.AuthorizeConfirmation, error) {
-	cp, err := cs.ChargepointByID(id)
-	if err != nil {
-		return nil, err
+	// no cp handler
+
+	res := &core.AuthorizeConfirmation{
+		IdTagInfo: &types.IdTagInfo{
+			Status: types.AuthorizationStatusAccepted,
+		},
 	}
 
-	return cp.OnAuthorize(request)
+	return res, nil
 }
 
 func (cs *CS) OnBootNotification(id string, request *core.BootNotificationRequest) (*core.BootNotificationConfirmation, error) {
@@ -32,21 +34,23 @@ func (cs *CS) OnBootNotification(id string, request *core.BootNotificationReques
 }
 
 func (cs *CS) OnDataTransfer(id string, request *core.DataTransferRequest) (*core.DataTransferConfirmation, error) {
-	cp, err := cs.ChargepointByID(id)
-	if err != nil {
-		return nil, err
+	// no cp handler
+
+	res := &core.DataTransferConfirmation{
+		Status: core.DataTransferStatusAccepted,
 	}
 
-	return cp.OnDataTransfer(request)
+	return res, nil
 }
 
 func (cs *CS) OnHeartbeat(id string, request *core.HeartbeatRequest) (*core.HeartbeatConfirmation, error) {
-	cp, err := cs.ChargepointByID(id)
-	if err != nil {
-		return nil, err
+	// no cp handler
+
+	res := &core.HeartbeatConfirmation{
+		CurrentTime: types.Now(),
 	}
 
-	return cp.OnHeartbeat(request)
+	return res, nil
 }
 
 func (cs *CS) OnMeterValues(id string, request *core.MeterValuesRequest) (*core.MeterValuesConfirmation, error) {
@@ -92,21 +96,3 @@ func (cs *CS) OnStopTransaction(id string, request *core.StopTransactionRequest)
 
 	return res, nil
 }
-
-func (cs *CS) OnDiagnosticsStatusNotification(id string, request *firmware.DiagnosticsStatusNotificationRequest) (confirmation *firmware.DiagnosticsStatusNotificationConfirmation, err error) {
-	cp, err := cs.ChargepointByID(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return cp.OnDiagnosticStatusNotification(request)
-}
-
-func (cs *CS) OnFirmwareStatusNotification(id string, request *firmware.FirmwareStatusNotificationRequest) (confirmation *firmware.FirmwareStatusNotificationConfirmation, err error) {
-	cp, err := cs.ChargepointByID(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return cp.OnFirmwareStatusNotification(request)
-}