You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/03/07 16:03:20 UTC

[plc4x] branch develop updated: refactor(plc4go/codegen): removed superfluous methods

This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new e413f26  refactor(plc4go/codegen): removed superfluous methods
e413f26 is described below

commit e413f2682915457b3300c0d3cba9883040b97555
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Mon Mar 7 17:03:09 2022 +0100

    refactor(plc4go/codegen): removed superfluous methods
---
 .../resources/templates/go/model-template.go.ftlh  | 25 ----------------------
 .../model/CIPEncapsulationConnectionRequest.go     |  4 ----
 .../model/CIPEncapsulationConnectionResponse.go    |  4 ----
 .../readwrite/model/CIPEncapsulationReadRequest.go |  4 ----
 .../model/CIPEncapsulationReadResponse.go          |  4 ----
 .../readwrite/model/DF1CommandRequestMessage.go    |  4 ----
 ...mandResponseMessageProtectedTypedLogicalRead.go |  4 ----
 .../model/DF1RequestProtectedTypedLogicalRead.go   |  4 ----
 .../model/AdsAddDeviceNotificationRequest.go       |  8 -------
 .../model/AdsAddDeviceNotificationResponse.go      |  8 -------
 .../model/AdsDeleteDeviceNotificationRequest.go    |  8 -------
 .../model/AdsDeleteDeviceNotificationResponse.go   |  8 -------
 .../model/AdsDeviceNotificationRequest.go          |  8 -------
 .../model/AdsDeviceNotificationResponse.go         |  8 -------
 .../ads/readwrite/model/AdsInvalidRequest.go       |  8 -------
 .../ads/readwrite/model/AdsInvalidResponse.go      |  8 -------
 .../ads/readwrite/model/AdsMultiRequestItemRead.go |  4 ----
 .../model/AdsMultiRequestItemReadWrite.go          |  4 ----
 .../readwrite/model/AdsMultiRequestItemWrite.go    |  4 ----
 .../readwrite/model/AdsReadDeviceInfoRequest.go    |  8 -------
 .../readwrite/model/AdsReadDeviceInfoResponse.go   |  8 -------
 .../plc4go/ads/readwrite/model/AdsReadRequest.go   |  8 -------
 .../plc4go/ads/readwrite/model/AdsReadResponse.go  |  8 -------
 .../ads/readwrite/model/AdsReadStateRequest.go     |  8 -------
 .../ads/readwrite/model/AdsReadStateResponse.go    |  8 -------
 .../ads/readwrite/model/AdsReadWriteRequest.go     |  8 -------
 .../ads/readwrite/model/AdsReadWriteResponse.go    |  8 -------
 .../ads/readwrite/model/AdsWriteControlRequest.go  |  8 -------
 .../ads/readwrite/model/AdsWriteControlResponse.go |  8 -------
 .../plc4go/ads/readwrite/model/AdsWriteRequest.go  |  8 -------
 .../plc4go/ads/readwrite/model/AdsWriteResponse.go |  8 -------
 .../plc4go/bacnetip/readwrite/model/APDUAbort.go   |  4 ----
 .../bacnetip/readwrite/model/APDUComplexAck.go     |  4 ----
 .../readwrite/model/APDUConfirmedRequest.go        |  4 ----
 .../plc4go/bacnetip/readwrite/model/APDUError.go   |  4 ----
 .../plc4go/bacnetip/readwrite/model/APDUReject.go  |  4 ----
 .../bacnetip/readwrite/model/APDUSegmentAck.go     |  4 ----
 .../bacnetip/readwrite/model/APDUSimpleAck.go      |  4 ----
 .../readwrite/model/APDUUnconfirmedRequest.go      |  4 ----
 .../plc4go/bacnetip/readwrite/model/APDUUnknown.go |  4 ----
 .../bacnetip/readwrite/model/BACnetClosingTag.go   |  4 ----
 .../BACnetConfirmedServiceACKAtomicReadFile.go     |  4 ----
 .../BACnetConfirmedServiceACKAtomicWriteFile.go    |  4 ----
 ...tConfirmedServiceACKConfirmedPrivateTransfer.go |  4 ----
 .../model/BACnetConfirmedServiceACKCreateObject.go |  4 ----
 .../BACnetConfirmedServiceACKGetAlarmSummary.go    |  4 ----
 ...ACnetConfirmedServiceACKGetEnrollmentSummary.go |  4 ----
 ...BACnetConfirmedServiceACKGetEventInformation.go |  4 ----
 .../model/BACnetConfirmedServiceACKReadProperty.go |  4 ----
 ...ACnetConfirmedServiceACKReadPropertyMultiple.go |  4 ----
 .../model/BACnetConfirmedServiceACKReadRange.go    |  4 ----
 ...BACnetConfirmedServiceACKRemovedAuthenticate.go |  4 ----
 ...rmedServiceACKRemovedReadPropertyConditional.go |  4 ----
 .../model/BACnetConfirmedServiceACKVTData.go       |  4 ----
 .../model/BACnetConfirmedServiceACKVTOpen.go       |  4 ----
 .../model/BACnetConfirmedServiceAddListElement.go  |  4 ----
 ...ACnetConfirmedServiceRequestAcknowledgeAlarm.go |  4 ----
 .../BACnetConfirmedServiceRequestAddListElement.go |  4 ----
 .../BACnetConfirmedServiceRequestAtomicReadFile.go |  4 ----
 ...BACnetConfirmedServiceRequestAtomicWriteFile.go |  4 ----
 ...firmedServiceRequestConfirmedCOVNotification.go |  4 ----
 ...rviceRequestConfirmedCOVNotificationMultiple.go |  4 ----
 ...rmedServiceRequestConfirmedEventNotification.go |  4 ----
 ...firmedServiceRequestConfirmedPrivateTransfer.go |  4 ----
 ...tConfirmedServiceRequestConfirmedTextMessage.go |  4 ----
 ...ACnetConfirmedServiceRequestConfirmedUnknown.go |  4 ----
 .../BACnetConfirmedServiceRequestCreateObject.go   |  4 ----
 .../BACnetConfirmedServiceRequestDeleteObject.go   |  4 ----
 ...rmedServiceRequestDeviceCommunicationControl.go |  4 ----
 ...tConfirmedServiceRequestGetEnrollmentSummary.go |  4 ----
 ...etConfirmedServiceRequestGetEventInformation.go |  4 ----
 ...etConfirmedServiceRequestLifeSafetyOperation.go |  4 ----
 .../BACnetConfirmedServiceRequestReadProperty.go   |  4 ----
 ...tConfirmedServiceRequestReadPropertyMultiple.go |  4 ----
 .../BACnetConfirmedServiceRequestReadRange.go      |  4 ----
 ...netConfirmedServiceRequestReinitializeDevice.go |  4 ----
 ...CnetConfirmedServiceRequestRemoveListElement.go |  4 ----
 ...etConfirmedServiceRequestRemovedAuthenticate.go |  4 ----
 ...ServiceRequestRemovedReadPropertyConditional.go |  4 ----
 ...CnetConfirmedServiceRequestRemovedRequestKey.go |  4 ----
 .../BACnetConfirmedServiceRequestSubscribeCOV.go   |  4 ----
 ...tConfirmedServiceRequestSubscribeCOVProperty.go |  4 ----
 ...edServiceRequestSubscribeCOVPropertyMultiple.go |  4 ----
 .../model/BACnetConfirmedServiceRequestVTClose.go  |  4 ----
 .../model/BACnetConfirmedServiceRequestVTData.go   |  4 ----
 .../model/BACnetConfirmedServiceRequestVTOpen.go   |  4 ----
 .../BACnetConfirmedServiceRequestWriteProperty.go  |  4 ----
 ...ConfirmedServiceRequestWritePropertyMultiple.go |  4 ----
 .../model/BACnetConstructedDataCommand.go          |  4 ----
 .../model/BACnetConstructedDataEventTimestamps.go  |  4 ----
 .../model/BACnetConstructedDataLifeSafetyZone.go   |  4 ----
 .../model/BACnetConstructedDataUnspecified.go      |  4 ----
 .../readwrite/model/BACnetContextTagBitString.go   |  4 ----
 .../readwrite/model/BACnetContextTagBoolean.go     |  4 ----
 .../model/BACnetContextTagCharacterString.go       |  4 ----
 .../readwrite/model/BACnetContextTagDate.go        |  4 ----
 .../readwrite/model/BACnetContextTagDeviceState.go |  4 ----
 .../readwrite/model/BACnetContextTagDouble.go      |  4 ----
 .../readwrite/model/BACnetContextTagEmpty.go       |  4 ----
 .../readwrite/model/BACnetContextTagEnumerated.go  |  4 ----
 .../readwrite/model/BACnetContextTagEventState.go  |  4 ----
 .../readwrite/model/BACnetContextTagEventType.go   |  4 ----
 .../readwrite/model/BACnetContextTagNotifyType.go  |  4 ----
 .../model/BACnetContextTagObjectIdentifier.go      |  4 ----
 .../readwrite/model/BACnetContextTagOctetString.go |  4 ----
 .../model/BACnetContextTagPropertyIdentifier.go    |  4 ----
 .../readwrite/model/BACnetContextTagReal.go        |  4 ----
 .../model/BACnetContextTagSignedInteger.go         |  4 ----
 .../readwrite/model/BACnetContextTagTime.go        |  4 ----
 .../model/BACnetContextTagUnsignedInteger.go       |  4 ----
 .../readwrite/model/BACnetErrorAcknowledgeAlarm.go |  4 ----
 .../readwrite/model/BACnetErrorAtomicReadFile.go   |  4 ----
 .../readwrite/model/BACnetErrorAtomicWriteFile.go  |  4 ----
 .../model/BACnetErrorConfirmedEventNotification.go |  4 ----
 .../model/BACnetErrorConfirmedPrivateTransfer.go   |  4 ----
 .../readwrite/model/BACnetErrorCreateObject.go     |  4 ----
 .../BACnetErrorDeviceCommunicationProtocol.go      |  4 ----
 .../readwrite/model/BACnetErrorGetAlarmSummary.go  |  4 ----
 .../model/BACnetErrorGetEnrollmentSummary.go       |  4 ----
 .../model/BACnetErrorGetEventInformation.go        |  4 ----
 .../readwrite/model/BACnetErrorPasswordFailure.go  |  4 ----
 .../readwrite/model/BACnetErrorReadProperty.go     |  4 ----
 .../model/BACnetErrorReadPropertyMultiple.go       |  4 ----
 .../readwrite/model/BACnetErrorReadRange.go        |  4 ----
 .../model/BACnetErrorRemovedAuthenticate.go        |  4 ----
 .../BACnetErrorRemovedReadPropertyConditional.go   |  4 ----
 .../bacnetip/readwrite/model/BACnetErrorUnknown.go |  4 ----
 .../bacnetip/readwrite/model/BACnetErrorVTData.go  |  4 ----
 .../bacnetip/readwrite/model/BACnetErrorVTOpen.go  |  4 ----
 .../readwrite/model/BACnetErrorWriteProperty.go    |  4 ----
 .../bacnetip/readwrite/model/BACnetOpeningTag.go   |  4 ----
 .../model/BACnetServiceAckAtomicReadFile.go        |  4 ----
 .../model/BACnetServiceAckAtomicWriteFile.go       |  4 ----
 .../BACnetServiceAckConfirmedPrivateTransfer.go    |  4 ----
 .../model/BACnetServiceAckCreateObject.go          |  4 ----
 .../model/BACnetServiceAckGetAlarmSummary.go       |  4 ----
 .../model/BACnetServiceAckGetEnrollmentSummary.go  |  4 ----
 .../model/BACnetServiceAckGetEventInformation.go   |  4 ----
 .../model/BACnetServiceAckReadProperty.go          |  4 ----
 .../model/BACnetServiceAckReadPropertyMultiple.go  |  4 ----
 .../readwrite/model/BACnetServiceAckReadRange.go   |  4 ----
 .../model/BACnetServiceAckRemovedAuthenticate.go   |  4 ----
 ...CnetServiceAckRemovedReadPropertyConditional.go |  4 ----
 .../readwrite/model/BACnetServiceAckVTData.go      |  4 ----
 .../readwrite/model/BACnetServiceAckVTOpen.go      |  4 ----
 .../model/BACnetUnconfirmedServiceRequestIAm.go    |  4 ----
 .../model/BACnetUnconfirmedServiceRequestIHave.go  |  4 ----
 ...UnconfirmedServiceRequestTimeSynchronization.go |  4 ----
 ...onfirmedServiceRequestUTCTimeSynchronization.go |  4 ----
 ...rmedServiceRequestUnconfirmedCOVNotification.go |  4 ----
 ...iceRequestUnconfirmedCOVNotificationMultiple.go |  4 ----
 ...edServiceRequestUnconfirmedEventNotification.go |  4 ----
 ...rmedServiceRequestUnconfirmedPrivateTransfer.go |  4 ----
 ...onfirmedServiceRequestUnconfirmedTextMessage.go |  4 ----
 ...tUnconfirmedServiceRequestUnconfirmedUnknown.go |  4 ----
 .../model/BACnetUnconfirmedServiceRequestWhoHas.go |  4 ----
 .../model/BACnetUnconfirmedServiceRequestWhoIs.go  |  4 ----
 .../BACnetUnconfirmedServiceRequestWriteGroup.go   |  4 ----
 .../model/BVLCDeleteForeignDeviceTableEntry.go     |  4 ----
 .../model/BVLCDistributeBroadcastToNetwork.go      |  4 ----
 .../bacnetip/readwrite/model/BVLCForwardedNPDU.go  |  4 ----
 .../readwrite/model/BVLCOriginalBroadcastNPDU.go   |  4 ----
 .../readwrite/model/BVLCOriginalUnicastNPDU.go     |  4 ----
 .../model/BVLCReadBroadcastDistributionTable.go    |  4 ----
 .../model/BVLCReadBroadcastDistributionTableAck.go |  4 ----
 .../readwrite/model/BVLCReadForeignDeviceTable.go  |  4 ----
 .../model/BVLCReadForeignDeviceTableAck.go         |  4 ----
 .../readwrite/model/BVLCRegisterForeignDevice.go   |  4 ----
 .../plc4go/bacnetip/readwrite/model/BVLCResult.go  |  4 ----
 .../bacnetip/readwrite/model/BVLCSecureBVLL.go     |  4 ----
 .../model/BVLCWriteBroadcastDistributionTable.go   |  4 ----
 .../model/NLMDisconnectConnectionToNetwork.go      |  4 ----
 .../model/NLMEstablishConnectionToNetwork.go       |  4 ----
 .../readwrite/model/NLMIAmRouterToNetwork.go       |  4 ----
 .../readwrite/model/NLMICouldBeRouterToNetwork.go  |  4 ----
 .../readwrite/model/NLMInitalizeRoutingTable.go    |  4 ----
 .../readwrite/model/NLMInitalizeRoutingTableAck.go |  4 ----
 .../readwrite/model/NLMRejectRouterToNetwork.go    |  4 ----
 .../readwrite/model/NLMRouterAvailableToNetwork.go |  4 ----
 .../readwrite/model/NLMRouterBusyToNetwork.go      |  4 ----
 .../readwrite/model/NLMWhoIsRouterToNetwork.go     |  4 ----
 .../cbus/readwrite/model/ConfirmationSuccessful.go |  4 ----
 .../IdentifyReplyCommandCurrentSenseLevels.go      |  4 ----
 .../model/IdentifyReplyCommandDSIStatus.go         |  4 ----
 .../readwrite/model/IdentifyReplyCommandDelays.go  |  4 ----
 ...dentifyReplyCommandExtendedDiagnosticSummary.go |  4 ----
 .../model/IdentifyReplyCommandFirmwareSummary.go   |  4 ----
 .../model/IdentifyReplyCommandFirmwareVersion.go   |  4 ----
 .../IdentifyReplyCommandGAVPhysicalAddresses.go    |  4 ----
 .../model/IdentifyReplyCommandGAVValuesCurrent.go  |  4 ----
 .../model/IdentifyReplyCommandGAVValuesStored.go   |  4 ----
 .../model/IdentifyReplyCommandLogicalAssignment.go |  4 ----
 .../model/IdentifyReplyCommandManufacturer.go      |  4 ----
 .../model/IdentifyReplyCommandMaximumLevels.go     |  4 ----
 .../model/IdentifyReplyCommandMinimumLevels.go     |  4 ----
 .../IdentifyReplyCommandNetworkTerminalLevels.go   |  4 ----
 .../model/IdentifyReplyCommandNetworkVoltage.go    |  4 ----
 .../model/IdentifyReplyCommandOutputUnitSummary.go |  4 ----
 .../model/IdentifyReplyCommandTerminalLevels.go    |  4 ----
 .../readwrite/model/IdentifyReplyCommandType.go    |  4 ----
 .../readwrite/model/NotTransmittedCorruption.go    |  4 ----
 .../cbus/readwrite/model/NotTransmittedSyncLoss.go |  4 ----
 .../model/NotTransmittedToManyReTransmissions.go   |  4 ----
 .../cbus/readwrite/model/NotTransmittedTooLong.go  |  4 ----
 .../df1/readwrite/model/DF1SymbolMessageFrame.go   |  4 ----
 .../readwrite/model/DF1SymbolMessageFrameACK.go    |  4 ----
 .../readwrite/model/DF1SymbolMessageFrameNAK.go    |  4 ----
 .../readwrite/model/DF1UnprotectedReadRequest.go   |  4 ----
 .../readwrite/model/DF1UnprotectedReadResponse.go  |  4 ----
 .../plc4go/eip/readwrite/model/CipRRData.go        |  4 ----
 .../plc4go/eip/readwrite/model/CipReadRequest.go   |  4 ----
 .../plc4go/eip/readwrite/model/CipReadResponse.go  |  4 ----
 .../eip/readwrite/model/CipUnconnectedRequest.go   |  4 ----
 .../plc4go/eip/readwrite/model/CipWriteRequest.go  |  4 ----
 .../plc4go/eip/readwrite/model/CipWriteResponse.go |  4 ----
 .../eip/readwrite/model/EipConnectionRequest.go    |  4 ----
 .../eip/readwrite/model/EipDisconnectRequest.go    |  4 ----
 .../eip/readwrite/model/MultipleServiceRequest.go  |  4 ----
 .../eip/readwrite/model/MultipleServiceResponse.go |  4 ----
 .../model/FirmataCommandProtocolVersion.go         |  4 ----
 .../model/FirmataCommandSetDigitalPinValue.go      |  4 ----
 .../readwrite/model/FirmataCommandSetPinMode.go    |  4 ----
 .../firmata/readwrite/model/FirmataCommandSysex.go |  4 ----
 .../readwrite/model/FirmataCommandSystemReset.go   |  4 ----
 .../readwrite/model/FirmataMessageAnalogIO.go      |  4 ----
 .../readwrite/model/FirmataMessageCommand.go       |  4 ----
 .../readwrite/model/FirmataMessageDigitalIO.go     |  4 ----
 .../model/FirmataMessageSubscribeAnalogPinValue.go |  4 ----
 .../FirmataMessageSubscribeDigitalPinValue.go      |  4 ----
 .../model/SysexCommandAnalogMappingQueryRequest.go |  8 -------
 .../SysexCommandAnalogMappingQueryResponse.go      |  8 -------
 .../model/SysexCommandAnalogMappingResponse.go     |  8 -------
 .../readwrite/model/SysexCommandCapabilityQuery.go |  8 -------
 .../model/SysexCommandCapabilityResponse.go        |  8 -------
 .../readwrite/model/SysexCommandExtendedAnalog.go  |  8 -------
 .../readwrite/model/SysexCommandExtendedId.go      |  8 -------
 .../readwrite/model/SysexCommandPinStateQuery.go   |  8 -------
 .../model/SysexCommandPinStateResponse.go          |  8 -------
 .../model/SysexCommandReportFirmwareRequest.go     |  8 -------
 .../model/SysexCommandReportFirmwareResponse.go    |  8 -------
 .../model/SysexCommandSamplingInterval.go          |  8 -------
 .../readwrite/model/SysexCommandStringData.go      |  8 -------
 .../model/SysexCommandSysexNonRealtime.go          |  8 -------
 .../readwrite/model/SysexCommandSysexRealtime.go   |  8 -------
 .../knxnetip/readwrite/model/ApduControlAck.go     |  4 ----
 .../knxnetip/readwrite/model/ApduControlConnect.go |  4 ----
 .../readwrite/model/ApduControlContainer.go        |  4 ----
 .../readwrite/model/ApduControlDisconnect.go       |  4 ----
 .../knxnetip/readwrite/model/ApduControlNack.go    |  4 ----
 .../knxnetip/readwrite/model/ApduDataAdcRead.go    |  4 ----
 .../readwrite/model/ApduDataAdcResponse.go         |  4 ----
 .../knxnetip/readwrite/model/ApduDataContainer.go  |  4 ----
 .../model/ApduDataDeviceDescriptorRead.go          |  4 ----
 .../model/ApduDataDeviceDescriptorResponse.go      |  4 ----
 .../readwrite/model/ApduDataExtAuthorizeRequest.go |  4 ----
 .../model/ApduDataExtAuthorizeResponse.go          |  4 ----
 .../model/ApduDataExtDomainAddressRead.go          |  4 ----
 .../model/ApduDataExtDomainAddressResponse.go      |  4 ----
 .../model/ApduDataExtDomainAddressSelectiveRead.go |  4 ----
 .../ApduDataExtDomainAddressSerialNumberRead.go    |  4 ----
 ...ApduDataExtDomainAddressSerialNumberResponse.go |  4 ----
 .../ApduDataExtDomainAddressSerialNumberWrite.go   |  4 ----
 .../model/ApduDataExtDomainAddressWrite.go         |  4 ----
 .../model/ApduDataExtFileStreamInfoReport.go       |  4 ----
 .../ApduDataExtGroupPropertyValueInfoReport.go     |  4 ----
 .../model/ApduDataExtGroupPropertyValueRead.go     |  4 ----
 .../model/ApduDataExtGroupPropertyValueResponse.go |  4 ----
 .../model/ApduDataExtGroupPropertyValueWrite.go    |  4 ----
 ...ApduDataExtIndividualAddressSerialNumberRead.go |  4 ----
 ...DataExtIndividualAddressSerialNumberResponse.go |  4 ----
 ...pduDataExtIndividualAddressSerialNumberWrite.go |  4 ----
 .../readwrite/model/ApduDataExtKeyResponse.go      |  4 ----
 .../readwrite/model/ApduDataExtKeyWrite.go         |  4 ----
 .../readwrite/model/ApduDataExtLinkRead.go         |  4 ----
 .../readwrite/model/ApduDataExtLinkResponse.go     |  4 ----
 .../readwrite/model/ApduDataExtLinkWrite.go        |  4 ----
 .../readwrite/model/ApduDataExtMemoryBitWrite.go   |  4 ----
 .../model/ApduDataExtNetworkParameterRead.go       |  4 ----
 .../model/ApduDataExtNetworkParameterResponse.go   |  4 ----
 .../model/ApduDataExtNetworkParameterWrite.go      |  4 ----
 .../model/ApduDataExtOpenRoutingTableRequest.go    |  4 ----
 .../model/ApduDataExtPropertyDescriptionRead.go    |  4 ----
 .../ApduDataExtPropertyDescriptionResponse.go      |  4 ----
 .../model/ApduDataExtPropertyValueRead.go          |  4 ----
 .../model/ApduDataExtPropertyValueResponse.go      |  4 ----
 .../model/ApduDataExtPropertyValueWrite.go         |  4 ----
 .../model/ApduDataExtReadRouterMemoryRequest.go    |  4 ----
 .../model/ApduDataExtReadRouterMemoryResponse.go   |  4 ----
 .../model/ApduDataExtReadRouterStatusRequest.go    |  4 ----
 .../model/ApduDataExtReadRouterStatusResponse.go   |  4 ----
 .../model/ApduDataExtReadRoutingTableRequest.go    |  4 ----
 .../model/ApduDataExtReadRoutingTableResponse.go   |  4 ----
 .../model/ApduDataExtWriteRouterMemoryRequest.go   |  4 ----
 .../model/ApduDataExtWriteRouterStatusRequest.go   |  4 ----
 .../model/ApduDataExtWriteRoutingTableRequest.go   |  4 ----
 .../readwrite/model/ApduDataGroupValueRead.go      |  4 ----
 .../readwrite/model/ApduDataGroupValueResponse.go  |  4 ----
 .../readwrite/model/ApduDataGroupValueWrite.go     |  4 ----
 .../model/ApduDataIndividualAddressRead.go         |  4 ----
 .../model/ApduDataIndividualAddressResponse.go     |  4 ----
 .../model/ApduDataIndividualAddressWrite.go        |  4 ----
 .../knxnetip/readwrite/model/ApduDataMemoryRead.go |  4 ----
 .../readwrite/model/ApduDataMemoryResponse.go      |  4 ----
 .../readwrite/model/ApduDataMemoryWrite.go         |  4 ----
 .../knxnetip/readwrite/model/ApduDataOther.go      |  4 ----
 .../knxnetip/readwrite/model/ApduDataRestart.go    |  4 ----
 .../readwrite/model/ApduDataUserMessage.go         |  4 ----
 .../CEMIAdditionalInformationBusmonitorInfo.go     |  4 ----
 .../CEMIAdditionalInformationRelativeTimestamp.go  |  4 ----
 .../model/ComObjectTableRealisationType1.go        |  4 ----
 .../model/ComObjectTableRealisationType2.go        |  4 ----
 .../model/ComObjectTableRealisationType6.go        |  4 ----
 .../knxnetip/readwrite/model/ConnectionRequest.go  |  4 ----
 ...ConnectionRequestInformationDeviceManagement.go |  4 ----
 ...ConnectionRequestInformationTunnelConnection.go |  4 ----
 .../knxnetip/readwrite/model/ConnectionResponse.go |  4 ----
 .../ConnectionResponseDataBlockDeviceManagement.go |  4 ----
 .../ConnectionResponseDataBlockTunnelConnection.go |  4 ----
 .../readwrite/model/ConnectionStateRequest.go      |  4 ----
 .../readwrite/model/ConnectionStateResponse.go     |  4 ----
 .../knxnetip/readwrite/model/DescriptionRequest.go |  4 ----
 .../readwrite/model/DescriptionResponse.go         |  4 ----
 .../readwrite/model/DeviceConfigurationAck.go      |  4 ----
 .../readwrite/model/DeviceConfigurationRequest.go  |  4 ----
 .../knxnetip/readwrite/model/DisconnectRequest.go  |  4 ----
 .../knxnetip/readwrite/model/DisconnectResponse.go |  4 ----
 .../readwrite/model/KnxGroupAddress2Level.go       |  4 ----
 .../readwrite/model/KnxGroupAddress3Level.go       |  4 ----
 .../readwrite/model/KnxGroupAddressFreeLevel.go    |  4 ----
 .../knxnetip/readwrite/model/KnxNetIpCore.go       |  4 ----
 .../readwrite/model/KnxNetIpDeviceManagement.go    |  4 ----
 .../knxnetip/readwrite/model/KnxNetIpRouting.go    |  4 ----
 .../knxnetip/readwrite/model/KnxNetIpTunneling.go  |  4 ----
 .../knxnetip/readwrite/model/KnxNetObjectServer.go |  4 ----
 .../model/KnxNetRemoteConfigurationAndDiagnosis.go |  4 ----
 .../readwrite/model/KnxNetRemoteLogging.go         |  4 ----
 .../plc4go/knxnetip/readwrite/model/LBusmonInd.go  |  4 ----
 .../plc4go/knxnetip/readwrite/model/LDataCon.go    |  4 ----
 .../knxnetip/readwrite/model/LDataExtended.go      |  8 -------
 .../knxnetip/readwrite/model/LDataFrameACK.go      |  8 -------
 .../plc4go/knxnetip/readwrite/model/LDataInd.go    |  4 ----
 .../plc4go/knxnetip/readwrite/model/LDataReq.go    |  4 ----
 .../plc4go/knxnetip/readwrite/model/LPollData.go   |  8 -------
 .../knxnetip/readwrite/model/LPollDataCon.go       |  4 ----
 .../knxnetip/readwrite/model/LPollDataReq.go       |  4 ----
 .../plc4go/knxnetip/readwrite/model/LRawCon.go     |  4 ----
 .../plc4go/knxnetip/readwrite/model/LRawInd.go     |  4 ----
 .../plc4go/knxnetip/readwrite/model/LRawReq.go     |  4 ----
 .../readwrite/model/MFuncPropCommandReq.go         |  4 ----
 .../knxnetip/readwrite/model/MFuncPropCon.go       |  4 ----
 .../readwrite/model/MFuncPropStateReadReq.go       |  4 ----
 .../knxnetip/readwrite/model/MPropInfoInd.go       |  4 ----
 .../knxnetip/readwrite/model/MPropReadCon.go       |  4 ----
 .../knxnetip/readwrite/model/MPropReadReq.go       |  4 ----
 .../knxnetip/readwrite/model/MPropWriteCon.go      |  4 ----
 .../knxnetip/readwrite/model/MPropWriteReq.go      |  4 ----
 .../plc4go/knxnetip/readwrite/model/MResetInd.go   |  4 ----
 .../plc4go/knxnetip/readwrite/model/MResetReq.go   |  4 ----
 .../knxnetip/readwrite/model/RoutingIndication.go  |  4 ----
 .../knxnetip/readwrite/model/SearchRequest.go      |  4 ----
 .../knxnetip/readwrite/model/SearchResponse.go     |  4 ----
 .../knxnetip/readwrite/model/TDataConnectedInd.go  |  4 ----
 .../knxnetip/readwrite/model/TDataConnectedReq.go  |  4 ----
 .../knxnetip/readwrite/model/TDataIndividualInd.go |  4 ----
 .../knxnetip/readwrite/model/TDataIndividualReq.go |  4 ----
 .../knxnetip/readwrite/model/TunnelingRequest.go   |  4 ----
 .../knxnetip/readwrite/model/TunnelingResponse.go  |  4 ----
 .../knxnetip/readwrite/model/UnknownMessage.go     |  4 ----
 .../readwrite/model/ModbusPDUDiagnosticRequest.go  | 12 -----------
 .../readwrite/model/ModbusPDUDiagnosticResponse.go | 12 -----------
 .../modbus/readwrite/model/ModbusPDUError.go       | 12 -----------
 .../model/ModbusPDUGetComEventCounterRequest.go    | 12 -----------
 .../model/ModbusPDUGetComEventCounterResponse.go   | 12 -----------
 .../model/ModbusPDUGetComEventLogRequest.go        | 12 -----------
 .../model/ModbusPDUGetComEventLogResponse.go       | 12 -----------
 .../ModbusPDUMaskWriteHoldingRegisterRequest.go    | 12 -----------
 .../ModbusPDUMaskWriteHoldingRegisterResponse.go   | 12 -----------
 .../readwrite/model/ModbusPDUReadCoilsRequest.go   | 12 -----------
 .../readwrite/model/ModbusPDUReadCoilsResponse.go  | 12 -----------
 .../ModbusPDUReadDeviceIdentificationRequest.go    | 12 -----------
 .../ModbusPDUReadDeviceIdentificationResponse.go   | 12 -----------
 .../model/ModbusPDUReadDiscreteInputsRequest.go    | 12 -----------
 .../model/ModbusPDUReadDiscreteInputsResponse.go   | 12 -----------
 .../model/ModbusPDUReadExceptionStatusRequest.go   | 12 -----------
 .../model/ModbusPDUReadExceptionStatusResponse.go  | 12 -----------
 .../model/ModbusPDUReadFifoQueueRequest.go         | 12 -----------
 .../model/ModbusPDUReadFifoQueueResponse.go        | 12 -----------
 .../model/ModbusPDUReadFileRecordRequest.go        | 12 -----------
 .../model/ModbusPDUReadFileRecordResponse.go       | 12 -----------
 .../model/ModbusPDUReadHoldingRegistersRequest.go  | 12 -----------
 .../model/ModbusPDUReadHoldingRegistersResponse.go | 12 -----------
 .../model/ModbusPDUReadInputRegistersRequest.go    | 12 -----------
 .../model/ModbusPDUReadInputRegistersResponse.go   | 12 -----------
 ...sPDUReadWriteMultipleHoldingRegistersRequest.go | 12 -----------
 ...PDUReadWriteMultipleHoldingRegistersResponse.go | 12 -----------
 .../model/ModbusPDUReportServerIdRequest.go        | 12 -----------
 .../model/ModbusPDUReportServerIdResponse.go       | 12 -----------
 .../model/ModbusPDUWriteFileRecordRequest.go       | 12 -----------
 .../model/ModbusPDUWriteFileRecordResponse.go      | 12 -----------
 .../model/ModbusPDUWriteMultipleCoilsRequest.go    | 12 -----------
 .../model/ModbusPDUWriteMultipleCoilsResponse.go   | 12 -----------
 ...odbusPDUWriteMultipleHoldingRegistersRequest.go | 12 -----------
 ...dbusPDUWriteMultipleHoldingRegistersResponse.go | 12 -----------
 .../model/ModbusPDUWriteSingleCoilRequest.go       | 12 -----------
 .../model/ModbusPDUWriteSingleCoilResponse.go      | 12 -----------
 .../model/ModbusPDUWriteSingleRegisterRequest.go   | 12 -----------
 .../model/ModbusPDUWriteSingleRegisterResponse.go  | 12 -----------
 .../readwrite/model/COTPPacketConnectionRequest.go |  4 ----
 .../model/COTPPacketConnectionResponse.go          |  4 ----
 .../plc4go/s7/readwrite/model/COTPPacketData.go    |  4 ----
 .../readwrite/model/COTPPacketDisconnectRequest.go |  4 ----
 .../model/COTPPacketDisconnectResponse.go          |  4 ----
 .../s7/readwrite/model/COTPPacketTpduError.go      |  4 ----
 .../s7/readwrite/model/COTPParameterCalledTsap.go  |  4 ----
 .../s7/readwrite/model/COTPParameterCallingTsap.go |  4 ----
 .../s7/readwrite/model/COTPParameterChecksum.go    |  4 ----
 ...COTPParameterDisconnectAdditionalInformation.go |  4 ----
 .../s7/readwrite/model/COTPParameterTpduSize.go    |  4 ----
 .../plc4go/s7/readwrite/model/S7AddressAny.go      |  4 ----
 .../s7/readwrite/model/S7MessageObjectRequest.go   |  4 ----
 .../s7/readwrite/model/S7MessageObjectResponse.go  |  4 ----
 .../plc4go/s7/readwrite/model/S7MessageRequest.go  |  4 ----
 .../plc4go/s7/readwrite/model/S7MessageResponse.go |  4 ----
 .../s7/readwrite/model/S7MessageResponseData.go    |  4 ----
 .../plc4go/s7/readwrite/model/S7MessageUserData.go |  4 ----
 .../readwrite/model/S7ParameterModeTransition.go   |  8 -------
 .../readwrite/model/S7ParameterReadVarRequest.go   |  8 -------
 .../readwrite/model/S7ParameterReadVarResponse.go  |  8 -------
 .../model/S7ParameterSetupCommunication.go         |  8 -------
 .../s7/readwrite/model/S7ParameterUserData.go      |  8 -------
 .../model/S7ParameterUserDataItemCPUFunctions.go   |  4 ----
 .../readwrite/model/S7ParameterWriteVarRequest.go  |  8 -------
 .../readwrite/model/S7ParameterWriteVarResponse.go |  8 -------
 .../plc4go/s7/readwrite/model/S7PayloadAlarm8.go   | 12 -----------
 .../s7/readwrite/model/S7PayloadAlarmAckInd.go     | 12 -----------
 .../plc4go/s7/readwrite/model/S7PayloadAlarmS.go   | 12 -----------
 .../plc4go/s7/readwrite/model/S7PayloadAlarmSC.go  | 12 -----------
 .../plc4go/s7/readwrite/model/S7PayloadAlarmSQ.go  | 12 -----------
 .../readwrite/model/S7PayloadDiagnosticMessage.go  | 12 -----------
 .../plc4go/s7/readwrite/model/S7PayloadNotify.go   | 12 -----------
 .../plc4go/s7/readwrite/model/S7PayloadNotify8.go  | 12 -----------
 .../s7/readwrite/model/S7PayloadReadVarResponse.go |  8 -------
 .../plc4go/s7/readwrite/model/S7PayloadUserData.go |  8 -------
 .../S7PayloadUserDataItemCpuFunctionAlarmAck.go    | 12 -----------
 ...yloadUserDataItemCpuFunctionAlarmAckResponse.go | 12 -----------
 .../S7PayloadUserDataItemCpuFunctionAlarmQuery.go  | 12 -----------
 ...oadUserDataItemCpuFunctionAlarmQueryResponse.go | 12 -----------
 ...ayloadUserDataItemCpuFunctionMsgSubscription.go | 12 -----------
 ...aItemCpuFunctionMsgSubscriptionAlarmResponse.go | 12 -----------
 ...erDataItemCpuFunctionMsgSubscriptionResponse.go | 12 -----------
 ...ataItemCpuFunctionMsgSubscriptionSysResponse.go | 12 -----------
 ...PayloadUserDataItemCpuFunctionReadSzlRequest.go | 12 -----------
 ...ayloadUserDataItemCpuFunctionReadSzlResponse.go | 12 -----------
 .../s7/readwrite/model/S7PayloadWriteVarRequest.go |  8 -------
 .../readwrite/model/S7PayloadWriteVarResponse.go   |  8 -------
 .../model/S7VarRequestParameterItemAddress.go      |  4 ----
 456 files changed, 2497 deletions(-)

diff --git a/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
index cdf110c..37ecd7e 100644
--- a/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
+++ b/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
@@ -147,31 +147,6 @@ type I${type.name} interface {
 		<#-- If the discriminator name matches that of another field, suppress the methods generation -->
 		<#if !type.isNonDiscriminatorField(discriminatorName)>
 			<#assign typeRef=helper.getDiscriminatorTypes()[discriminatorName]>
-func (m *${type.name}) ${discriminatorName?cap_first}() <#if typeRef.isNonSimpleTypeReference() && !typeRef.isEnumTypeReference()>I</#if>${helper.getLanguageTypeNameForTypeReference(typeRef)} {
-			<@compress single_line=true>
-	return
-				<#if discriminatorTerm?? && !helper.isWildcard(discriminatorTerm)>
-					<#if typeRef.isNonSimpleTypeReference()>
-						<#if typeRef.isEnumTypeReference()>
-                            <#assign enumType=helper.getLanguageTypeNameForTypeReference(typeRef)>
-                            <#assign enumTypeWithoutTraces=tracer.removeTraces(enumType)>
-                            <#assign enumTypeTraces=tracer.extractTraces(enumType)>
-                            <#assign enumValue=helper.toParseExpression(null, typeRef, discriminatorTerm, parserArguments)>
-                            <#assign enumValueWithoutTraces=tracer.removeTraces(enumValue)>
-                            <#assign enumValueTraces=tracer.extractTraces(enumValue)>
-                            ${enumTypeTraces}${enumValueTraces}${enumTypeWithoutTraces}_${enumValueWithoutTraces?replace("Get","")?replace("()","")}
-						<#else>
-							${helper.toParseExpression(null, typeRef, discriminatorTerm, parserArguments)}
-						</#if>
-					<#else>
-						${helper.toParseExpression(null, typeRef, discriminatorTerm, parserArguments)}
-					</#if>
-				<#else>
-					${helper.getNullValueForTypeReference(typeRef)}
-				</#if>
-			</...@compress>
-}
-
 func (m *${type.name}) Get${discriminatorName?cap_first}() <#if typeRef.isNonSimpleTypeReference() && !typeRef.isEnumTypeReference()>I</#if>${helper.getLanguageTypeNameForTypeReference(typeRef)} {
 			<@compress single_line=true>
 				return
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go
index 169571c..97b3ba3 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionRequest.go
@@ -44,10 +44,6 @@ type ICIPEncapsulationConnectionRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CIPEncapsulationConnectionRequest) CommandType() uint16 {
-	return 0x0101
-}
-
 func (m *CIPEncapsulationConnectionRequest) GetCommandType() uint16 {
 	return 0x0101
 }
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go
index 23db85b..683a483 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationConnectionResponse.go
@@ -44,10 +44,6 @@ type ICIPEncapsulationConnectionResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CIPEncapsulationConnectionResponse) CommandType() uint16 {
-	return 0x0201
-}
-
 func (m *CIPEncapsulationConnectionResponse) GetCommandType() uint16 {
 	return 0x0201
 }
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go
index 9e48305..2f5a69f 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadRequest.go
@@ -48,10 +48,6 @@ type ICIPEncapsulationReadRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CIPEncapsulationReadRequest) CommandType() uint16 {
-	return 0x0107
-}
-
 func (m *CIPEncapsulationReadRequest) GetCommandType() uint16 {
 	return 0x0107
 }
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go
index b712dc8..7d17d46 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go
@@ -51,10 +51,6 @@ type ICIPEncapsulationReadResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CIPEncapsulationReadResponse) CommandType() uint16 {
-	return 0x0207
-}
-
 func (m *CIPEncapsulationReadResponse) GetCommandType() uint16 {
 	return 0x0207
 }
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandRequestMessage.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandRequestMessage.go
index 7d6e119..54a59a6 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandRequestMessage.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandRequestMessage.go
@@ -48,10 +48,6 @@ type IDF1CommandRequestMessage interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DF1CommandRequestMessage) CommandCode() uint8 {
-	return 0x0F
-}
-
 func (m *DF1CommandRequestMessage) GetCommandCode() uint8 {
 	return 0x0F
 }
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
index 9cef393..48454d1 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
@@ -51,10 +51,6 @@ type IDF1CommandResponseMessageProtectedTypedLogicalRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) CommandCode() uint8 {
-	return 0x4F
-}
-
 func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) GetCommandCode() uint8 {
 	return 0x4F
 }
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go
index 3ef6bea..3c07ff7 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1RequestProtectedTypedLogicalRead.go
@@ -60,10 +60,6 @@ type IDF1RequestProtectedTypedLogicalRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DF1RequestProtectedTypedLogicalRead) FunctionCode() uint8 {
-	return 0xA2
-}
-
 func (m *DF1RequestProtectedTypedLogicalRead) GetFunctionCode() uint8 {
 	return 0xA2
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationRequest.go
index 825b55f..de3b0f6 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationRequest.go
@@ -64,18 +64,10 @@ type IAdsAddDeviceNotificationRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsAddDeviceNotificationRequest) CommandId() CommandId {
-	return CommandId_ADS_ADD_DEVICE_NOTIFICATION
-}
-
 func (m *AdsAddDeviceNotificationRequest) GetCommandId() CommandId {
 	return CommandId_ADS_ADD_DEVICE_NOTIFICATION
 }
 
-func (m *AdsAddDeviceNotificationRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *AdsAddDeviceNotificationRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationResponse.go
index a213000..44ac384 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsAddDeviceNotificationResponse.go
@@ -51,18 +51,10 @@ type IAdsAddDeviceNotificationResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsAddDeviceNotificationResponse) CommandId() CommandId {
-	return CommandId_ADS_ADD_DEVICE_NOTIFICATION
-}
-
 func (m *AdsAddDeviceNotificationResponse) GetCommandId() CommandId {
 	return CommandId_ADS_ADD_DEVICE_NOTIFICATION
 }
 
-func (m *AdsAddDeviceNotificationResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *AdsAddDeviceNotificationResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go
index 640dab4..4b19d3e 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationRequest.go
@@ -48,18 +48,10 @@ type IAdsDeleteDeviceNotificationRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsDeleteDeviceNotificationRequest) CommandId() CommandId {
-	return CommandId_ADS_DELETE_DEVICE_NOTIFICATION
-}
-
 func (m *AdsDeleteDeviceNotificationRequest) GetCommandId() CommandId {
 	return CommandId_ADS_DELETE_DEVICE_NOTIFICATION
 }
 
-func (m *AdsDeleteDeviceNotificationRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *AdsDeleteDeviceNotificationRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go
index 130745e..6db7b6b 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeleteDeviceNotificationResponse.go
@@ -48,18 +48,10 @@ type IAdsDeleteDeviceNotificationResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsDeleteDeviceNotificationResponse) CommandId() CommandId {
-	return CommandId_ADS_DELETE_DEVICE_NOTIFICATION
-}
-
 func (m *AdsDeleteDeviceNotificationResponse) GetCommandId() CommandId {
 	return CommandId_ADS_DELETE_DEVICE_NOTIFICATION
 }
 
-func (m *AdsDeleteDeviceNotificationResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *AdsDeleteDeviceNotificationResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationRequest.go
index 1cfd2ac..f3019d1 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationRequest.go
@@ -54,18 +54,10 @@ type IAdsDeviceNotificationRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsDeviceNotificationRequest) CommandId() CommandId {
-	return CommandId_ADS_DEVICE_NOTIFICATION
-}
-
 func (m *AdsDeviceNotificationRequest) GetCommandId() CommandId {
 	return CommandId_ADS_DEVICE_NOTIFICATION
 }
 
-func (m *AdsDeviceNotificationRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *AdsDeviceNotificationRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationResponse.go
index 57dbf23..06c2dc9 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsDeviceNotificationResponse.go
@@ -44,18 +44,10 @@ type IAdsDeviceNotificationResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsDeviceNotificationResponse) CommandId() CommandId {
-	return CommandId_ADS_DEVICE_NOTIFICATION
-}
-
 func (m *AdsDeviceNotificationResponse) GetCommandId() CommandId {
 	return CommandId_ADS_DEVICE_NOTIFICATION
 }
 
-func (m *AdsDeviceNotificationResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *AdsDeviceNotificationResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidRequest.go
index b796cd5..4492ede 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidRequest.go
@@ -44,18 +44,10 @@ type IAdsInvalidRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsInvalidRequest) CommandId() CommandId {
-	return CommandId_INVALID
-}
-
 func (m *AdsInvalidRequest) GetCommandId() CommandId {
 	return CommandId_INVALID
 }
 
-func (m *AdsInvalidRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *AdsInvalidRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidResponse.go
index adef5cf..be13561 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsInvalidResponse.go
@@ -44,18 +44,10 @@ type IAdsInvalidResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsInvalidResponse) CommandId() CommandId {
-	return CommandId_INVALID
-}
-
 func (m *AdsInvalidResponse) GetCommandId() CommandId {
 	return CommandId_INVALID
 }
 
-func (m *AdsInvalidResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *AdsInvalidResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemRead.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemRead.go
index 0ee6985..ff6ebe9 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemRead.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemRead.go
@@ -54,10 +54,6 @@ type IAdsMultiRequestItemRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsMultiRequestItemRead) IndexGroup() uint32 {
-	return uint32(61568)
-}
-
 func (m *AdsMultiRequestItemRead) GetIndexGroup() uint32 {
 	return uint32(61568)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemReadWrite.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemReadWrite.go
index cb466c9..7f35dfe 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemReadWrite.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemReadWrite.go
@@ -57,10 +57,6 @@ type IAdsMultiRequestItemReadWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsMultiRequestItemReadWrite) IndexGroup() uint32 {
-	return uint32(61570)
-}
-
 func (m *AdsMultiRequestItemReadWrite) GetIndexGroup() uint32 {
 	return uint32(61570)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemWrite.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemWrite.go
index df7162c..3c7cba3 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemWrite.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItemWrite.go
@@ -54,10 +54,6 @@ type IAdsMultiRequestItemWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsMultiRequestItemWrite) IndexGroup() uint32 {
-	return uint32(61569)
-}
-
 func (m *AdsMultiRequestItemWrite) GetIndexGroup() uint32 {
 	return uint32(61569)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoRequest.go
index 28784d3..138d800 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoRequest.go
@@ -44,18 +44,10 @@ type IAdsReadDeviceInfoRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsReadDeviceInfoRequest) CommandId() CommandId {
-	return CommandId_ADS_READ_DEVICE_INFO
-}
-
 func (m *AdsReadDeviceInfoRequest) GetCommandId() CommandId {
 	return CommandId_ADS_READ_DEVICE_INFO
 }
 
-func (m *AdsReadDeviceInfoRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *AdsReadDeviceInfoRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go
index 1b50f7e..d11a6a1 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadDeviceInfoResponse.go
@@ -60,18 +60,10 @@ type IAdsReadDeviceInfoResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsReadDeviceInfoResponse) CommandId() CommandId {
-	return CommandId_ADS_READ_DEVICE_INFO
-}
-
 func (m *AdsReadDeviceInfoResponse) GetCommandId() CommandId {
 	return CommandId_ADS_READ_DEVICE_INFO
 }
 
-func (m *AdsReadDeviceInfoResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *AdsReadDeviceInfoResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadRequest.go
index 7c72243..2636853 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadRequest.go
@@ -54,18 +54,10 @@ type IAdsReadRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsReadRequest) CommandId() CommandId {
-	return CommandId_ADS_READ
-}
-
 func (m *AdsReadRequest) GetCommandId() CommandId {
 	return CommandId_ADS_READ
 }
 
-func (m *AdsReadRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *AdsReadRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go
index 0b1121a..5092fbb 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadResponse.go
@@ -51,18 +51,10 @@ type IAdsReadResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsReadResponse) CommandId() CommandId {
-	return CommandId_ADS_READ
-}
-
 func (m *AdsReadResponse) GetCommandId() CommandId {
 	return CommandId_ADS_READ
 }
 
-func (m *AdsReadResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *AdsReadResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateRequest.go
index ed1f205..97ccc53 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateRequest.go
@@ -44,18 +44,10 @@ type IAdsReadStateRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsReadStateRequest) CommandId() CommandId {
-	return CommandId_ADS_READ_STATE
-}
-
 func (m *AdsReadStateRequest) GetCommandId() CommandId {
 	return CommandId_ADS_READ_STATE
 }
 
-func (m *AdsReadStateRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *AdsReadStateRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateResponse.go
index cf6ff88..8f2c4f8 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadStateResponse.go
@@ -54,18 +54,10 @@ type IAdsReadStateResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsReadStateResponse) CommandId() CommandId {
-	return CommandId_ADS_READ_STATE
-}
-
 func (m *AdsReadStateResponse) GetCommandId() CommandId {
 	return CommandId_ADS_READ_STATE
 }
 
-func (m *AdsReadStateResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *AdsReadStateResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go
index ab12767..13e2187 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteRequest.go
@@ -60,18 +60,10 @@ type IAdsReadWriteRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsReadWriteRequest) CommandId() CommandId {
-	return CommandId_ADS_READ_WRITE
-}
-
 func (m *AdsReadWriteRequest) GetCommandId() CommandId {
 	return CommandId_ADS_READ_WRITE
 }
 
-func (m *AdsReadWriteRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *AdsReadWriteRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go
index 9dbc54e..4e0f06d 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsReadWriteResponse.go
@@ -51,18 +51,10 @@ type IAdsReadWriteResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsReadWriteResponse) CommandId() CommandId {
-	return CommandId_ADS_READ_WRITE
-}
-
 func (m *AdsReadWriteResponse) GetCommandId() CommandId {
 	return CommandId_ADS_READ_WRITE
 }
 
-func (m *AdsReadWriteResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *AdsReadWriteResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go
index 83989d7..f4c60d5 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlRequest.go
@@ -54,18 +54,10 @@ type IAdsWriteControlRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsWriteControlRequest) CommandId() CommandId {
-	return CommandId_ADS_WRITE_CONTROL
-}
-
 func (m *AdsWriteControlRequest) GetCommandId() CommandId {
 	return CommandId_ADS_WRITE_CONTROL
 }
 
-func (m *AdsWriteControlRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *AdsWriteControlRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlResponse.go
index 5830916..9f8c9b6 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteControlResponse.go
@@ -48,18 +48,10 @@ type IAdsWriteControlResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsWriteControlResponse) CommandId() CommandId {
-	return CommandId_ADS_WRITE_CONTROL
-}
-
 func (m *AdsWriteControlResponse) GetCommandId() CommandId {
 	return CommandId_ADS_WRITE_CONTROL
 }
 
-func (m *AdsWriteControlResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *AdsWriteControlResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go
index 45f4110..26babda 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteRequest.go
@@ -54,18 +54,10 @@ type IAdsWriteRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsWriteRequest) CommandId() CommandId {
-	return CommandId_ADS_WRITE
-}
-
 func (m *AdsWriteRequest) GetCommandId() CommandId {
 	return CommandId_ADS_WRITE
 }
 
-func (m *AdsWriteRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *AdsWriteRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteResponse.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteResponse.go
index 5dde50e..2fa54fd 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteResponse.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsWriteResponse.go
@@ -48,18 +48,10 @@ type IAdsWriteResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *AdsWriteResponse) CommandId() CommandId {
-	return CommandId_ADS_WRITE
-}
-
 func (m *AdsWriteResponse) GetCommandId() CommandId {
 	return CommandId_ADS_WRITE
 }
 
-func (m *AdsWriteResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *AdsWriteResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go
index a5d6465..789f61e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUAbort.go
@@ -58,10 +58,6 @@ type IAPDUAbort interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *APDUAbort) ApduType() uint8 {
-	return 0x7
-}
-
 func (m *APDUAbort) GetApduType() uint8 {
 	return 0x7
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
index e2f7a27..8d57412 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUComplexAck.go
@@ -74,10 +74,6 @@ type IAPDUComplexAck interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *APDUComplexAck) ApduType() uint8 {
-	return 0x3
-}
-
 func (m *APDUComplexAck) GetApduType() uint8 {
 	return 0x3
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
index 6aab1e1..6a96a2b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
@@ -76,10 +76,6 @@ type IAPDUConfirmedRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *APDUConfirmedRequest) ApduType() uint8 {
-	return 0x0
-}
-
 func (m *APDUConfirmedRequest) GetApduType() uint8 {
 	return 0x0
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go
index 5d4b4f0..e3d631c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUError.go
@@ -55,10 +55,6 @@ type IAPDUError interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *APDUError) ApduType() uint8 {
-	return 0x5
-}
-
 func (m *APDUError) GetApduType() uint8 {
 	return 0x5
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go
index 40ad205..7d44c41 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUReject.go
@@ -55,10 +55,6 @@ type IAPDUReject interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *APDUReject) ApduType() uint8 {
-	return 0x6
-}
-
 func (m *APDUReject) GetApduType() uint8 {
 	return 0x6
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go
index deee579..d5371c1 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSegmentAck.go
@@ -64,10 +64,6 @@ type IAPDUSegmentAck interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *APDUSegmentAck) ApduType() uint8 {
-	return 0x4
-}
-
 func (m *APDUSegmentAck) GetApduType() uint8 {
 	return 0x4
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go
index b777aa6..32f31b7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUSimpleAck.go
@@ -55,10 +55,6 @@ type IAPDUSimpleAck interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *APDUSimpleAck) ApduType() uint8 {
-	return 0x2
-}
-
 func (m *APDUSimpleAck) GetApduType() uint8 {
 	return 0x2
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
index 731a43d..ac527c7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
@@ -52,10 +52,6 @@ type IAPDUUnconfirmedRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *APDUUnconfirmedRequest) ApduType() uint8 {
-	return 0x1
-}
-
 func (m *APDUUnconfirmedRequest) GetApduType() uint8 {
 	return 0x1
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnknown.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnknown.go
index cab5237..6510183 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnknown.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnknown.go
@@ -51,10 +51,6 @@ type IAPDUUnknown interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *APDUUnknown) ApduType() uint8 {
-	return 0
-}
-
 func (m *APDUUnknown) GetApduType() uint8 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetClosingTag.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetClosingTag.go
index fb526f9..685ef99 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetClosingTag.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetClosingTag.go
@@ -48,10 +48,6 @@ type IBACnetClosingTag interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetClosingTag) DataType() BACnetDataType {
-	return BACnetDataType_CLOSING_TAG
-}
-
 func (m *BACnetClosingTag) GetDataType() BACnetDataType {
 	return BACnetDataType_CLOSING_TAG
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go
index b0016ee..72b4618 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicReadFile.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKAtomicReadFile interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKAtomicReadFile) ServiceChoice() uint8 {
-	return 0x06
-}
-
 func (m *BACnetConfirmedServiceACKAtomicReadFile) GetServiceChoice() uint8 {
 	return 0x06
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go
index 0a42e29..f4fb8cc 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKAtomicWriteFile.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKAtomicWriteFile interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKAtomicWriteFile) ServiceChoice() uint8 {
-	return 0x07
-}
-
 func (m *BACnetConfirmedServiceACKAtomicWriteFile) GetServiceChoice() uint8 {
 	return 0x07
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go
index 176ce33..3bed6b8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKConfirmedPrivateTransfer.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKConfirmedPrivateTransfer interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) ServiceChoice() uint8 {
-	return 0x12
-}
-
 func (m *BACnetConfirmedServiceACKConfirmedPrivateTransfer) GetServiceChoice() uint8 {
 	return 0x12
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go
index 2d1a1d5..4904710 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKCreateObject.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKCreateObject interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKCreateObject) ServiceChoice() uint8 {
-	return 0x0A
-}
-
 func (m *BACnetConfirmedServiceACKCreateObject) GetServiceChoice() uint8 {
 	return 0x0A
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go
index c46ee87..cbdc8b0 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetAlarmSummary.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKGetAlarmSummary interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKGetAlarmSummary) ServiceChoice() uint8 {
-	return 0x03
-}
-
 func (m *BACnetConfirmedServiceACKGetAlarmSummary) GetServiceChoice() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go
index fc14edc..c3c1643 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEnrollmentSummary.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKGetEnrollmentSummary interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) ServiceChoice() uint8 {
-	return 0x04
-}
-
 func (m *BACnetConfirmedServiceACKGetEnrollmentSummary) GetServiceChoice() uint8 {
 	return 0x04
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go
index 5f2a7d5..6328d5c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKGetEventInformation.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKGetEventInformation interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKGetEventInformation) ServiceChoice() uint8 {
-	return 0x1D
-}
-
 func (m *BACnetConfirmedServiceACKGetEventInformation) GetServiceChoice() uint8 {
 	return 0x1D
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go
index 15de0cd..36dbaa2 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadProperty.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKReadProperty interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKReadProperty) ServiceChoice() uint8 {
-	return 0x0C
-}
-
 func (m *BACnetConfirmedServiceACKReadProperty) GetServiceChoice() uint8 {
 	return 0x0C
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go
index d78e881..cde7bab 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadPropertyMultiple.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKReadPropertyMultiple interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKReadPropertyMultiple) ServiceChoice() uint8 {
-	return 0x0E
-}
-
 func (m *BACnetConfirmedServiceACKReadPropertyMultiple) GetServiceChoice() uint8 {
 	return 0x0E
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go
index 9bd1b09..7644e32 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKReadRange.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKReadRange interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKReadRange) ServiceChoice() uint8 {
-	return 0x1A
-}
-
 func (m *BACnetConfirmedServiceACKReadRange) GetServiceChoice() uint8 {
 	return 0x1A
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go
index 6811ebb..8a5341b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedAuthenticate.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKRemovedAuthenticate interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKRemovedAuthenticate) ServiceChoice() uint8 {
-	return 0x18
-}
-
 func (m *BACnetConfirmedServiceACKRemovedAuthenticate) GetServiceChoice() uint8 {
 	return 0x18
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go
index 3c266fc..9325251 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKRemovedReadPropertyConditional.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKRemovedReadPropertyConditional interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) ServiceChoice() uint8 {
-	return 0x0D
-}
-
 func (m *BACnetConfirmedServiceACKRemovedReadPropertyConditional) GetServiceChoice() uint8 {
 	return 0x0D
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go
index bc4ea92..5ad3380 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTData.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKVTData interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKVTData) ServiceChoice() uint8 {
-	return 0x17
-}
-
 func (m *BACnetConfirmedServiceACKVTData) GetServiceChoice() uint8 {
 	return 0x17
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go
index b1a8ef9..2a6ae60 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceACKVTOpen.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceACKVTOpen interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceACKVTOpen) ServiceChoice() uint8 {
-	return 0x15
-}
-
 func (m *BACnetConfirmedServiceACKVTOpen) GetServiceChoice() uint8 {
 	return 0x15
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceAddListElement.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceAddListElement.go
index e33a742..219f184 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceAddListElement.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceAddListElement.go
@@ -44,10 +44,6 @@ type IBACnetConfirmedServiceAddListElement interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceAddListElement) ServiceChoice() uint8 {
-	return 0x08
-}
-
 func (m *BACnetConfirmedServiceAddListElement) GetServiceChoice() uint8 {
 	return 0x08
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
index b4677cb..1776cb0 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAcknowledgeAlarm.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestAcknowledgeAlarm interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) ServiceChoice() uint8 {
-	return 0x00
-}
-
 func (m *BACnetConfirmedServiceRequestAcknowledgeAlarm) GetServiceChoice() uint8 {
 	return 0x00
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
index d9f6b4b..8320ce6 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAddListElement.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestAddListElement interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestAddListElement) ServiceChoice() uint8 {
-	return 0x08
-}
-
 func (m *BACnetConfirmedServiceRequestAddListElement) GetServiceChoice() uint8 {
 	return 0x08
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
index 59b729f..09b5f33 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicReadFile.go
@@ -54,10 +54,6 @@ type IBACnetConfirmedServiceRequestAtomicReadFile interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestAtomicReadFile) ServiceChoice() uint8 {
-	return 0x06
-}
-
 func (m *BACnetConfirmedServiceRequestAtomicReadFile) GetServiceChoice() uint8 {
 	return 0x06
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
index d5a260f..114801c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestAtomicWriteFile.go
@@ -64,10 +64,6 @@ type IBACnetConfirmedServiceRequestAtomicWriteFile interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestAtomicWriteFile) ServiceChoice() uint8 {
-	return 0x07
-}
-
 func (m *BACnetConfirmedServiceRequestAtomicWriteFile) GetServiceChoice() uint8 {
 	return 0x07
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
index 2936d82..dcc214d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
@@ -63,10 +63,6 @@ type IBACnetConfirmedServiceRequestConfirmedCOVNotification interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) ServiceChoice() uint8 {
-	return 0x01
-}
-
 func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) GetServiceChoice() uint8 {
 	return 0x01
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
index 4a76501..45e7696 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) ServiceChoice() uint8 {
-	return 0x1F
-}
-
 func (m *BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple) GetServiceChoice() uint8 {
 	return 0x1F
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
index 8b765d8..a952280 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedEventNotification.go
@@ -88,10 +88,6 @@ type IBACnetConfirmedServiceRequestConfirmedEventNotification interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestConfirmedEventNotification) ServiceChoice() uint8 {
-	return 0x02
-}
-
 func (m *BACnetConfirmedServiceRequestConfirmedEventNotification) GetServiceChoice() uint8 {
 	return 0x02
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
index d9b0729..11cb6ed 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedPrivateTransfer.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestConfirmedPrivateTransfer interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestConfirmedPrivateTransfer) ServiceChoice() uint8 {
-	return 0x12
-}
-
 func (m *BACnetConfirmedServiceRequestConfirmedPrivateTransfer) GetServiceChoice() uint8 {
 	return 0x12
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
index b990eb3..871bb9f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedTextMessage.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestConfirmedTextMessage interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestConfirmedTextMessage) ServiceChoice() uint8 {
-	return 0x13
-}
-
 func (m *BACnetConfirmedServiceRequestConfirmedTextMessage) GetServiceChoice() uint8 {
 	return 0x13
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go
index 21046f9..c123711 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedUnknown.go
@@ -51,10 +51,6 @@ type IBACnetConfirmedServiceRequestConfirmedUnknown interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestConfirmedUnknown) ServiceChoice() uint8 {
-	return 0
-}
-
 func (m *BACnetConfirmedServiceRequestConfirmedUnknown) GetServiceChoice() uint8 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
index 1041ab1..2a7dbf5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestCreateObject.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestCreateObject interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestCreateObject) ServiceChoice() uint8 {
-	return 0x0A
-}
-
 func (m *BACnetConfirmedServiceRequestCreateObject) GetServiceChoice() uint8 {
 	return 0x0A
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
index 42185c6..51e9841 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeleteObject.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestDeleteObject interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestDeleteObject) ServiceChoice() uint8 {
-	return 0x0B
-}
-
 func (m *BACnetConfirmedServiceRequestDeleteObject) GetServiceChoice() uint8 {
 	return 0x0B
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
index f06ab1f..63b732d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestDeviceCommunicationControl.go
@@ -58,10 +58,6 @@ type IBACnetConfirmedServiceRequestDeviceCommunicationControl interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestDeviceCommunicationControl) ServiceChoice() uint8 {
-	return 0x11
-}
-
 func (m *BACnetConfirmedServiceRequestDeviceCommunicationControl) GetServiceChoice() uint8 {
 	return 0x11
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
index b044ebf..00409c8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEnrollmentSummary.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestGetEnrollmentSummary interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestGetEnrollmentSummary) ServiceChoice() uint8 {
-	return 0x04
-}
-
 func (m *BACnetConfirmedServiceRequestGetEnrollmentSummary) GetServiceChoice() uint8 {
 	return 0x04
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
index 92b18f4..db61463 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestGetEventInformation.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestGetEventInformation interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestGetEventInformation) ServiceChoice() uint8 {
-	return 0x1D
-}
-
 func (m *BACnetConfirmedServiceRequestGetEventInformation) GetServiceChoice() uint8 {
 	return 0x1D
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
index 41c56c4..693c5db 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestLifeSafetyOperation.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestLifeSafetyOperation interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestLifeSafetyOperation) ServiceChoice() uint8 {
-	return 0x1B
-}
-
 func (m *BACnetConfirmedServiceRequestLifeSafetyOperation) GetServiceChoice() uint8 {
 	return 0x1B
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
index 97b1c18..57b84b1 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadProperty.go
@@ -58,10 +58,6 @@ type IBACnetConfirmedServiceRequestReadProperty interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestReadProperty) ServiceChoice() uint8 {
-	return 0x0C
-}
-
 func (m *BACnetConfirmedServiceRequestReadProperty) GetServiceChoice() uint8 {
 	return 0x0C
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
index 30c5256..b2650e0 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadPropertyMultiple.go
@@ -51,10 +51,6 @@ type IBACnetConfirmedServiceRequestReadPropertyMultiple interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestReadPropertyMultiple) ServiceChoice() uint8 {
-	return 0x0E
-}
-
 func (m *BACnetConfirmedServiceRequestReadPropertyMultiple) GetServiceChoice() uint8 {
 	return 0x0E
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
index e114bb6..f573969 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReadRange.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestReadRange interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestReadRange) ServiceChoice() uint8 {
-	return 0x1A
-}
-
 func (m *BACnetConfirmedServiceRequestReadRange) GetServiceChoice() uint8 {
 	return 0x1A
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
index 7e73e55..6a802ec 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestReinitializeDevice.go
@@ -55,10 +55,6 @@ type IBACnetConfirmedServiceRequestReinitializeDevice interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestReinitializeDevice) ServiceChoice() uint8 {
-	return 0x14
-}
-
 func (m *BACnetConfirmedServiceRequestReinitializeDevice) GetServiceChoice() uint8 {
 	return 0x14
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
index 68679ad..91b83dc 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemoveListElement.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestRemoveListElement interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestRemoveListElement) ServiceChoice() uint8 {
-	return 0x09
-}
-
 func (m *BACnetConfirmedServiceRequestRemoveListElement) GetServiceChoice() uint8 {
 	return 0x09
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go
index 7c51fc6..e5537c4 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedAuthenticate.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestRemovedAuthenticate interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) ServiceChoice() uint8 {
-	return 0x18
-}
-
 func (m *BACnetConfirmedServiceRequestRemovedAuthenticate) GetServiceChoice() uint8 {
 	return 0x18
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go
index a895963..7fb714d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedReadPropertyConditional.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestRemovedReadPropertyConditional interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) ServiceChoice() uint8 {
-	return 0x0D
-}
-
 func (m *BACnetConfirmedServiceRequestRemovedReadPropertyConditional) GetServiceChoice() uint8 {
 	return 0x0D
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go
index ea82e29..e1b16b5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestRemovedRequestKey.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestRemovedRequestKey interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestRemovedRequestKey) ServiceChoice() uint8 {
-	return 0x19
-}
-
 func (m *BACnetConfirmedServiceRequestRemovedRequestKey) GetServiceChoice() uint8 {
 	return 0x19
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
index 92bb481..1a0800f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOV.go
@@ -60,10 +60,6 @@ type IBACnetConfirmedServiceRequestSubscribeCOV interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestSubscribeCOV) ServiceChoice() uint8 {
-	return 0x05
-}
-
 func (m *BACnetConfirmedServiceRequestSubscribeCOV) GetServiceChoice() uint8 {
 	return 0x05
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
index 12fc427..3678489 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVProperty.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestSubscribeCOVProperty interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestSubscribeCOVProperty) ServiceChoice() uint8 {
-	return 0x1C
-}
-
 func (m *BACnetConfirmedServiceRequestSubscribeCOVProperty) GetServiceChoice() uint8 {
 	return 0x1C
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
index 6a1856e..86a3dd8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) ServiceChoice() uint8 {
-	return 0x1E
-}
-
 func (m *BACnetConfirmedServiceRequestSubscribeCOVPropertyMultiple) GetServiceChoice() uint8 {
 	return 0x1E
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
index 6473c17..9f08d3e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTClose.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestVTClose interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestVTClose) ServiceChoice() uint8 {
-	return 0x16
-}
-
 func (m *BACnetConfirmedServiceRequestVTClose) GetServiceChoice() uint8 {
 	return 0x16
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
index 6bb9168..68b0b19 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTData.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestVTData interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestVTData) ServiceChoice() uint8 {
-	return 0x17
-}
-
 func (m *BACnetConfirmedServiceRequestVTData) GetServiceChoice() uint8 {
 	return 0x17
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
index 4871bed..7c7d3d0 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestVTOpen.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestVTOpen interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestVTOpen) ServiceChoice() uint8 {
-	return 0x15
-}
-
 func (m *BACnetConfirmedServiceRequestVTOpen) GetServiceChoice() uint8 {
 	return 0x15
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
index 98d25fe..aba8d53 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
@@ -64,10 +64,6 @@ type IBACnetConfirmedServiceRequestWriteProperty interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestWriteProperty) ServiceChoice() uint8 {
-	return 0x0F
-}
-
 func (m *BACnetConfirmedServiceRequestWriteProperty) GetServiceChoice() uint8 {
 	return 0x0F
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
index 16431c4..ec0de26 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWritePropertyMultiple.go
@@ -47,10 +47,6 @@ type IBACnetConfirmedServiceRequestWritePropertyMultiple interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConfirmedServiceRequestWritePropertyMultiple) ServiceChoice() uint8 {
-	return 0x10
-}
-
 func (m *BACnetConfirmedServiceRequestWritePropertyMultiple) GetServiceChoice() uint8 {
 	return 0x10
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
index 5c96533..8af723d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataCommand.go
@@ -58,10 +58,6 @@ type IBACnetConstructedDataCommand interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConstructedDataCommand) ObjectType() BACnetObjectType {
-	return BACnetObjectType_COMMAND
-}
-
 func (m *BACnetConstructedDataCommand) GetObjectType() BACnetObjectType {
 	return BACnetObjectType_COMMAND
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go
index 558c522..3258731 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataEventTimestamps.go
@@ -58,10 +58,6 @@ type IBACnetConstructedDataEventTimestamps interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConstructedDataEventTimestamps) ObjectType() BACnetObjectType {
-	return 0
-}
-
 func (m *BACnetConstructedDataEventTimestamps) GetObjectType() BACnetObjectType {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZone.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZone.go
index 6c15725..edacf1a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZone.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataLifeSafetyZone.go
@@ -52,10 +52,6 @@ type IBACnetConstructedDataLifeSafetyZone interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConstructedDataLifeSafetyZone) ObjectType() BACnetObjectType {
-	return BACnetObjectType_LIFE_SAFETY_ZONE
-}
-
 func (m *BACnetConstructedDataLifeSafetyZone) GetObjectType() BACnetObjectType {
 	return BACnetObjectType_LIFE_SAFETY_ZONE
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
index 18cd005..0543e4a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConstructedDataUnspecified.go
@@ -61,10 +61,6 @@ type IBACnetConstructedDataUnspecified interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetConstructedDataUnspecified) ObjectType() BACnetObjectType {
-	return 0
-}
-
 func (m *BACnetConstructedDataUnspecified) GetObjectType() BACnetObjectType {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBitString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBitString.go
index e443dbb..4d0616e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBitString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBitString.go
@@ -52,10 +52,6 @@ type IBACnetContextTagBitString interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagBitString) DataType() BACnetDataType {
-	return BACnetDataType_BIT_STRING
-}
-
 func (m *BACnetContextTagBitString) GetDataType() BACnetDataType {
 	return BACnetDataType_BIT_STRING
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBoolean.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBoolean.go
index 8979a7d..2188805 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBoolean.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagBoolean.go
@@ -57,10 +57,6 @@ type IBACnetContextTagBoolean interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagBoolean) DataType() BACnetDataType {
-	return BACnetDataType_BOOLEAN
-}
-
 func (m *BACnetContextTagBoolean) GetDataType() BACnetDataType {
 	return BACnetDataType_BOOLEAN
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagCharacterString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
index 716bb83..b4bc2d7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagCharacterString.go
@@ -52,10 +52,6 @@ type IBACnetContextTagCharacterString interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagCharacterString) DataType() BACnetDataType {
-	return BACnetDataType_CHARACTER_STRING
-}
-
 func (m *BACnetContextTagCharacterString) GetDataType() BACnetDataType {
 	return BACnetDataType_CHARACTER_STRING
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDate.go
index bf8bc21..0f7a30e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDate.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDate.go
@@ -52,10 +52,6 @@ type IBACnetContextTagDate interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagDate) DataType() BACnetDataType {
-	return BACnetDataType_DATE
-}
-
 func (m *BACnetContextTagDate) GetDataType() BACnetDataType {
 	return BACnetDataType_DATE
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDeviceState.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDeviceState.go
index 7e8b971..aae2712 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDeviceState.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDeviceState.go
@@ -52,10 +52,6 @@ type IBACnetContextTagDeviceState interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagDeviceState) DataType() BACnetDataType {
-	return BACnetDataType_BACNET_DEVICE_STATE
-}
-
 func (m *BACnetContextTagDeviceState) GetDataType() BACnetDataType {
 	return BACnetDataType_BACNET_DEVICE_STATE
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDouble.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDouble.go
index 01157d2..5973c6d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDouble.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagDouble.go
@@ -54,10 +54,6 @@ type IBACnetContextTagDouble interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagDouble) DataType() BACnetDataType {
-	return BACnetDataType_DOUBLE
-}
-
 func (m *BACnetContextTagDouble) GetDataType() BACnetDataType {
 	return BACnetDataType_DOUBLE
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEmpty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEmpty.go
index ed13a3d..e093b28 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEmpty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEmpty.go
@@ -47,10 +47,6 @@ type IBACnetContextTagEmpty interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagEmpty) DataType() BACnetDataType {
-	return 0
-}
-
 func (m *BACnetContextTagEmpty) GetDataType() BACnetDataType {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEnumerated.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
index 4b8032b..cf74ebe 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEnumerated.go
@@ -54,10 +54,6 @@ type IBACnetContextTagEnumerated interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagEnumerated) DataType() BACnetDataType {
-	return BACnetDataType_ENUMERATED
-}
-
 func (m *BACnetContextTagEnumerated) GetDataType() BACnetDataType {
 	return BACnetDataType_ENUMERATED
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventState.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventState.go
index 573cbdd..a7a7c91 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventState.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventState.go
@@ -58,10 +58,6 @@ type IBACnetContextTagEventState interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagEventState) DataType() BACnetDataType {
-	return BACnetDataType_EVENT_STATE
-}
-
 func (m *BACnetContextTagEventState) GetDataType() BACnetDataType {
 	return BACnetDataType_EVENT_STATE
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventType.go
index 8463a85..cd2843c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventType.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagEventType.go
@@ -58,10 +58,6 @@ type IBACnetContextTagEventType interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagEventType) DataType() BACnetDataType {
-	return BACnetDataType_EVENT_TYPE
-}
-
 func (m *BACnetContextTagEventType) GetDataType() BACnetDataType {
 	return BACnetDataType_EVENT_TYPE
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNotifyType.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNotifyType.go
index a145635..d9cdc74 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNotifyType.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagNotifyType.go
@@ -53,10 +53,6 @@ type IBACnetContextTagNotifyType interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagNotifyType) DataType() BACnetDataType {
-	return BACnetDataType_NOTIFY_TYPE
-}
-
 func (m *BACnetContextTagNotifyType) GetDataType() BACnetDataType {
 	return BACnetDataType_NOTIFY_TYPE
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go
index 3c230f5..c6a7191 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagObjectIdentifier.go
@@ -56,10 +56,6 @@ type IBACnetContextTagObjectIdentifier interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagObjectIdentifier) DataType() BACnetDataType {
-	return BACnetDataType_BACNET_OBJECT_IDENTIFIER
-}
-
 func (m *BACnetContextTagObjectIdentifier) GetDataType() BACnetDataType {
 	return BACnetDataType_BACNET_OBJECT_IDENTIFIER
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagOctetString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagOctetString.go
index 64b9b92..13e4b1e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagOctetString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagOctetString.go
@@ -52,10 +52,6 @@ type IBACnetContextTagOctetString interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagOctetString) DataType() BACnetDataType {
-	return BACnetDataType_OCTET_STRING
-}
-
 func (m *BACnetContextTagOctetString) GetDataType() BACnetDataType {
 	return BACnetDataType_OCTET_STRING
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagPropertyIdentifier.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagPropertyIdentifier.go
index 5732d0d..f2232fe 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagPropertyIdentifier.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagPropertyIdentifier.go
@@ -58,10 +58,6 @@ type IBACnetContextTagPropertyIdentifier interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagPropertyIdentifier) DataType() BACnetDataType {
-	return BACnetDataType_BACNET_PROPERTY_IDENTIFIER
-}
-
 func (m *BACnetContextTagPropertyIdentifier) GetDataType() BACnetDataType {
 	return BACnetDataType_BACNET_PROPERTY_IDENTIFIER
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagReal.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagReal.go
index 639c404..18f5888 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagReal.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagReal.go
@@ -54,10 +54,6 @@ type IBACnetContextTagReal interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagReal) DataType() BACnetDataType {
-	return BACnetDataType_REAL
-}
-
 func (m *BACnetContextTagReal) GetDataType() BACnetDataType {
 	return BACnetDataType_REAL
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
index 8980963..3cd7237 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagSignedInteger.go
@@ -54,10 +54,6 @@ type IBACnetContextTagSignedInteger interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagSignedInteger) DataType() BACnetDataType {
-	return BACnetDataType_SIGNED_INTEGER
-}
-
 func (m *BACnetContextTagSignedInteger) GetDataType() BACnetDataType {
 	return BACnetDataType_SIGNED_INTEGER
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagTime.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagTime.go
index ba4eb84..918b689 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagTime.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagTime.go
@@ -52,10 +52,6 @@ type IBACnetContextTagTime interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagTime) DataType() BACnetDataType {
-	return BACnetDataType_TIME
-}
-
 func (m *BACnetContextTagTime) GetDataType() BACnetDataType {
 	return BACnetDataType_TIME
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
index fffb4fe..fa4f975 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetContextTagUnsignedInteger.go
@@ -54,10 +54,6 @@ type IBACnetContextTagUnsignedInteger interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetContextTagUnsignedInteger) DataType() BACnetDataType {
-	return BACnetDataType_UNSIGNED_INTEGER
-}
-
 func (m *BACnetContextTagUnsignedInteger) GetDataType() BACnetDataType {
 	return BACnetDataType_UNSIGNED_INTEGER
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAcknowledgeAlarm.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAcknowledgeAlarm.go
index 002cb1e..a9f6b00 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAcknowledgeAlarm.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAcknowledgeAlarm.go
@@ -44,10 +44,6 @@ type IBACnetErrorAcknowledgeAlarm interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorAcknowledgeAlarm) ServiceChoice() uint8 {
-	return 0x00
-}
-
 func (m *BACnetErrorAcknowledgeAlarm) GetServiceChoice() uint8 {
 	return 0x00
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicReadFile.go
index 5ed226e..87919a9 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicReadFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicReadFile.go
@@ -44,10 +44,6 @@ type IBACnetErrorAtomicReadFile interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorAtomicReadFile) ServiceChoice() uint8 {
-	return 0x06
-}
-
 func (m *BACnetErrorAtomicReadFile) GetServiceChoice() uint8 {
 	return 0x06
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicWriteFile.go
index 95814ba..ab3441b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicWriteFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorAtomicWriteFile.go
@@ -44,10 +44,6 @@ type IBACnetErrorAtomicWriteFile interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorAtomicWriteFile) ServiceChoice() uint8 {
-	return 0x07
-}
-
 func (m *BACnetErrorAtomicWriteFile) GetServiceChoice() uint8 {
 	return 0x07
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedEventNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedEventNotification.go
index 4b235dc..42335c8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedEventNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedEventNotification.go
@@ -44,10 +44,6 @@ type IBACnetErrorConfirmedEventNotification interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorConfirmedEventNotification) ServiceChoice() uint8 {
-	return 0x02
-}
-
 func (m *BACnetErrorConfirmedEventNotification) GetServiceChoice() uint8 {
 	return 0x02
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedPrivateTransfer.go
index d20a93e..4d00bfb 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedPrivateTransfer.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorConfirmedPrivateTransfer.go
@@ -44,10 +44,6 @@ type IBACnetErrorConfirmedPrivateTransfer interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorConfirmedPrivateTransfer) ServiceChoice() uint8 {
-	return 0x12
-}
-
 func (m *BACnetErrorConfirmedPrivateTransfer) GetServiceChoice() uint8 {
 	return 0x12
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorCreateObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorCreateObject.go
index 22677fa..566ea33 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorCreateObject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorCreateObject.go
@@ -44,10 +44,6 @@ type IBACnetErrorCreateObject interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorCreateObject) ServiceChoice() uint8 {
-	return 0x0A
-}
-
 func (m *BACnetErrorCreateObject) GetServiceChoice() uint8 {
 	return 0x0A
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorDeviceCommunicationProtocol.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorDeviceCommunicationProtocol.go
index 94b1a9b..36510f5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorDeviceCommunicationProtocol.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorDeviceCommunicationProtocol.go
@@ -44,10 +44,6 @@ type IBACnetErrorDeviceCommunicationProtocol interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorDeviceCommunicationProtocol) ServiceChoice() uint8 {
-	return 0x11
-}
-
 func (m *BACnetErrorDeviceCommunicationProtocol) GetServiceChoice() uint8 {
 	return 0x11
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetAlarmSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetAlarmSummary.go
index 6844fbf..3185e81 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetAlarmSummary.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetAlarmSummary.go
@@ -44,10 +44,6 @@ type IBACnetErrorGetAlarmSummary interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorGetAlarmSummary) ServiceChoice() uint8 {
-	return 0x03
-}
-
 func (m *BACnetErrorGetAlarmSummary) GetServiceChoice() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEnrollmentSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEnrollmentSummary.go
index 6dbd453..e496912 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEnrollmentSummary.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEnrollmentSummary.go
@@ -44,10 +44,6 @@ type IBACnetErrorGetEnrollmentSummary interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorGetEnrollmentSummary) ServiceChoice() uint8 {
-	return 0x04
-}
-
 func (m *BACnetErrorGetEnrollmentSummary) GetServiceChoice() uint8 {
 	return 0x04
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEventInformation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEventInformation.go
index ad81378..a3eda18 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEventInformation.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorGetEventInformation.go
@@ -44,10 +44,6 @@ type IBACnetErrorGetEventInformation interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorGetEventInformation) ServiceChoice() uint8 {
-	return 0x1D
-}
-
 func (m *BACnetErrorGetEventInformation) GetServiceChoice() uint8 {
 	return 0x1D
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorPasswordFailure.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorPasswordFailure.go
index 5c6bd32..88e6ac4 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorPasswordFailure.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorPasswordFailure.go
@@ -44,10 +44,6 @@ type IBACnetErrorPasswordFailure interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorPasswordFailure) ServiceChoice() uint8 {
-	return 0x14
-}
-
 func (m *BACnetErrorPasswordFailure) GetServiceChoice() uint8 {
 	return 0x14
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadProperty.go
index 89b403a..c110025 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadProperty.go
@@ -44,10 +44,6 @@ type IBACnetErrorReadProperty interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorReadProperty) ServiceChoice() uint8 {
-	return 0x0C
-}
-
 func (m *BACnetErrorReadProperty) GetServiceChoice() uint8 {
 	return 0x0C
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadPropertyMultiple.go
index 366d7c4..10b0f05 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadPropertyMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadPropertyMultiple.go
@@ -44,10 +44,6 @@ type IBACnetErrorReadPropertyMultiple interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorReadPropertyMultiple) ServiceChoice() uint8 {
-	return 0x0E
-}
-
 func (m *BACnetErrorReadPropertyMultiple) GetServiceChoice() uint8 {
 	return 0x0E
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadRange.go
index 86a72e6..e06f579 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadRange.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorReadRange.go
@@ -44,10 +44,6 @@ type IBACnetErrorReadRange interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorReadRange) ServiceChoice() uint8 {
-	return 0x1A
-}
-
 func (m *BACnetErrorReadRange) GetServiceChoice() uint8 {
 	return 0x1A
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedAuthenticate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedAuthenticate.go
index 9c766bf..bed1ab7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedAuthenticate.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedAuthenticate.go
@@ -44,10 +44,6 @@ type IBACnetErrorRemovedAuthenticate interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorRemovedAuthenticate) ServiceChoice() uint8 {
-	return 0x18
-}
-
 func (m *BACnetErrorRemovedAuthenticate) GetServiceChoice() uint8 {
 	return 0x18
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedReadPropertyConditional.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedReadPropertyConditional.go
index f6dcf9a..6f31a7c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedReadPropertyConditional.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorRemovedReadPropertyConditional.go
@@ -44,10 +44,6 @@ type IBACnetErrorRemovedReadPropertyConditional interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorRemovedReadPropertyConditional) ServiceChoice() uint8 {
-	return 0x0D
-}
-
 func (m *BACnetErrorRemovedReadPropertyConditional) GetServiceChoice() uint8 {
 	return 0x0D
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorUnknown.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorUnknown.go
index a27d182..bf7a84b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorUnknown.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorUnknown.go
@@ -44,10 +44,6 @@ type IBACnetErrorUnknown interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorUnknown) ServiceChoice() uint8 {
-	return 0
-}
-
 func (m *BACnetErrorUnknown) GetServiceChoice() uint8 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTData.go
index 2f4f59b..f73c6dd 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTData.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTData.go
@@ -44,10 +44,6 @@ type IBACnetErrorVTData interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorVTData) ServiceChoice() uint8 {
-	return 0x17
-}
-
 func (m *BACnetErrorVTData) GetServiceChoice() uint8 {
 	return 0x17
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTOpen.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTOpen.go
index 287cbab..89f264c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTOpen.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorVTOpen.go
@@ -44,10 +44,6 @@ type IBACnetErrorVTOpen interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorVTOpen) ServiceChoice() uint8 {
-	return 0x15
-}
-
 func (m *BACnetErrorVTOpen) GetServiceChoice() uint8 {
 	return 0x15
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorWriteProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorWriteProperty.go
index edee36a..c8faef1 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorWriteProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetErrorWriteProperty.go
@@ -44,10 +44,6 @@ type IBACnetErrorWriteProperty interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetErrorWriteProperty) ServiceChoice() uint8 {
-	return 0x0F
-}
-
 func (m *BACnetErrorWriteProperty) GetServiceChoice() uint8 {
 	return 0x0F
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetOpeningTag.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetOpeningTag.go
index c3ee6ac..1daa712 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetOpeningTag.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetOpeningTag.go
@@ -48,10 +48,6 @@ type IBACnetOpeningTag interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetOpeningTag) DataType() BACnetDataType {
-	return BACnetDataType_OPENING_TAG
-}
-
 func (m *BACnetOpeningTag) GetDataType() BACnetDataType {
 	return BACnetDataType_OPENING_TAG
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
index c7fe398..a478739 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicReadFile.go
@@ -51,10 +51,6 @@ type IBACnetServiceAckAtomicReadFile interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckAtomicReadFile) ServiceChoice() uint8 {
-	return 0x06
-}
-
 func (m *BACnetServiceAckAtomicReadFile) GetServiceChoice() uint8 {
 	return 0x06
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
index be65669..2ddb06e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckAtomicWriteFile.go
@@ -48,10 +48,6 @@ type IBACnetServiceAckAtomicWriteFile interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckAtomicWriteFile) ServiceChoice() uint8 {
-	return 0x07
-}
-
 func (m *BACnetServiceAckAtomicWriteFile) GetServiceChoice() uint8 {
 	return 0x07
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
index 1ff27f8..5014cbe 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckConfirmedPrivateTransfer.go
@@ -44,10 +44,6 @@ type IBACnetServiceAckConfirmedPrivateTransfer interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckConfirmedPrivateTransfer) ServiceChoice() uint8 {
-	return 0x12
-}
-
 func (m *BACnetServiceAckConfirmedPrivateTransfer) GetServiceChoice() uint8 {
 	return 0x12
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go
index 63ee0ac..cd07e32 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckCreateObject.go
@@ -44,10 +44,6 @@ type IBACnetServiceAckCreateObject interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckCreateObject) ServiceChoice() uint8 {
-	return 0x0A
-}
-
 func (m *BACnetServiceAckCreateObject) GetServiceChoice() uint8 {
 	return 0x0A
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go
index ffe39f2..5ca7088 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetAlarmSummary.go
@@ -44,10 +44,6 @@ type IBACnetServiceAckGetAlarmSummary interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckGetAlarmSummary) ServiceChoice() uint8 {
-	return 0x03
-}
-
 func (m *BACnetServiceAckGetAlarmSummary) GetServiceChoice() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
index 0748e40..42663dc 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEnrollmentSummary.go
@@ -44,10 +44,6 @@ type IBACnetServiceAckGetEnrollmentSummary interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckGetEnrollmentSummary) ServiceChoice() uint8 {
-	return 0x04
-}
-
 func (m *BACnetServiceAckGetEnrollmentSummary) GetServiceChoice() uint8 {
 	return 0x04
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go
index 8be4d7f..3c268e7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckGetEventInformation.go
@@ -44,10 +44,6 @@ type IBACnetServiceAckGetEventInformation interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckGetEventInformation) ServiceChoice() uint8 {
-	return 0x1D
-}
-
 func (m *BACnetServiceAckGetEventInformation) GetServiceChoice() uint8 {
 	return 0x1D
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
index df14c02..10a2d6f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadProperty.go
@@ -58,10 +58,6 @@ type IBACnetServiceAckReadProperty interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckReadProperty) ServiceChoice() uint8 {
-	return 0x0C
-}
-
 func (m *BACnetServiceAckReadProperty) GetServiceChoice() uint8 {
 	return 0x0C
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
index e2e3736..844a1f5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadPropertyMultiple.go
@@ -44,10 +44,6 @@ type IBACnetServiceAckReadPropertyMultiple interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckReadPropertyMultiple) ServiceChoice() uint8 {
-	return 0x0E
-}
-
 func (m *BACnetServiceAckReadPropertyMultiple) GetServiceChoice() uint8 {
 	return 0x0E
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadRange.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
index fb41e94..9ea4e63 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckReadRange.go
@@ -44,10 +44,6 @@ type IBACnetServiceAckReadRange interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckReadRange) ServiceChoice() uint8 {
-	return 0x1A
-}
-
 func (m *BACnetServiceAckReadRange) GetServiceChoice() uint8 {
 	return 0x1A
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedAuthenticate.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedAuthenticate.go
index dd7bf94..8ce9040 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedAuthenticate.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedAuthenticate.go
@@ -44,10 +44,6 @@ type IBACnetServiceAckRemovedAuthenticate interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckRemovedAuthenticate) ServiceChoice() uint8 {
-	return 0x18
-}
-
 func (m *BACnetServiceAckRemovedAuthenticate) GetServiceChoice() uint8 {
 	return 0x18
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedReadPropertyConditional.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedReadPropertyConditional.go
index 2eba8d7..03ffe92 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedReadPropertyConditional.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckRemovedReadPropertyConditional.go
@@ -44,10 +44,6 @@ type IBACnetServiceAckRemovedReadPropertyConditional interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckRemovedReadPropertyConditional) ServiceChoice() uint8 {
-	return 0x0D
-}
-
 func (m *BACnetServiceAckRemovedReadPropertyConditional) GetServiceChoice() uint8 {
 	return 0x0D
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTData.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTData.go
index 2bfe23b..9dbb288 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTData.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTData.go
@@ -44,10 +44,6 @@ type IBACnetServiceAckVTData interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckVTData) ServiceChoice() uint8 {
-	return 0x17
-}
-
 func (m *BACnetServiceAckVTData) GetServiceChoice() uint8 {
 	return 0x17
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go
index 2be888a..1f6a21f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetServiceAckVTOpen.go
@@ -44,10 +44,6 @@ type IBACnetServiceAckVTOpen interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetServiceAckVTOpen) ServiceChoice() uint8 {
-	return 0x15
-}
-
 func (m *BACnetServiceAckVTOpen) GetServiceChoice() uint8 {
 	return 0x15
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
index c4a8425..7a8fce0 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIAm.go
@@ -60,10 +60,6 @@ type IBACnetUnconfirmedServiceRequestIAm interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestIAm) ServiceChoice() uint8 {
-	return 0x00
-}
-
 func (m *BACnetUnconfirmedServiceRequestIAm) GetServiceChoice() uint8 {
 	return 0x00
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
index efaea95..4d2ac27 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestIHave.go
@@ -57,10 +57,6 @@ type IBACnetUnconfirmedServiceRequestIHave interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestIHave) ServiceChoice() uint8 {
-	return 0x01
-}
-
 func (m *BACnetUnconfirmedServiceRequestIHave) GetServiceChoice() uint8 {
 	return 0x01
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
index b63f479..be64170 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestTimeSynchronization.go
@@ -54,10 +54,6 @@ type IBACnetUnconfirmedServiceRequestTimeSynchronization interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestTimeSynchronization) ServiceChoice() uint8 {
-	return 0x06
-}
-
 func (m *BACnetUnconfirmedServiceRequestTimeSynchronization) GetServiceChoice() uint8 {
 	return 0x06
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go
index c92c288..7bbd986 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUTCTimeSynchronization.go
@@ -47,10 +47,6 @@ type IBACnetUnconfirmedServiceRequestUTCTimeSynchronization interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestUTCTimeSynchronization) ServiceChoice() uint8 {
-	return 0x09
-}
-
 func (m *BACnetUnconfirmedServiceRequestUTCTimeSynchronization) GetServiceChoice() uint8 {
 	return 0x09
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
index bf0c9ca..1cdefb4 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification.go
@@ -63,10 +63,6 @@ type IBACnetUnconfirmedServiceRequestUnconfirmedCOVNotification interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification) ServiceChoice() uint8 {
-	return 0x02
-}
-
 func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification) GetServiceChoice() uint8 {
 	return 0x02
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
index be6a598..98ecdf1 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple.go
@@ -47,10 +47,6 @@ type IBACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple interfac
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple) ServiceChoice() uint8 {
-	return 0x0B
-}
-
 func (m *BACnetUnconfirmedServiceRequestUnconfirmedCOVNotificationMultiple) GetServiceChoice() uint8 {
 	return 0x0B
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
index 3f120ee..698be84 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedEventNotification.go
@@ -47,10 +47,6 @@ type IBACnetUnconfirmedServiceRequestUnconfirmedEventNotification interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestUnconfirmedEventNotification) ServiceChoice() uint8 {
-	return 0x03
-}
-
 func (m *BACnetUnconfirmedServiceRequestUnconfirmedEventNotification) GetServiceChoice() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
index 34b2643..a8ed5c6 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
@@ -58,10 +58,6 @@ type IBACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) ServiceChoice() uint8 {
-	return 0x04
-}
-
 func (m *BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) GetServiceChoice() uint8 {
 	return 0x04
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
index b18fd33..2afc3f6 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedTextMessage.go
@@ -47,10 +47,6 @@ type IBACnetUnconfirmedServiceRequestUnconfirmedTextMessage interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestUnconfirmedTextMessage) ServiceChoice() uint8 {
-	return 0x05
-}
-
 func (m *BACnetUnconfirmedServiceRequestUnconfirmedTextMessage) GetServiceChoice() uint8 {
 	return 0x05
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedUnknown.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedUnknown.go
index a90343c..af14fff 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedUnknown.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedUnknown.go
@@ -51,10 +51,6 @@ type IBACnetUnconfirmedServiceRequestUnconfirmedUnknown interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestUnconfirmedUnknown) ServiceChoice() uint8 {
-	return 0
-}
-
 func (m *BACnetUnconfirmedServiceRequestUnconfirmedUnknown) GetServiceChoice() uint8 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
index 10c4d3d..7b105ee 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoHas.go
@@ -61,10 +61,6 @@ type IBACnetUnconfirmedServiceRequestWhoHas interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestWhoHas) ServiceChoice() uint8 {
-	return 0x07
-}
-
 func (m *BACnetUnconfirmedServiceRequestWhoHas) GetServiceChoice() uint8 {
 	return 0x07
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
index ac89ed8..8ecabf6 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWhoIs.go
@@ -55,10 +55,6 @@ type IBACnetUnconfirmedServiceRequestWhoIs interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestWhoIs) ServiceChoice() uint8 {
-	return 0x08
-}
-
 func (m *BACnetUnconfirmedServiceRequestWhoIs) GetServiceChoice() uint8 {
 	return 0x08
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
index 5e05f66..d24abe8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestWriteGroup.go
@@ -47,10 +47,6 @@ type IBACnetUnconfirmedServiceRequestWriteGroup interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BACnetUnconfirmedServiceRequestWriteGroup) ServiceChoice() uint8 {
-	return 0x0A
-}
-
 func (m *BACnetUnconfirmedServiceRequestWriteGroup) GetServiceChoice() uint8 {
 	return 0x0A
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go
index a0225f6..8e8f23f 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDeleteForeignDeviceTableEntry.go
@@ -44,10 +44,6 @@ type IBVLCDeleteForeignDeviceTableEntry interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCDeleteForeignDeviceTableEntry) BvlcFunction() uint8 {
-	return 0x08
-}
-
 func (m *BVLCDeleteForeignDeviceTableEntry) GetBvlcFunction() uint8 {
 	return 0x08
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
index c8b4d60..3186cbd 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCDistributeBroadcastToNetwork.go
@@ -51,10 +51,6 @@ type IBVLCDistributeBroadcastToNetwork interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCDistributeBroadcastToNetwork) BvlcFunction() uint8 {
-	return 0x09
-}
-
 func (m *BVLCDistributeBroadcastToNetwork) GetBvlcFunction() uint8 {
 	return 0x09
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go
index ea5add6..b9969fd 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go
@@ -57,10 +57,6 @@ type IBVLCForwardedNPDU interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCForwardedNPDU) BvlcFunction() uint8 {
-	return 0x04
-}
-
 func (m *BVLCForwardedNPDU) GetBvlcFunction() uint8 {
 	return 0x04
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
index 4f67db8..d27b4e4 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
@@ -51,10 +51,6 @@ type IBVLCOriginalBroadcastNPDU interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCOriginalBroadcastNPDU) BvlcFunction() uint8 {
-	return 0x0B
-}
-
 func (m *BVLCOriginalBroadcastNPDU) GetBvlcFunction() uint8 {
 	return 0x0B
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
index 9e476ba..768e79a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
@@ -51,10 +51,6 @@ type IBVLCOriginalUnicastNPDU interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCOriginalUnicastNPDU) BvlcFunction() uint8 {
-	return 0x0A
-}
-
 func (m *BVLCOriginalUnicastNPDU) GetBvlcFunction() uint8 {
 	return 0x0A
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go
index ab99603..acd5a7a 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTable.go
@@ -44,10 +44,6 @@ type IBVLCReadBroadcastDistributionTable interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCReadBroadcastDistributionTable) BvlcFunction() uint8 {
-	return 0x02
-}
-
 func (m *BVLCReadBroadcastDistributionTable) GetBvlcFunction() uint8 {
 	return 0x02
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go
index a65310a..622ce1b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadBroadcastDistributionTableAck.go
@@ -44,10 +44,6 @@ type IBVLCReadBroadcastDistributionTableAck interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCReadBroadcastDistributionTableAck) BvlcFunction() uint8 {
-	return 0x03
-}
-
 func (m *BVLCReadBroadcastDistributionTableAck) GetBvlcFunction() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go
index 2bd9656..7f9b357 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTable.go
@@ -44,10 +44,6 @@ type IBVLCReadForeignDeviceTable interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCReadForeignDeviceTable) BvlcFunction() uint8 {
-	return 0x06
-}
-
 func (m *BVLCReadForeignDeviceTable) GetBvlcFunction() uint8 {
 	return 0x06
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go
index 07028cd..59075b2 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCReadForeignDeviceTableAck.go
@@ -44,10 +44,6 @@ type IBVLCReadForeignDeviceTableAck interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCReadForeignDeviceTableAck) BvlcFunction() uint8 {
-	return 0x07
-}
-
 func (m *BVLCReadForeignDeviceTableAck) GetBvlcFunction() uint8 {
 	return 0x07
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go
index d48aad8..2c68234 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCRegisterForeignDevice.go
@@ -48,10 +48,6 @@ type IBVLCRegisterForeignDevice interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCRegisterForeignDevice) BvlcFunction() uint8 {
-	return 0x05
-}
-
 func (m *BVLCRegisterForeignDevice) GetBvlcFunction() uint8 {
 	return 0x05
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go
index 9973e15..e3ea1f5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCResult.go
@@ -48,10 +48,6 @@ type IBVLCResult interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCResult) BvlcFunction() uint8 {
-	return 0x00
-}
-
 func (m *BVLCResult) GetBvlcFunction() uint8 {
 	return 0x00
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCSecureBVLL.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCSecureBVLL.go
index 066f27c..c7a82b8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCSecureBVLL.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCSecureBVLL.go
@@ -44,10 +44,6 @@ type IBVLCSecureBVLL interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCSecureBVLL) BvlcFunction() uint8 {
-	return 0x0C
-}
-
 func (m *BVLCSecureBVLL) GetBvlcFunction() uint8 {
 	return 0x0C
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go
index de5a492..f2be5f9 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCWriteBroadcastDistributionTable.go
@@ -51,10 +51,6 @@ type IBVLCWriteBroadcastDistributionTable interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *BVLCWriteBroadcastDistributionTable) BvlcFunction() uint8 {
-	return 0x01
-}
-
 func (m *BVLCWriteBroadcastDistributionTable) GetBvlcFunction() uint8 {
 	return 0x01
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go
index e60fd2a..0c43bf7 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMDisconnectConnectionToNetwork.go
@@ -51,10 +51,6 @@ type INLMDisconnectConnectionToNetwork interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NLMDisconnectConnectionToNetwork) MessageType() uint8 {
-	return 0x09
-}
-
 func (m *NLMDisconnectConnectionToNetwork) GetMessageType() uint8 {
 	return 0x09
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go
index a3769d4..6b81f6c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMEstablishConnectionToNetwork.go
@@ -54,10 +54,6 @@ type INLMEstablishConnectionToNetwork interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NLMEstablishConnectionToNetwork) MessageType() uint8 {
-	return 0x08
-}
-
 func (m *NLMEstablishConnectionToNetwork) GetMessageType() uint8 {
 	return 0x08
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
index e3af778..25bf472 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
@@ -51,10 +51,6 @@ type INLMIAmRouterToNetwork interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NLMIAmRouterToNetwork) MessageType() uint8 {
-	return 0x01
-}
-
 func (m *NLMIAmRouterToNetwork) GetMessageType() uint8 {
 	return 0x01
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go
index 8e4bc09..faf38c4 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMICouldBeRouterToNetwork.go
@@ -54,10 +54,6 @@ type INLMICouldBeRouterToNetwork interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NLMICouldBeRouterToNetwork) MessageType() uint8 {
-	return 0x02
-}
-
 func (m *NLMICouldBeRouterToNetwork) GetMessageType() uint8 {
 	return 0x02
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTable.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTable.go
index 94a61e8..1046b79 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTable.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTable.go
@@ -54,10 +54,6 @@ type INLMInitalizeRoutingTable interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NLMInitalizeRoutingTable) MessageType() uint8 {
-	return 0x06
-}
-
 func (m *NLMInitalizeRoutingTable) GetMessageType() uint8 {
 	return 0x06
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTableAck.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTableAck.go
index 049db76..5ee930c 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTableAck.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMInitalizeRoutingTableAck.go
@@ -54,10 +54,6 @@ type INLMInitalizeRoutingTableAck interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NLMInitalizeRoutingTableAck) MessageType() uint8 {
-	return 0x07
-}
-
 func (m *NLMInitalizeRoutingTableAck) GetMessageType() uint8 {
 	return 0x07
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go
index ffbe72e..656a1ff 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go
@@ -54,10 +54,6 @@ type INLMRejectRouterToNetwork interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NLMRejectRouterToNetwork) MessageType() uint8 {
-	return 0x03
-}
-
 func (m *NLMRejectRouterToNetwork) GetMessageType() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go
index 300b95c..fadc56b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterAvailableToNetwork.go
@@ -51,10 +51,6 @@ type INLMRouterAvailableToNetwork interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NLMRouterAvailableToNetwork) MessageType() uint8 {
-	return 0x05
-}
-
 func (m *NLMRouterAvailableToNetwork) GetMessageType() uint8 {
 	return 0x05
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go
index 2d4e419..8363b86 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMRouterBusyToNetwork.go
@@ -51,10 +51,6 @@ type INLMRouterBusyToNetwork interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NLMRouterBusyToNetwork) MessageType() uint8 {
-	return 0x04
-}
-
 func (m *NLMRouterBusyToNetwork) GetMessageType() uint8 {
 	return 0x04
 }
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
index ecd7404..8b555e5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
@@ -51,10 +51,6 @@ type INLMWhoIsRouterToNetwork interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NLMWhoIsRouterToNetwork) MessageType() uint8 {
-	return 0x00
-}
-
 func (m *NLMWhoIsRouterToNetwork) GetMessageType() uint8 {
 	return 0x00
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/ConfirmationSuccessful.go b/plc4go/internal/plc4go/cbus/readwrite/model/ConfirmationSuccessful.go
index 65c020d..0dc4b00 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/ConfirmationSuccessful.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/ConfirmationSuccessful.go
@@ -44,10 +44,6 @@ type IConfirmationSuccessful interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ConfirmationSuccessful) ConfirmationType() byte {
-	return 0x2E
-}
-
 func (m *ConfirmationSuccessful) GetConfirmationType() byte {
 	return 0x2E
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandCurrentSenseLevels.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandCurrentSenseLevels.go
index b9aefc4..b8cd74a 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandCurrentSenseLevels.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandCurrentSenseLevels.go
@@ -44,10 +44,6 @@ type IIdentifyReplyCommandCurrentSenseLevels interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandCurrentSenseLevels) Attribute() Attribute {
-	return Attribute_CurrentSenseLevels
-}
-
 func (m *IdentifyReplyCommandCurrentSenseLevels) GetAttribute() Attribute {
 	return Attribute_CurrentSenseLevels
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go
index 3943d18..d245bd6 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandDSIStatus.go
@@ -75,10 +75,6 @@ type IIdentifyReplyCommandDSIStatus interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandDSIStatus) Attribute() Attribute {
-	return Attribute_DSIStatus
-}
-
 func (m *IdentifyReplyCommandDSIStatus) GetAttribute() Attribute {
 	return Attribute_DSIStatus
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandDelays.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandDelays.go
index c3640a8..247356b 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandDelays.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandDelays.go
@@ -44,10 +44,6 @@ type IIdentifyReplyCommandDelays interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandDelays) Attribute() Attribute {
-	return Attribute_Delays
-}
-
 func (m *IdentifyReplyCommandDelays) GetAttribute() Attribute {
 	return Attribute_Delays
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
index d73d712..bf2b797 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandExtendedDiagnosticSummary.go
@@ -103,10 +103,6 @@ type IIdentifyReplyCommandExtendedDiagnosticSummary interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandExtendedDiagnosticSummary) Attribute() Attribute {
-	return Attribute_ExtendedDiagnosticSummary
-}
-
 func (m *IdentifyReplyCommandExtendedDiagnosticSummary) GetAttribute() Attribute {
 	return Attribute_ExtendedDiagnosticSummary
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareSummary.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareSummary.go
index 0d1ad09..807234c 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareSummary.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareSummary.go
@@ -54,10 +54,6 @@ type IIdentifyReplyCommandFirmwareSummary interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandFirmwareSummary) Attribute() Attribute {
-	return Attribute_Summary
-}
-
 func (m *IdentifyReplyCommandFirmwareSummary) GetAttribute() Attribute {
 	return Attribute_Summary
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go
index 4e50b73..5f1f59a 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandFirmwareVersion.go
@@ -48,10 +48,6 @@ type IIdentifyReplyCommandFirmwareVersion interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandFirmwareVersion) Attribute() Attribute {
-	return Attribute_FirmwareVersion
-}
-
 func (m *IdentifyReplyCommandFirmwareVersion) GetAttribute() Attribute {
 	return Attribute_FirmwareVersion
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go
index 6468ac4..8378797 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVPhysicalAddresses.go
@@ -48,10 +48,6 @@ type IIdentifyReplyCommandGAVPhysicalAddresses interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandGAVPhysicalAddresses) Attribute() Attribute {
-	return Attribute_GAVPhysicalAddresses
-}
-
 func (m *IdentifyReplyCommandGAVPhysicalAddresses) GetAttribute() Attribute {
 	return Attribute_GAVPhysicalAddresses
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go
index f262110..be03e9b 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesCurrent.go
@@ -48,10 +48,6 @@ type IIdentifyReplyCommandGAVValuesCurrent interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandGAVValuesCurrent) Attribute() Attribute {
-	return Attribute_GAVValuesCurrent
-}
-
 func (m *IdentifyReplyCommandGAVValuesCurrent) GetAttribute() Attribute {
 	return Attribute_GAVValuesCurrent
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go
index 14c6560..a36efc3 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandGAVValuesStored.go
@@ -48,10 +48,6 @@ type IIdentifyReplyCommandGAVValuesStored interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandGAVValuesStored) Attribute() Attribute {
-	return Attribute_GAVValuesStored
-}
-
 func (m *IdentifyReplyCommandGAVValuesStored) GetAttribute() Attribute {
 	return Attribute_GAVValuesStored
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandLogicalAssignment.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandLogicalAssignment.go
index df35742..b4bff9e 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandLogicalAssignment.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandLogicalAssignment.go
@@ -44,10 +44,6 @@ type IIdentifyReplyCommandLogicalAssignment interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandLogicalAssignment) Attribute() Attribute {
-	return Attribute_LogicalAssignment
-}
-
 func (m *IdentifyReplyCommandLogicalAssignment) GetAttribute() Attribute {
 	return Attribute_LogicalAssignment
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go
index ae92971..5daa103 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandManufacturer.go
@@ -48,10 +48,6 @@ type IIdentifyReplyCommandManufacturer interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandManufacturer) Attribute() Attribute {
-	return Attribute_Manufacturer
-}
-
 func (m *IdentifyReplyCommandManufacturer) GetAttribute() Attribute {
 	return Attribute_Manufacturer
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandMaximumLevels.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandMaximumLevels.go
index d70d324..994a8a8 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandMaximumLevels.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandMaximumLevels.go
@@ -44,10 +44,6 @@ type IIdentifyReplyCommandMaximumLevels interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandMaximumLevels) Attribute() Attribute {
-	return Attribute_MaximumLevels
-}
-
 func (m *IdentifyReplyCommandMaximumLevels) GetAttribute() Attribute {
 	return Attribute_MaximumLevels
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandMinimumLevels.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandMinimumLevels.go
index dd68e36..0f67ef0 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandMinimumLevels.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandMinimumLevels.go
@@ -44,10 +44,6 @@ type IIdentifyReplyCommandMinimumLevels interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandMinimumLevels) Attribute() Attribute {
-	return Attribute_MinimumLevels
-}
-
 func (m *IdentifyReplyCommandMinimumLevels) GetAttribute() Attribute {
 	return Attribute_MinimumLevels
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandNetworkTerminalLevels.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandNetworkTerminalLevels.go
index 92230e2..86a58fb 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandNetworkTerminalLevels.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandNetworkTerminalLevels.go
@@ -44,10 +44,6 @@ type IIdentifyReplyCommandNetworkTerminalLevels interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandNetworkTerminalLevels) Attribute() Attribute {
-	return Attribute_NetworkTerminalLevels
-}
-
 func (m *IdentifyReplyCommandNetworkTerminalLevels) GetAttribute() Attribute {
 	return Attribute_NetworkTerminalLevels
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go
index 8e87fff..77a13c9 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandNetworkVoltage.go
@@ -56,10 +56,6 @@ type IIdentifyReplyCommandNetworkVoltage interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandNetworkVoltage) Attribute() Attribute {
-	return Attribute_NetworkVoltage
-}
-
 func (m *IdentifyReplyCommandNetworkVoltage) GetAttribute() Attribute {
 	return Attribute_NetworkVoltage
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandOutputUnitSummary.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandOutputUnitSummary.go
index c186225..04ef016 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandOutputUnitSummary.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandOutputUnitSummary.go
@@ -44,10 +44,6 @@ type IIdentifyReplyCommandOutputUnitSummary interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandOutputUnitSummary) Attribute() Attribute {
-	return Attribute_OutputUnitSummary
-}
-
 func (m *IdentifyReplyCommandOutputUnitSummary) GetAttribute() Attribute {
 	return Attribute_OutputUnitSummary
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandTerminalLevels.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandTerminalLevels.go
index c6fdfd9..ea2f31d 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandTerminalLevels.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandTerminalLevels.go
@@ -44,10 +44,6 @@ type IIdentifyReplyCommandTerminalLevels interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandTerminalLevels) Attribute() Attribute {
-	return Attribute_TerminalLevel
-}
-
 func (m *IdentifyReplyCommandTerminalLevels) GetAttribute() Attribute {
 	return Attribute_TerminalLevel
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandType.go b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandType.go
index 0e3217f..e2b6ac3 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandType.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/IdentifyReplyCommandType.go
@@ -48,10 +48,6 @@ type IIdentifyReplyCommandType interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *IdentifyReplyCommandType) Attribute() Attribute {
-	return Attribute_Type
-}
-
 func (m *IdentifyReplyCommandType) GetAttribute() Attribute {
 	return Attribute_Type
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedCorruption.go b/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedCorruption.go
index 77dd835..594743c 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedCorruption.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedCorruption.go
@@ -44,10 +44,6 @@ type INotTransmittedCorruption interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NotTransmittedCorruption) ConfirmationType() byte {
-	return 0x24
-}
-
 func (m *NotTransmittedCorruption) GetConfirmationType() byte {
 	return 0x24
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedSyncLoss.go b/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedSyncLoss.go
index 829c080..f6302cf 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedSyncLoss.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedSyncLoss.go
@@ -44,10 +44,6 @@ type INotTransmittedSyncLoss interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NotTransmittedSyncLoss) ConfirmationType() byte {
-	return 0x25
-}
-
 func (m *NotTransmittedSyncLoss) GetConfirmationType() byte {
 	return 0x25
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedToManyReTransmissions.go b/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedToManyReTransmissions.go
index 50d6d5e..bc2b62c 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedToManyReTransmissions.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedToManyReTransmissions.go
@@ -44,10 +44,6 @@ type INotTransmittedToManyReTransmissions interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NotTransmittedToManyReTransmissions) ConfirmationType() byte {
-	return 0x23
-}
-
 func (m *NotTransmittedToManyReTransmissions) GetConfirmationType() byte {
 	return 0x23
 }
diff --git a/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedTooLong.go b/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedTooLong.go
index 20c7e5a..4d353b6 100644
--- a/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedTooLong.go
+++ b/plc4go/internal/plc4go/cbus/readwrite/model/NotTransmittedTooLong.go
@@ -44,10 +44,6 @@ type INotTransmittedTooLong interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *NotTransmittedTooLong) ConfirmationType() byte {
-	return 0x27
-}
-
 func (m *NotTransmittedTooLong) GetConfirmationType() byte {
 	return 0x27
 }
diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrame.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrame.go
index e7fa40d..283f93d 100644
--- a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrame.go
+++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrame.go
@@ -59,10 +59,6 @@ type IDF1SymbolMessageFrame interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DF1SymbolMessageFrame) SymbolType() uint8 {
-	return 0x02
-}
-
 func (m *DF1SymbolMessageFrame) GetSymbolType() uint8 {
 	return 0x02
 }
diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameACK.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameACK.go
index 3a530be..a619cc8 100644
--- a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameACK.go
+++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameACK.go
@@ -44,10 +44,6 @@ type IDF1SymbolMessageFrameACK interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DF1SymbolMessageFrameACK) SymbolType() uint8 {
-	return 0x06
-}
-
 func (m *DF1SymbolMessageFrameACK) GetSymbolType() uint8 {
 	return 0x06
 }
diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameNAK.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameNAK.go
index 693768f..932b841 100644
--- a/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameNAK.go
+++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1SymbolMessageFrameNAK.go
@@ -44,10 +44,6 @@ type IDF1SymbolMessageFrameNAK interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DF1SymbolMessageFrameNAK) SymbolType() uint8 {
-	return 0x15
-}
-
 func (m *DF1SymbolMessageFrameNAK) GetSymbolType() uint8 {
 	return 0x15
 }
diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadRequest.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadRequest.go
index 2e5488f..f238015 100644
--- a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadRequest.go
+++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadRequest.go
@@ -51,10 +51,6 @@ type IDF1UnprotectedReadRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DF1UnprotectedReadRequest) CommandCode() uint8 {
-	return 0x01
-}
-
 func (m *DF1UnprotectedReadRequest) GetCommandCode() uint8 {
 	return 0x01
 }
diff --git a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go
index a19df65..a9eac99 100644
--- a/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go
+++ b/plc4go/internal/plc4go/df1/readwrite/model/DF1UnprotectedReadResponse.go
@@ -47,10 +47,6 @@ type IDF1UnprotectedReadResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DF1UnprotectedReadResponse) CommandCode() uint8 {
-	return 0x41
-}
-
 func (m *DF1UnprotectedReadResponse) GetCommandCode() uint8 {
 	return 0x41
 }
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go b/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go
index 4783a63..9f66fbe 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go
@@ -52,10 +52,6 @@ type ICipRRData interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CipRRData) Command() uint16 {
-	return 0x006F
-}
-
 func (m *CipRRData) GetCommand() uint16 {
 	return 0x006F
 }
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go
index 044f485..5c369fb 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipReadRequest.go
@@ -57,10 +57,6 @@ type ICipReadRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CipReadRequest) Service() uint8 {
-	return 0x4C
-}
-
 func (m *CipReadRequest) GetService() uint8 {
 	return 0x4C
 }
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go
index 37d0079..f5d4900 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go
@@ -61,10 +61,6 @@ type ICipReadResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CipReadResponse) Service() uint8 {
-	return 0xCC
-}
-
 func (m *CipReadResponse) GetService() uint8 {
 	return 0xCC
 }
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipUnconnectedRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/CipUnconnectedRequest.go
index ac4b46e..cfc56e6 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipUnconnectedRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipUnconnectedRequest.go
@@ -62,10 +62,6 @@ type ICipUnconnectedRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CipUnconnectedRequest) Service() uint8 {
-	return 0x52
-}
-
 func (m *CipUnconnectedRequest) GetService() uint8 {
 	return 0x52
 }
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go
index 3bee4f6..bbc4693 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteRequest.go
@@ -63,10 +63,6 @@ type ICipWriteRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CipWriteRequest) Service() uint8 {
-	return 0x4D
-}
-
 func (m *CipWriteRequest) GetService() uint8 {
 	return 0x4D
 }
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteResponse.go
index 51b989d..fd3d48f 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipWriteResponse.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipWriteResponse.go
@@ -55,10 +55,6 @@ type ICipWriteResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CipWriteResponse) Service() uint8 {
-	return 0xCD
-}
-
 func (m *CipWriteResponse) GetService() uint8 {
 	return 0xCD
 }
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/EipConnectionRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/EipConnectionRequest.go
index 171a799..6a3a3fa 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/EipConnectionRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/EipConnectionRequest.go
@@ -50,10 +50,6 @@ type IEipConnectionRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *EipConnectionRequest) Command() uint16 {
-	return 0x0065
-}
-
 func (m *EipConnectionRequest) GetCommand() uint16 {
 	return 0x0065
 }
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/EipDisconnectRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/EipDisconnectRequest.go
index b818246..eda9e1a 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/EipDisconnectRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/EipDisconnectRequest.go
@@ -44,10 +44,6 @@ type IEipDisconnectRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *EipDisconnectRequest) Command() uint16 {
-	return 0x0066
-}
-
 func (m *EipDisconnectRequest) GetCommand() uint16 {
 	return 0x0066
 }
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go
index fb94db4..b5c5b7f 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go
@@ -56,10 +56,6 @@ type IMultipleServiceRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *MultipleServiceRequest) Service() uint8 {
-	return 0x0A
-}
-
 func (m *MultipleServiceRequest) GetService() uint8 {
 	return 0x0A
 }
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go
index f1d1f7e..9cc8987 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go
@@ -64,10 +64,6 @@ type IMultipleServiceResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *MultipleServiceResponse) Service() uint8 {
-	return 0x8A
-}
-
 func (m *MultipleServiceResponse) GetService() uint8 {
 	return 0x8A
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandProtocolVersion.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandProtocolVersion.go
index e331f1d..8d29161 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandProtocolVersion.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandProtocolVersion.go
@@ -54,10 +54,6 @@ type IFirmataCommandProtocolVersion interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *FirmataCommandProtocolVersion) CommandCode() uint8 {
-	return 0x9
-}
-
 func (m *FirmataCommandProtocolVersion) GetCommandCode() uint8 {
 	return 0x9
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
index 09121b5..65db0f0 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetDigitalPinValue.go
@@ -55,10 +55,6 @@ type IFirmataCommandSetDigitalPinValue interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *FirmataCommandSetDigitalPinValue) CommandCode() uint8 {
-	return 0x5
-}
-
 func (m *FirmataCommandSetDigitalPinValue) GetCommandCode() uint8 {
 	return 0x5
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go
index faab572..41c2499 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSetPinMode.go
@@ -54,10 +54,6 @@ type IFirmataCommandSetPinMode interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *FirmataCommandSetPinMode) CommandCode() uint8 {
-	return 0x4
-}
-
 func (m *FirmataCommandSetPinMode) GetCommandCode() uint8 {
 	return 0x4
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go
index fa203b7..4c8f4c8 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go
@@ -52,10 +52,6 @@ type IFirmataCommandSysex interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *FirmataCommandSysex) CommandCode() uint8 {
-	return 0x0
-}
-
 func (m *FirmataCommandSysex) GetCommandCode() uint8 {
 	return 0x0
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSystemReset.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSystemReset.go
index adb94d8..4e6574d 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSystemReset.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSystemReset.go
@@ -47,10 +47,6 @@ type IFirmataCommandSystemReset interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *FirmataCommandSystemReset) CommandCode() uint8 {
-	return 0xF
-}
-
 func (m *FirmataCommandSystemReset) GetCommandCode() uint8 {
 	return 0xF
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageAnalogIO.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageAnalogIO.go
index 69c1ee6..471ab53 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageAnalogIO.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageAnalogIO.go
@@ -54,10 +54,6 @@ type IFirmataMessageAnalogIO interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *FirmataMessageAnalogIO) MessageType() uint8 {
-	return 0xE
-}
-
 func (m *FirmataMessageAnalogIO) GetMessageType() uint8 {
 	return 0xE
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go
index 227e1d0..4a42c0d 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go
@@ -51,10 +51,6 @@ type IFirmataMessageCommand interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *FirmataMessageCommand) MessageType() uint8 {
-	return 0xF
-}
-
 func (m *FirmataMessageCommand) GetMessageType() uint8 {
 	return 0xF
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageDigitalIO.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageDigitalIO.go
index 990046c..f4efb08 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageDigitalIO.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageDigitalIO.go
@@ -54,10 +54,6 @@ type IFirmataMessageDigitalIO interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *FirmataMessageDigitalIO) MessageType() uint8 {
-	return 0x9
-}
-
 func (m *FirmataMessageDigitalIO) GetMessageType() uint8 {
 	return 0x9
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
index b0aa8af..9b20f00 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeAnalogPinValue.go
@@ -55,10 +55,6 @@ type IFirmataMessageSubscribeAnalogPinValue interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *FirmataMessageSubscribeAnalogPinValue) MessageType() uint8 {
-	return 0xC
-}
-
 func (m *FirmataMessageSubscribeAnalogPinValue) GetMessageType() uint8 {
 	return 0xC
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
index b7db383..c94f3e5 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageSubscribeDigitalPinValue.go
@@ -55,10 +55,6 @@ type IFirmataMessageSubscribeDigitalPinValue interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *FirmataMessageSubscribeDigitalPinValue) MessageType() uint8 {
-	return 0xD
-}
-
 func (m *FirmataMessageSubscribeDigitalPinValue) GetMessageType() uint8 {
 	return 0xD
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryRequest.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryRequest.go
index bf00238..b767b83 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryRequest.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryRequest.go
@@ -44,18 +44,10 @@ type ISysexCommandAnalogMappingQueryRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandAnalogMappingQueryRequest) CommandType() uint8 {
-	return 0x69
-}
-
 func (m *SysexCommandAnalogMappingQueryRequest) GetCommandType() uint8 {
 	return 0x69
 }
 
-func (m *SysexCommandAnalogMappingQueryRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *SysexCommandAnalogMappingQueryRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go
index d854684..1013351 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingQueryResponse.go
@@ -48,18 +48,10 @@ type ISysexCommandAnalogMappingQueryResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandAnalogMappingQueryResponse) CommandType() uint8 {
-	return 0x69
-}
-
 func (m *SysexCommandAnalogMappingQueryResponse) GetCommandType() uint8 {
 	return 0x69
 }
 
-func (m *SysexCommandAnalogMappingQueryResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *SysexCommandAnalogMappingQueryResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingResponse.go
index 8dc175e..c76a7ed 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingResponse.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandAnalogMappingResponse.go
@@ -44,18 +44,10 @@ type ISysexCommandAnalogMappingResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandAnalogMappingResponse) CommandType() uint8 {
-	return 0x6A
-}
-
 func (m *SysexCommandAnalogMappingResponse) GetCommandType() uint8 {
 	return 0x6A
 }
 
-func (m *SysexCommandAnalogMappingResponse) Response() bool {
-	return false
-}
-
 func (m *SysexCommandAnalogMappingResponse) GetResponse() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityQuery.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityQuery.go
index 156aa93..c9029e1 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityQuery.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityQuery.go
@@ -44,18 +44,10 @@ type ISysexCommandCapabilityQuery interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandCapabilityQuery) CommandType() uint8 {
-	return 0x6B
-}
-
 func (m *SysexCommandCapabilityQuery) GetCommandType() uint8 {
 	return 0x6B
 }
 
-func (m *SysexCommandCapabilityQuery) Response() bool {
-	return false
-}
-
 func (m *SysexCommandCapabilityQuery) GetResponse() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityResponse.go
index 604d15d..dbfb714 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityResponse.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandCapabilityResponse.go
@@ -44,18 +44,10 @@ type ISysexCommandCapabilityResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandCapabilityResponse) CommandType() uint8 {
-	return 0x6C
-}
-
 func (m *SysexCommandCapabilityResponse) GetCommandType() uint8 {
 	return 0x6C
 }
 
-func (m *SysexCommandCapabilityResponse) Response() bool {
-	return false
-}
-
 func (m *SysexCommandCapabilityResponse) GetResponse() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedAnalog.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedAnalog.go
index d8c2c3d..1e47d8c 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedAnalog.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedAnalog.go
@@ -44,18 +44,10 @@ type ISysexCommandExtendedAnalog interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandExtendedAnalog) CommandType() uint8 {
-	return 0x6F
-}
-
 func (m *SysexCommandExtendedAnalog) GetCommandType() uint8 {
 	return 0x6F
 }
 
-func (m *SysexCommandExtendedAnalog) Response() bool {
-	return false
-}
-
 func (m *SysexCommandExtendedAnalog) GetResponse() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedId.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedId.go
index 004c745..586f913 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedId.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandExtendedId.go
@@ -48,18 +48,10 @@ type ISysexCommandExtendedId interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandExtendedId) CommandType() uint8 {
-	return 0x00
-}
-
 func (m *SysexCommandExtendedId) GetCommandType() uint8 {
 	return 0x00
 }
 
-func (m *SysexCommandExtendedId) Response() bool {
-	return false
-}
-
 func (m *SysexCommandExtendedId) GetResponse() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateQuery.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateQuery.go
index 71d444e..1dfce4e 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateQuery.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateQuery.go
@@ -48,18 +48,10 @@ type ISysexCommandPinStateQuery interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandPinStateQuery) CommandType() uint8 {
-	return 0x6D
-}
-
 func (m *SysexCommandPinStateQuery) GetCommandType() uint8 {
 	return 0x6D
 }
 
-func (m *SysexCommandPinStateQuery) Response() bool {
-	return false
-}
-
 func (m *SysexCommandPinStateQuery) GetResponse() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateResponse.go
index 3e86c87..05df61e 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateResponse.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandPinStateResponse.go
@@ -54,18 +54,10 @@ type ISysexCommandPinStateResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandPinStateResponse) CommandType() uint8 {
-	return 0x6E
-}
-
 func (m *SysexCommandPinStateResponse) GetCommandType() uint8 {
 	return 0x6E
 }
 
-func (m *SysexCommandPinStateResponse) Response() bool {
-	return false
-}
-
 func (m *SysexCommandPinStateResponse) GetResponse() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareRequest.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareRequest.go
index 3ab998b..a142107 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareRequest.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareRequest.go
@@ -44,18 +44,10 @@ type ISysexCommandReportFirmwareRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandReportFirmwareRequest) CommandType() uint8 {
-	return 0x79
-}
-
 func (m *SysexCommandReportFirmwareRequest) GetCommandType() uint8 {
 	return 0x79
 }
 
-func (m *SysexCommandReportFirmwareRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *SysexCommandReportFirmwareRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
index ba52641..5d6d99e 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandReportFirmwareResponse.go
@@ -54,18 +54,10 @@ type ISysexCommandReportFirmwareResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandReportFirmwareResponse) CommandType() uint8 {
-	return 0x79
-}
-
 func (m *SysexCommandReportFirmwareResponse) GetCommandType() uint8 {
 	return 0x79
 }
 
-func (m *SysexCommandReportFirmwareResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *SysexCommandReportFirmwareResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSamplingInterval.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSamplingInterval.go
index 3fe6b80..31bf4c0 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSamplingInterval.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSamplingInterval.go
@@ -44,18 +44,10 @@ type ISysexCommandSamplingInterval interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandSamplingInterval) CommandType() uint8 {
-	return 0x7A
-}
-
 func (m *SysexCommandSamplingInterval) GetCommandType() uint8 {
 	return 0x7A
 }
 
-func (m *SysexCommandSamplingInterval) Response() bool {
-	return false
-}
-
 func (m *SysexCommandSamplingInterval) GetResponse() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandStringData.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandStringData.go
index 22a0f84..46d42da 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandStringData.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandStringData.go
@@ -44,18 +44,10 @@ type ISysexCommandStringData interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandStringData) CommandType() uint8 {
-	return 0x71
-}
-
 func (m *SysexCommandStringData) GetCommandType() uint8 {
 	return 0x71
 }
 
-func (m *SysexCommandStringData) Response() bool {
-	return false
-}
-
 func (m *SysexCommandStringData) GetResponse() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexNonRealtime.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexNonRealtime.go
index bcbd239..6d7eea2 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexNonRealtime.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexNonRealtime.go
@@ -44,18 +44,10 @@ type ISysexCommandSysexNonRealtime interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandSysexNonRealtime) CommandType() uint8 {
-	return 0x7E
-}
-
 func (m *SysexCommandSysexNonRealtime) GetCommandType() uint8 {
 	return 0x7E
 }
 
-func (m *SysexCommandSysexNonRealtime) Response() bool {
-	return false
-}
-
 func (m *SysexCommandSysexNonRealtime) GetResponse() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexRealtime.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexRealtime.go
index 8906d54..a595bd6 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexRealtime.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommandSysexRealtime.go
@@ -44,18 +44,10 @@ type ISysexCommandSysexRealtime interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SysexCommandSysexRealtime) CommandType() uint8 {
-	return 0x7F
-}
-
 func (m *SysexCommandSysexRealtime) GetCommandType() uint8 {
 	return 0x7F
 }
 
-func (m *SysexCommandSysexRealtime) Response() bool {
-	return false
-}
-
 func (m *SysexCommandSysexRealtime) GetResponse() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlAck.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlAck.go
index 558cbef..acbc3a6 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlAck.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlAck.go
@@ -44,10 +44,6 @@ type IApduControlAck interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduControlAck) ControlType() uint8 {
-	return 0x2
-}
-
 func (m *ApduControlAck) GetControlType() uint8 {
 	return 0x2
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlConnect.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlConnect.go
index c7591b0..97c8c92 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlConnect.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlConnect.go
@@ -44,10 +44,6 @@ type IApduControlConnect interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduControlConnect) ControlType() uint8 {
-	return 0x0
-}
-
 func (m *ApduControlConnect) GetControlType() uint8 {
 	return 0x0
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go
index 371136e..27fabf4 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go
@@ -51,10 +51,6 @@ type IApduControlContainer interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduControlContainer) Control() uint8 {
-	return uint8(1)
-}
-
 func (m *ApduControlContainer) GetControl() uint8 {
 	return uint8(1)
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlDisconnect.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlDisconnect.go
index 8474ebe..f88a233 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlDisconnect.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlDisconnect.go
@@ -44,10 +44,6 @@ type IApduControlDisconnect interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduControlDisconnect) ControlType() uint8 {
-	return 0x1
-}
-
 func (m *ApduControlDisconnect) GetControlType() uint8 {
 	return 0x1
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlNack.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlNack.go
index cac619b..7d5b315 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlNack.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlNack.go
@@ -44,10 +44,6 @@ type IApduControlNack interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduControlNack) ControlType() uint8 {
-	return 0x3
-}
-
 func (m *ApduControlNack) GetControlType() uint8 {
 	return 0x3
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcRead.go
index c9eafae..bcb6eef 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcRead.go
@@ -47,10 +47,6 @@ type IApduDataAdcRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataAdcRead) ApciType() uint8 {
-	return 0x6
-}
-
 func (m *ApduDataAdcRead) GetApciType() uint8 {
 	return 0x6
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcResponse.go
index 14d2fcf..1d86bc1 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataAdcResponse.go
@@ -47,10 +47,6 @@ type IApduDataAdcResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataAdcResponse) ApciType() uint8 {
-	return 0x7
-}
-
 func (m *ApduDataAdcResponse) GetApciType() uint8 {
 	return 0x7
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go
index 9b25356..97d281a 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go
@@ -51,10 +51,6 @@ type IApduDataContainer interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataContainer) Control() uint8 {
-	return uint8(0)
-}
-
 func (m *ApduDataContainer) GetControl() uint8 {
 	return uint8(0)
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
index 8a59102..c536f05 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
@@ -51,10 +51,6 @@ type IApduDataDeviceDescriptorRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataDeviceDescriptorRead) ApciType() uint8 {
-	return 0xC
-}
-
 func (m *ApduDataDeviceDescriptorRead) GetApciType() uint8 {
 	return 0xC
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
index 4b830cb..9066cb6 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
@@ -54,10 +54,6 @@ type IApduDataDeviceDescriptorResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataDeviceDescriptorResponse) ApciType() uint8 {
-	return 0xD
-}
-
 func (m *ApduDataDeviceDescriptorResponse) GetApciType() uint8 {
 	return 0xD
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
index d59b969..eba2759 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeRequest.go
@@ -54,10 +54,6 @@ type IApduDataExtAuthorizeRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtAuthorizeRequest) ExtApciType() uint8 {
-	return 0x11
-}
-
 func (m *ApduDataExtAuthorizeRequest) GetExtApciType() uint8 {
 	return 0x11
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go
index f3de791..8549ad2 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtAuthorizeResponse.go
@@ -51,10 +51,6 @@ type IApduDataExtAuthorizeResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtAuthorizeResponse) ExtApciType() uint8 {
-	return 0x12
-}
-
 func (m *ApduDataExtAuthorizeResponse) GetExtApciType() uint8 {
 	return 0x12
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go
index 16721f8..9519027 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressRead.go
@@ -47,10 +47,6 @@ type IApduDataExtDomainAddressRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtDomainAddressRead) ExtApciType() uint8 {
-	return 0x21
-}
-
 func (m *ApduDataExtDomainAddressRead) GetExtApciType() uint8 {
 	return 0x21
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go
index 0d96c8a..e6ce152 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressResponse.go
@@ -47,10 +47,6 @@ type IApduDataExtDomainAddressResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtDomainAddressResponse) ExtApciType() uint8 {
-	return 0x22
-}
-
 func (m *ApduDataExtDomainAddressResponse) GetExtApciType() uint8 {
 	return 0x22
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go
index 5226a5d..5261832 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSelectiveRead.go
@@ -47,10 +47,6 @@ type IApduDataExtDomainAddressSelectiveRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtDomainAddressSelectiveRead) ExtApciType() uint8 {
-	return 0x23
-}
-
 func (m *ApduDataExtDomainAddressSelectiveRead) GetExtApciType() uint8 {
 	return 0x23
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go
index 9b216d8..927ffc6 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberRead.go
@@ -47,10 +47,6 @@ type IApduDataExtDomainAddressSerialNumberRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtDomainAddressSerialNumberRead) ExtApciType() uint8 {
-	return 0x2C
-}
-
 func (m *ApduDataExtDomainAddressSerialNumberRead) GetExtApciType() uint8 {
 	return 0x2C
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go
index 7a66fa2..4ee21b4 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberResponse.go
@@ -47,10 +47,6 @@ type IApduDataExtDomainAddressSerialNumberResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtDomainAddressSerialNumberResponse) ExtApciType() uint8 {
-	return 0x2D
-}
-
 func (m *ApduDataExtDomainAddressSerialNumberResponse) GetExtApciType() uint8 {
 	return 0x2D
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go
index 093b514..2372f67 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressSerialNumberWrite.go
@@ -47,10 +47,6 @@ type IApduDataExtDomainAddressSerialNumberWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtDomainAddressSerialNumberWrite) ExtApciType() uint8 {
-	return 0x2E
-}
-
 func (m *ApduDataExtDomainAddressSerialNumberWrite) GetExtApciType() uint8 {
 	return 0x2E
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go
index a20fd49..c1b4bbc 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtDomainAddressWrite.go
@@ -47,10 +47,6 @@ type IApduDataExtDomainAddressWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtDomainAddressWrite) ExtApciType() uint8 {
-	return 0x20
-}
-
 func (m *ApduDataExtDomainAddressWrite) GetExtApciType() uint8 {
 	return 0x20
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go
index 1b19a70..591ecfe 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtFileStreamInfoReport.go
@@ -47,10 +47,6 @@ type IApduDataExtFileStreamInfoReport interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtFileStreamInfoReport) ExtApciType() uint8 {
-	return 0x30
-}
-
 func (m *ApduDataExtFileStreamInfoReport) GetExtApciType() uint8 {
 	return 0x30
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go
index 8f0ead1..5dc9b18 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueInfoReport.go
@@ -47,10 +47,6 @@ type IApduDataExtGroupPropertyValueInfoReport interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtGroupPropertyValueInfoReport) ExtApciType() uint8 {
-	return 0x2B
-}
-
 func (m *ApduDataExtGroupPropertyValueInfoReport) GetExtApciType() uint8 {
 	return 0x2B
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go
index 37c8958..4befa49 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueRead.go
@@ -47,10 +47,6 @@ type IApduDataExtGroupPropertyValueRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtGroupPropertyValueRead) ExtApciType() uint8 {
-	return 0x28
-}
-
 func (m *ApduDataExtGroupPropertyValueRead) GetExtApciType() uint8 {
 	return 0x28
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go
index 46a880a..9cc5a99 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueResponse.go
@@ -47,10 +47,6 @@ type IApduDataExtGroupPropertyValueResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtGroupPropertyValueResponse) ExtApciType() uint8 {
-	return 0x29
-}
-
 func (m *ApduDataExtGroupPropertyValueResponse) GetExtApciType() uint8 {
 	return 0x29
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go
index 2781cfe..f0fcb5e 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtGroupPropertyValueWrite.go
@@ -47,10 +47,6 @@ type IApduDataExtGroupPropertyValueWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtGroupPropertyValueWrite) ExtApciType() uint8 {
-	return 0x2A
-}
-
 func (m *ApduDataExtGroupPropertyValueWrite) GetExtApciType() uint8 {
 	return 0x2A
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go
index 27aaec7..78cdd8f 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberRead.go
@@ -47,10 +47,6 @@ type IApduDataExtIndividualAddressSerialNumberRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtIndividualAddressSerialNumberRead) ExtApciType() uint8 {
-	return 0x1C
-}
-
 func (m *ApduDataExtIndividualAddressSerialNumberRead) GetExtApciType() uint8 {
 	return 0x1C
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go
index 1b0783b..86de051 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberResponse.go
@@ -47,10 +47,6 @@ type IApduDataExtIndividualAddressSerialNumberResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtIndividualAddressSerialNumberResponse) ExtApciType() uint8 {
-	return 0x1D
-}
-
 func (m *ApduDataExtIndividualAddressSerialNumberResponse) GetExtApciType() uint8 {
 	return 0x1D
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go
index a6cae86..a1dd796 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtIndividualAddressSerialNumberWrite.go
@@ -47,10 +47,6 @@ type IApduDataExtIndividualAddressSerialNumberWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtIndividualAddressSerialNumberWrite) ExtApciType() uint8 {
-	return 0x1E
-}
-
 func (m *ApduDataExtIndividualAddressSerialNumberWrite) GetExtApciType() uint8 {
 	return 0x1E
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyResponse.go
index 1eb70d5..0a29274 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyResponse.go
@@ -47,10 +47,6 @@ type IApduDataExtKeyResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtKeyResponse) ExtApciType() uint8 {
-	return 0x14
-}
-
 func (m *ApduDataExtKeyResponse) GetExtApciType() uint8 {
 	return 0x14
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyWrite.go
index da8d378..aa23c08 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtKeyWrite.go
@@ -47,10 +47,6 @@ type IApduDataExtKeyWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtKeyWrite) ExtApciType() uint8 {
-	return 0x13
-}
-
 func (m *ApduDataExtKeyWrite) GetExtApciType() uint8 {
 	return 0x13
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkRead.go
index b4e7652..7a4c245 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkRead.go
@@ -47,10 +47,6 @@ type IApduDataExtLinkRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtLinkRead) ExtApciType() uint8 {
-	return 0x25
-}
-
 func (m *ApduDataExtLinkRead) GetExtApciType() uint8 {
 	return 0x25
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkResponse.go
index adb6671..8e5f5a4 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkResponse.go
@@ -47,10 +47,6 @@ type IApduDataExtLinkResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtLinkResponse) ExtApciType() uint8 {
-	return 0x26
-}
-
 func (m *ApduDataExtLinkResponse) GetExtApciType() uint8 {
 	return 0x26
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkWrite.go
index de4e4ab..54e2586 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtLinkWrite.go
@@ -47,10 +47,6 @@ type IApduDataExtLinkWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtLinkWrite) ExtApciType() uint8 {
-	return 0x27
-}
-
 func (m *ApduDataExtLinkWrite) GetExtApciType() uint8 {
 	return 0x27
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go
index 9845d88..9549e00 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtMemoryBitWrite.go
@@ -47,10 +47,6 @@ type IApduDataExtMemoryBitWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtMemoryBitWrite) ExtApciType() uint8 {
-	return 0x10
-}
-
 func (m *ApduDataExtMemoryBitWrite) GetExtApciType() uint8 {
 	return 0x10
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go
index 08247df..15878a4 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterRead.go
@@ -47,10 +47,6 @@ type IApduDataExtNetworkParameterRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtNetworkParameterRead) ExtApciType() uint8 {
-	return 0x1A
-}
-
 func (m *ApduDataExtNetworkParameterRead) GetExtApciType() uint8 {
 	return 0x1A
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go
index eb454f5..a183656 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterResponse.go
@@ -47,10 +47,6 @@ type IApduDataExtNetworkParameterResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtNetworkParameterResponse) ExtApciType() uint8 {
-	return 0x1B
-}
-
 func (m *ApduDataExtNetworkParameterResponse) GetExtApciType() uint8 {
 	return 0x1B
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go
index b7667d2..4980bea 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtNetworkParameterWrite.go
@@ -47,10 +47,6 @@ type IApduDataExtNetworkParameterWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtNetworkParameterWrite) ExtApciType() uint8 {
-	return 0x24
-}
-
 func (m *ApduDataExtNetworkParameterWrite) GetExtApciType() uint8 {
 	return 0x24
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go
index 041e730..54be21e 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtOpenRoutingTableRequest.go
@@ -47,10 +47,6 @@ type IApduDataExtOpenRoutingTableRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtOpenRoutingTableRequest) ExtApciType() uint8 {
-	return 0x00
-}
-
 func (m *ApduDataExtOpenRoutingTableRequest) GetExtApciType() uint8 {
 	return 0x00
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go
index 67f67c6..b747279 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionRead.go
@@ -57,10 +57,6 @@ type IApduDataExtPropertyDescriptionRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtPropertyDescriptionRead) ExtApciType() uint8 {
-	return 0x18
-}
-
 func (m *ApduDataExtPropertyDescriptionRead) GetExtApciType() uint8 {
 	return 0x18
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
index 380df63..a840400 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyDescriptionResponse.go
@@ -73,10 +73,6 @@ type IApduDataExtPropertyDescriptionResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtPropertyDescriptionResponse) ExtApciType() uint8 {
-	return 0x19
-}
-
 func (m *ApduDataExtPropertyDescriptionResponse) GetExtApciType() uint8 {
 	return 0x19
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
index bc43518..d47f010 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
@@ -60,10 +60,6 @@ type IApduDataExtPropertyValueRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtPropertyValueRead) ExtApciType() uint8 {
-	return 0x15
-}
-
 func (m *ApduDataExtPropertyValueRead) GetExtApciType() uint8 {
 	return 0x15
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
index 8775120..171b1de 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
@@ -63,10 +63,6 @@ type IApduDataExtPropertyValueResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtPropertyValueResponse) ExtApciType() uint8 {
-	return 0x16
-}
-
 func (m *ApduDataExtPropertyValueResponse) GetExtApciType() uint8 {
 	return 0x16
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
index 610108b..e1c7d61 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
@@ -63,10 +63,6 @@ type IApduDataExtPropertyValueWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtPropertyValueWrite) ExtApciType() uint8 {
-	return 0x17
-}
-
 func (m *ApduDataExtPropertyValueWrite) GetExtApciType() uint8 {
 	return 0x17
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go
index ec63991..007c6cc 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryRequest.go
@@ -47,10 +47,6 @@ type IApduDataExtReadRouterMemoryRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtReadRouterMemoryRequest) ExtApciType() uint8 {
-	return 0x08
-}
-
 func (m *ApduDataExtReadRouterMemoryRequest) GetExtApciType() uint8 {
 	return 0x08
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go
index 95826c3..072a385 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterMemoryResponse.go
@@ -47,10 +47,6 @@ type IApduDataExtReadRouterMemoryResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtReadRouterMemoryResponse) ExtApciType() uint8 {
-	return 0x09
-}
-
 func (m *ApduDataExtReadRouterMemoryResponse) GetExtApciType() uint8 {
 	return 0x09
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go
index c30602b..4aa0d17 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusRequest.go
@@ -47,10 +47,6 @@ type IApduDataExtReadRouterStatusRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtReadRouterStatusRequest) ExtApciType() uint8 {
-	return 0x0D
-}
-
 func (m *ApduDataExtReadRouterStatusRequest) GetExtApciType() uint8 {
 	return 0x0D
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go
index a542b47..93cc0da 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRouterStatusResponse.go
@@ -47,10 +47,6 @@ type IApduDataExtReadRouterStatusResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtReadRouterStatusResponse) ExtApciType() uint8 {
-	return 0x0E
-}
-
 func (m *ApduDataExtReadRouterStatusResponse) GetExtApciType() uint8 {
 	return 0x0E
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go
index abec599..1f128b2 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableRequest.go
@@ -47,10 +47,6 @@ type IApduDataExtReadRoutingTableRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtReadRoutingTableRequest) ExtApciType() uint8 {
-	return 0x01
-}
-
 func (m *ApduDataExtReadRoutingTableRequest) GetExtApciType() uint8 {
 	return 0x01
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go
index cb665c9..f29e0d9 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtReadRoutingTableResponse.go
@@ -47,10 +47,6 @@ type IApduDataExtReadRoutingTableResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtReadRoutingTableResponse) ExtApciType() uint8 {
-	return 0x02
-}
-
 func (m *ApduDataExtReadRoutingTableResponse) GetExtApciType() uint8 {
 	return 0x02
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go
index 4c4a08e..37d39f2 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterMemoryRequest.go
@@ -47,10 +47,6 @@ type IApduDataExtWriteRouterMemoryRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtWriteRouterMemoryRequest) ExtApciType() uint8 {
-	return 0x0A
-}
-
 func (m *ApduDataExtWriteRouterMemoryRequest) GetExtApciType() uint8 {
 	return 0x0A
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go
index bae154d..c6e76bb 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRouterStatusRequest.go
@@ -47,10 +47,6 @@ type IApduDataExtWriteRouterStatusRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtWriteRouterStatusRequest) ExtApciType() uint8 {
-	return 0x0F
-}
-
 func (m *ApduDataExtWriteRouterStatusRequest) GetExtApciType() uint8 {
 	return 0x0F
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go
index 6d9f125..b36ec59 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtWriteRoutingTableRequest.go
@@ -47,10 +47,6 @@ type IApduDataExtWriteRoutingTableRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataExtWriteRoutingTableRequest) ExtApciType() uint8 {
-	return 0x03
-}
-
 func (m *ApduDataExtWriteRoutingTableRequest) GetExtApciType() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueRead.go
index 650aa6b..7bdedf5 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueRead.go
@@ -49,10 +49,6 @@ type IApduDataGroupValueRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataGroupValueRead) ApciType() uint8 {
-	return 0x0
-}
-
 func (m *ApduDataGroupValueRead) GetApciType() uint8 {
 	return 0x0
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
index de3aac8..082d5f1 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
@@ -54,10 +54,6 @@ type IApduDataGroupValueResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataGroupValueResponse) ApciType() uint8 {
-	return 0x1
-}
-
 func (m *ApduDataGroupValueResponse) GetApciType() uint8 {
 	return 0x1
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
index 1c3546f..a3bf100 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
@@ -54,10 +54,6 @@ type IApduDataGroupValueWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataGroupValueWrite) ApciType() uint8 {
-	return 0x2
-}
-
 func (m *ApduDataGroupValueWrite) GetApciType() uint8 {
 	return 0x2
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go
index 6d4a5b5..aa02e09 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressRead.go
@@ -47,10 +47,6 @@ type IApduDataIndividualAddressRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataIndividualAddressRead) ApciType() uint8 {
-	return 0x4
-}
-
 func (m *ApduDataIndividualAddressRead) GetApciType() uint8 {
 	return 0x4
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go
index 5409425..50c335c 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressResponse.go
@@ -47,10 +47,6 @@ type IApduDataIndividualAddressResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataIndividualAddressResponse) ApciType() uint8 {
-	return 0x5
-}
-
 func (m *ApduDataIndividualAddressResponse) GetApciType() uint8 {
 	return 0x5
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go
index e6b4bc7..9790435 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataIndividualAddressWrite.go
@@ -47,10 +47,6 @@ type IApduDataIndividualAddressWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataIndividualAddressWrite) ApciType() uint8 {
-	return 0x3
-}
-
 func (m *ApduDataIndividualAddressWrite) GetApciType() uint8 {
 	return 0x3
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryRead.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryRead.go
index 0be392c..c96e919 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryRead.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryRead.go
@@ -54,10 +54,6 @@ type IApduDataMemoryRead interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataMemoryRead) ApciType() uint8 {
-	return 0x8
-}
-
 func (m *ApduDataMemoryRead) GetApciType() uint8 {
 	return 0x8
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go
index 15edf1e..a4da816 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryResponse.go
@@ -54,10 +54,6 @@ type IApduDataMemoryResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataMemoryResponse) ApciType() uint8 {
-	return 0x9
-}
-
 func (m *ApduDataMemoryResponse) GetApciType() uint8 {
 	return 0x9
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryWrite.go
index c912a5e..5f59b5d 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataMemoryWrite.go
@@ -47,10 +47,6 @@ type IApduDataMemoryWrite interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataMemoryWrite) ApciType() uint8 {
-	return 0xA
-}
-
 func (m *ApduDataMemoryWrite) GetApciType() uint8 {
 	return 0xA
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go
index fd44309..2cc468d 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go
@@ -51,10 +51,6 @@ type IApduDataOther interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataOther) ApciType() uint8 {
-	return 0xF
-}
-
 func (m *ApduDataOther) GetApciType() uint8 {
 	return 0xF
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataRestart.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataRestart.go
index d543596..58d4564 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataRestart.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataRestart.go
@@ -47,10 +47,6 @@ type IApduDataRestart interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataRestart) ApciType() uint8 {
-	return 0xE
-}
-
 func (m *ApduDataRestart) GetApciType() uint8 {
 	return 0xE
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataUserMessage.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataUserMessage.go
index 9fff9d0..9f44568 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataUserMessage.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataUserMessage.go
@@ -47,10 +47,6 @@ type IApduDataUserMessage interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ApduDataUserMessage) ApciType() uint8 {
-	return 0xB
-}
-
 func (m *ApduDataUserMessage) GetApciType() uint8 {
 	return 0xB
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go
index c014612..0230c6a 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationBusmonitorInfo.go
@@ -67,10 +67,6 @@ type ICEMIAdditionalInformationBusmonitorInfo interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CEMIAdditionalInformationBusmonitorInfo) AdditionalInformationType() uint8 {
-	return 0x03
-}
-
 func (m *CEMIAdditionalInformationBusmonitorInfo) GetAdditionalInformationType() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go
index b288d75..6d9802f 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMIAdditionalInformationRelativeTimestamp.go
@@ -52,10 +52,6 @@ type ICEMIAdditionalInformationRelativeTimestamp interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *CEMIAdditionalInformationRelativeTimestamp) AdditionalInformationType() uint8 {
-	return 0x04
-}
-
 func (m *CEMIAdditionalInformationRelativeTimestamp) GetAdditionalInformationType() uint8 {
 	return 0x04
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType1.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType1.go
index cabf54c..29a2a09 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType1.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType1.go
@@ -54,10 +54,6 @@ type IComObjectTableRealisationType1 interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ComObjectTableRealisationType1) FirmwareType() FirmwareType {
-	return FirmwareType_SYSTEM_1
-}
-
 func (m *ComObjectTableRealisationType1) GetFirmwareType() FirmwareType {
 	return FirmwareType_SYSTEM_1
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType2.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType2.go
index 4dcbc8a..c3f8d24 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType2.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType2.go
@@ -54,10 +54,6 @@ type IComObjectTableRealisationType2 interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ComObjectTableRealisationType2) FirmwareType() FirmwareType {
-	return FirmwareType_SYSTEM_2
-}
-
 func (m *ComObjectTableRealisationType2) GetFirmwareType() FirmwareType {
 	return FirmwareType_SYSTEM_2
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType6.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType6.go
index 2bc3854..86a9b86 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType6.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTableRealisationType6.go
@@ -48,10 +48,6 @@ type IComObjectTableRealisationType6 interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ComObjectTableRealisationType6) FirmwareType() FirmwareType {
-	return FirmwareType_SYSTEM_300
-}
-
 func (m *ComObjectTableRealisationType6) GetFirmwareType() FirmwareType {
 	return FirmwareType_SYSTEM_300
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go
index 638796b..add08d1 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequest.go
@@ -54,10 +54,6 @@ type IConnectionRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ConnectionRequest) MsgType() uint16 {
-	return 0x0205
-}
-
 func (m *ConnectionRequest) GetMsgType() uint16 {
 	return 0x0205
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go
index 65345a3..67fc892 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationDeviceManagement.go
@@ -44,10 +44,6 @@ type IConnectionRequestInformationDeviceManagement interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ConnectionRequestInformationDeviceManagement) ConnectionType() uint8 {
-	return 0x03
-}
-
 func (m *ConnectionRequestInformationDeviceManagement) GetConnectionType() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
index 99f6c8a..660fd63 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionRequestInformationTunnelConnection.go
@@ -49,10 +49,6 @@ type IConnectionRequestInformationTunnelConnection interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ConnectionRequestInformationTunnelConnection) ConnectionType() uint8 {
-	return 0x04
-}
-
 func (m *ConnectionRequestInformationTunnelConnection) GetConnectionType() uint8 {
 	return 0x04
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go
index bad207e..345e3f1 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponse.go
@@ -58,10 +58,6 @@ type IConnectionResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ConnectionResponse) MsgType() uint16 {
-	return 0x0206
-}
-
 func (m *ConnectionResponse) GetMsgType() uint16 {
 	return 0x0206
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go
index b84071d..3c6c315 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockDeviceManagement.go
@@ -44,10 +44,6 @@ type IConnectionResponseDataBlockDeviceManagement interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ConnectionResponseDataBlockDeviceManagement) ConnectionType() uint8 {
-	return 0x03
-}
-
 func (m *ConnectionResponseDataBlockDeviceManagement) GetConnectionType() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go
index c41f848..fc37be1 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionResponseDataBlockTunnelConnection.go
@@ -48,10 +48,6 @@ type IConnectionResponseDataBlockTunnelConnection interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ConnectionResponseDataBlockTunnelConnection) ConnectionType() uint8 {
-	return 0x04
-}
-
 func (m *ConnectionResponseDataBlockTunnelConnection) GetConnectionType() uint8 {
 	return 0x04
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go
index 1b4399e..cc5afa4 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateRequest.go
@@ -52,10 +52,6 @@ type IConnectionStateRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ConnectionStateRequest) MsgType() uint16 {
-	return 0x0207
-}
-
 func (m *ConnectionStateRequest) GetMsgType() uint16 {
 	return 0x0207
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go
index 7bd63c9..be70769 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ConnectionStateResponse.go
@@ -51,10 +51,6 @@ type IConnectionStateResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ConnectionStateResponse) MsgType() uint16 {
-	return 0x0208
-}
-
 func (m *ConnectionStateResponse) GetMsgType() uint16 {
 	return 0x0208
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go
index 6a4b083..78368f5 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionRequest.go
@@ -48,10 +48,6 @@ type IDescriptionRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DescriptionRequest) MsgType() uint16 {
-	return 0x0203
-}
-
 func (m *DescriptionRequest) GetMsgType() uint16 {
 	return 0x0203
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go
index c299303..823cb89 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DescriptionResponse.go
@@ -51,10 +51,6 @@ type IDescriptionResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DescriptionResponse) MsgType() uint16 {
-	return 0x0204
-}
-
 func (m *DescriptionResponse) GetMsgType() uint16 {
 	return 0x0204
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go
index f2e8c12..716fe43 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationAck.go
@@ -48,10 +48,6 @@ type IDeviceConfigurationAck interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DeviceConfigurationAck) MsgType() uint16 {
-	return 0x0311
-}
-
 func (m *DeviceConfigurationAck) GetMsgType() uint16 {
 	return 0x0311
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
index 61e3245..02e5ca7 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
@@ -54,10 +54,6 @@ type IDeviceConfigurationRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DeviceConfigurationRequest) MsgType() uint16 {
-	return 0x0310
-}
-
 func (m *DeviceConfigurationRequest) GetMsgType() uint16 {
 	return 0x0310
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go
index 2d691c5..e69ebb0 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectRequest.go
@@ -52,10 +52,6 @@ type IDisconnectRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DisconnectRequest) MsgType() uint16 {
-	return 0x0209
-}
-
 func (m *DisconnectRequest) GetMsgType() uint16 {
 	return 0x0209
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go
index cb62641..35f8d75 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DisconnectResponse.go
@@ -51,10 +51,6 @@ type IDisconnectResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *DisconnectResponse) MsgType() uint16 {
-	return 0x020A
-}
-
 func (m *DisconnectResponse) GetMsgType() uint16 {
 	return 0x020A
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress2Level.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress2Level.go
index 1c2f8b4..104ecfb 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress2Level.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress2Level.go
@@ -51,10 +51,6 @@ type IKnxGroupAddress2Level interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *KnxGroupAddress2Level) NumLevels() uint8 {
-	return uint8(2)
-}
-
 func (m *KnxGroupAddress2Level) GetNumLevels() uint8 {
 	return uint8(2)
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress3Level.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress3Level.go
index fca0450..9cfafd6 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress3Level.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress3Level.go
@@ -54,10 +54,6 @@ type IKnxGroupAddress3Level interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *KnxGroupAddress3Level) NumLevels() uint8 {
-	return uint8(3)
-}
-
 func (m *KnxGroupAddress3Level) GetNumLevels() uint8 {
 	return uint8(3)
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go
index cd169b1..6630ee1 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddressFreeLevel.go
@@ -48,10 +48,6 @@ type IKnxGroupAddressFreeLevel interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *KnxGroupAddressFreeLevel) NumLevels() uint8 {
-	return uint8(1)
-}
-
 func (m *KnxGroupAddressFreeLevel) GetNumLevels() uint8 {
 	return uint8(1)
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go
index 7c6c57d..53a8fe0 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpCore.go
@@ -48,10 +48,6 @@ type IKnxNetIpCore interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *KnxNetIpCore) ServiceType() uint8 {
-	return 0x02
-}
-
 func (m *KnxNetIpCore) GetServiceType() uint8 {
 	return 0x02
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go
index 17df084..8888896 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpDeviceManagement.go
@@ -48,10 +48,6 @@ type IKnxNetIpDeviceManagement interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *KnxNetIpDeviceManagement) ServiceType() uint8 {
-	return 0x03
-}
-
 func (m *KnxNetIpDeviceManagement) GetServiceType() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpRouting.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpRouting.go
index cb8c052..f5c2a0e 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpRouting.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpRouting.go
@@ -48,10 +48,6 @@ type IKnxNetIpRouting interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *KnxNetIpRouting) ServiceType() uint8 {
-	return 0x05
-}
-
 func (m *KnxNetIpRouting) GetServiceType() uint8 {
 	return 0x05
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go
index 9b44555..2557a92 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetIpTunneling.go
@@ -48,10 +48,6 @@ type IKnxNetIpTunneling interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *KnxNetIpTunneling) ServiceType() uint8 {
-	return 0x04
-}
-
 func (m *KnxNetIpTunneling) GetServiceType() uint8 {
 	return 0x04
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go
index 2ed45ed..b6689c1 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetObjectServer.go
@@ -48,10 +48,6 @@ type IKnxNetObjectServer interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *KnxNetObjectServer) ServiceType() uint8 {
-	return 0x08
-}
-
 func (m *KnxNetObjectServer) GetServiceType() uint8 {
 	return 0x08
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go
index bc681c4..34e250d 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteConfigurationAndDiagnosis.go
@@ -48,10 +48,6 @@ type IKnxNetRemoteConfigurationAndDiagnosis interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *KnxNetRemoteConfigurationAndDiagnosis) ServiceType() uint8 {
-	return 0x07
-}
-
 func (m *KnxNetRemoteConfigurationAndDiagnosis) GetServiceType() uint8 {
 	return 0x07
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go
index 4ea3d4b..3c227d4 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxNetRemoteLogging.go
@@ -48,10 +48,6 @@ type IKnxNetRemoteLogging interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *KnxNetRemoteLogging) ServiceType() uint8 {
-	return 0x06
-}
-
 func (m *KnxNetRemoteLogging) GetServiceType() uint8 {
 	return 0x06
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LBusmonInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LBusmonInd.go
index 37ce737..90675bd 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LBusmonInd.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LBusmonInd.go
@@ -60,10 +60,6 @@ type ILBusmonInd interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *LBusmonInd) MessageCode() uint8 {
-	return 0x2B
-}
-
 func (m *LBusmonInd) GetMessageCode() uint8 {
 	return 0x2B
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataCon.go
index 1bce3c4..2ed8202 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataCon.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataCon.go
@@ -57,10 +57,6 @@ type ILDataCon interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *LDataCon) MessageCode() uint8 {
-	return 0x2E
-}
-
 func (m *LDataCon) GetMessageCode() uint8 {
 	return 0x2E
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go
index 05e8dc0..6dbee9b 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataExtended.go
@@ -63,18 +63,10 @@ type ILDataExtended interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *LDataExtended) NotAckFrame() bool {
-	return bool(true)
-}
-
 func (m *LDataExtended) GetNotAckFrame() bool {
 	return bool(true)
 }
 
-func (m *LDataExtended) Polling() bool {
-	return bool(false)
-}
-
 func (m *LDataExtended) GetPolling() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrameACK.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrameACK.go
index 3313e52..7bedd98 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrameACK.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataFrameACK.go
@@ -44,18 +44,10 @@ type ILDataFrameACK interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *LDataFrameACK) NotAckFrame() bool {
-	return bool(false)
-}
-
 func (m *LDataFrameACK) GetNotAckFrame() bool {
 	return bool(false)
 }
 
-func (m *LDataFrameACK) Polling() bool {
-	return false
-}
-
 func (m *LDataFrameACK) GetPolling() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataInd.go
index 0281aba..3295b7f 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataInd.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataInd.go
@@ -57,10 +57,6 @@ type ILDataInd interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *LDataInd) MessageCode() uint8 {
-	return 0x29
-}
-
 func (m *LDataInd) GetMessageCode() uint8 {
 	return 0x29
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataReq.go
index 4c367c4..ab57884 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataReq.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LDataReq.go
@@ -57,10 +57,6 @@ type ILDataReq interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *LDataReq) MessageCode() uint8 {
-	return 0x11
-}
-
 func (m *LDataReq) GetMessageCode() uint8 {
 	return 0x11
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go
index b12c568..1a9c801 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollData.go
@@ -55,18 +55,10 @@ type ILPollData interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *LPollData) NotAckFrame() bool {
-	return bool(true)
-}
-
 func (m *LPollData) GetNotAckFrame() bool {
 	return bool(true)
 }
 
-func (m *LPollData) Polling() bool {
-	return bool(true)
-}
-
 func (m *LPollData) GetPolling() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataCon.go
index 364971f..6a5e610 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataCon.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataCon.go
@@ -47,10 +47,6 @@ type ILPollDataCon interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *LPollDataCon) MessageCode() uint8 {
-	return 0x25
-}
-
 func (m *LPollDataCon) GetMessageCode() uint8 {
 	return 0x25
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataReq.go
index a5798d5..afa162d 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataReq.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LPollDataReq.go
@@ -47,10 +47,6 @@ type ILPollDataReq interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *LPollDataReq) MessageCode() uint8 {
-	return 0x13
-}
-
 func (m *LPollDataReq) GetMessageCode() uint8 {
 	return 0x13
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawCon.go
index b8cbbfd..a2767a9 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawCon.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawCon.go
@@ -47,10 +47,6 @@ type ILRawCon interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *LRawCon) MessageCode() uint8 {
-	return 0x2F
-}
-
 func (m *LRawCon) GetMessageCode() uint8 {
 	return 0x2F
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawInd.go
index 60bfb62..d6ef0e3 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawInd.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawInd.go
@@ -47,10 +47,6 @@ type ILRawInd interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *LRawInd) MessageCode() uint8 {
-	return 0x2D
-}
-
 func (m *LRawInd) GetMessageCode() uint8 {
 	return 0x2D
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawReq.go
index 5ddf078..19f2daf 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawReq.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/LRawReq.go
@@ -47,10 +47,6 @@ type ILRawReq interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *LRawReq) MessageCode() uint8 {
-	return 0x10
-}
-
 func (m *LRawReq) GetMessageCode() uint8 {
 	return 0x10
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCommandReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCommandReq.go
index 8108b7a..5ebb87c 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCommandReq.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCommandReq.go
@@ -47,10 +47,6 @@ type IMFuncPropCommandReq interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *MFuncPropCommandReq) MessageCode() uint8 {
-	return 0xF8
-}
-
 func (m *MFuncPropCommandReq) GetMessageCode() uint8 {
 	return 0xF8
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCon.go
index 3f83c4e..b720535 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCon.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropCon.go
@@ -47,10 +47,6 @@ type IMFuncPropCon interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *MFuncPropCon) MessageCode() uint8 {
-	return 0xFA
-}
-
 func (m *MFuncPropCon) GetMessageCode() uint8 {
 	return 0xFA
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropStateReadReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropStateReadReq.go
index 43dba79..d539e97 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropStateReadReq.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MFuncPropStateReadReq.go
@@ -47,10 +47,6 @@ type IMFuncPropStateReadReq interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *MFuncPropStateReadReq) MessageCode() uint8 {
-	return 0xF9
-}
-
 func (m *MFuncPropStateReadReq) GetMessageCode() uint8 {
 	return 0xF9
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropInfoInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropInfoInd.go
index aa56804..9d5267d 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropInfoInd.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropInfoInd.go
@@ -47,10 +47,6 @@ type IMPropInfoInd interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *MPropInfoInd) MessageCode() uint8 {
-	return 0xF7
-}
-
 func (m *MPropInfoInd) GetMessageCode() uint8 {
 	return 0xF7
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadCon.go
index 21efb7e..c9f0fa9 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadCon.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadCon.go
@@ -66,10 +66,6 @@ type IMPropReadCon interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *MPropReadCon) MessageCode() uint8 {
-	return 0xFB
-}
-
 func (m *MPropReadCon) GetMessageCode() uint8 {
 	return 0xFB
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadReq.go
index 6b7c94f..9ec6613 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadReq.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropReadReq.go
@@ -63,10 +63,6 @@ type IMPropReadReq interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *MPropReadReq) MessageCode() uint8 {
-	return 0xFC
-}
-
 func (m *MPropReadReq) GetMessageCode() uint8 {
 	return 0xFC
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteCon.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteCon.go
index 1ea951c..77273a0 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteCon.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteCon.go
@@ -47,10 +47,6 @@ type IMPropWriteCon interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *MPropWriteCon) MessageCode() uint8 {
-	return 0xF5
-}
-
 func (m *MPropWriteCon) GetMessageCode() uint8 {
 	return 0xF5
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteReq.go
index 8cd78b4..85d396f 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteReq.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MPropWriteReq.go
@@ -47,10 +47,6 @@ type IMPropWriteReq interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *MPropWriteReq) MessageCode() uint8 {
-	return 0xF6
-}
-
 func (m *MPropWriteReq) GetMessageCode() uint8 {
 	return 0xF6
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetInd.go
index 143ee7f..4953043 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetInd.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetInd.go
@@ -47,10 +47,6 @@ type IMResetInd interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *MResetInd) MessageCode() uint8 {
-	return 0xF0
-}
-
 func (m *MResetInd) GetMessageCode() uint8 {
 	return 0xF0
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetReq.go
index 7b4de70..787db66 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetReq.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/MResetReq.go
@@ -47,10 +47,6 @@ type IMResetReq interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *MResetReq) MessageCode() uint8 {
-	return 0xF1
-}
-
 func (m *MResetReq) GetMessageCode() uint8 {
 	return 0xF1
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/RoutingIndication.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/RoutingIndication.go
index 0cdc157..95b3a19 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/RoutingIndication.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/RoutingIndication.go
@@ -44,10 +44,6 @@ type IRoutingIndication interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *RoutingIndication) MsgType() uint16 {
-	return 0x0530
-}
-
 func (m *RoutingIndication) GetMsgType() uint16 {
 	return 0x0530
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go
index 9e37823..4ef8c7d 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchRequest.go
@@ -48,10 +48,6 @@ type ISearchRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SearchRequest) MsgType() uint16 {
-	return 0x0201
-}
-
 func (m *SearchRequest) GetMsgType() uint16 {
 	return 0x0201
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go
index dde5d07..415c086 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/SearchResponse.go
@@ -54,10 +54,6 @@ type ISearchResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *SearchResponse) MsgType() uint16 {
-	return 0x0202
-}
-
 func (m *SearchResponse) GetMsgType() uint16 {
 	return 0x0202
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedInd.go
index 2143b59..5d7fba8 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedInd.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedInd.go
@@ -47,10 +47,6 @@ type ITDataConnectedInd interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *TDataConnectedInd) MessageCode() uint8 {
-	return 0x89
-}
-
 func (m *TDataConnectedInd) GetMessageCode() uint8 {
 	return 0x89
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedReq.go
index a24b873..36bd146 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedReq.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataConnectedReq.go
@@ -47,10 +47,6 @@ type ITDataConnectedReq interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *TDataConnectedReq) MessageCode() uint8 {
-	return 0x41
-}
-
 func (m *TDataConnectedReq) GetMessageCode() uint8 {
 	return 0x41
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualInd.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualInd.go
index 9f4b746..1033e86 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualInd.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualInd.go
@@ -47,10 +47,6 @@ type ITDataIndividualInd interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *TDataIndividualInd) MessageCode() uint8 {
-	return 0x94
-}
-
 func (m *TDataIndividualInd) GetMessageCode() uint8 {
 	return 0x94
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualReq.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualReq.go
index 9d42ff8..eada137 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualReq.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TDataIndividualReq.go
@@ -47,10 +47,6 @@ type ITDataIndividualReq interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *TDataIndividualReq) MessageCode() uint8 {
-	return 0x4A
-}
-
 func (m *TDataIndividualReq) GetMessageCode() uint8 {
 	return 0x4A
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
index 1568ba7..84594a0 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
@@ -54,10 +54,6 @@ type ITunnelingRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *TunnelingRequest) MsgType() uint16 {
-	return 0x0420
-}
-
 func (m *TunnelingRequest) GetMsgType() uint16 {
 	return 0x0420
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go
index 113fd4a..e239885 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingResponse.go
@@ -48,10 +48,6 @@ type ITunnelingResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *TunnelingResponse) MsgType() uint16 {
-	return 0x0421
-}
-
 func (m *TunnelingResponse) GetMsgType() uint16 {
 	return 0x0421
 }
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
index 14d8217..0b82c4a 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
@@ -51,10 +51,6 @@ type IUnknownMessage interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *UnknownMessage) MsgType() uint16 {
-	return 0x020B
-}
-
 func (m *UnknownMessage) GetMsgType() uint16 {
 	return 0x020B
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go
index fbb2dd8..20f66b2 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticRequest.go
@@ -51,26 +51,14 @@ type IModbusPDUDiagnosticRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUDiagnosticRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUDiagnosticRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUDiagnosticRequest) FunctionFlag() uint8 {
-	return 0x08
-}
-
 func (m *ModbusPDUDiagnosticRequest) GetFunctionFlag() uint8 {
 	return 0x08
 }
 
-func (m *ModbusPDUDiagnosticRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUDiagnosticRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go
index 4421c88..40b9f77 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUDiagnosticResponse.go
@@ -51,26 +51,14 @@ type IModbusPDUDiagnosticResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUDiagnosticResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUDiagnosticResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUDiagnosticResponse) FunctionFlag() uint8 {
-	return 0x08
-}
-
 func (m *ModbusPDUDiagnosticResponse) GetFunctionFlag() uint8 {
 	return 0x08
 }
 
-func (m *ModbusPDUDiagnosticResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUDiagnosticResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go
index c690bc7..6d6d08c 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUError.go
@@ -48,26 +48,14 @@ type IModbusPDUError interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUError) ErrorFlag() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUError) GetErrorFlag() bool {
 	return bool(true)
 }
 
-func (m *ModbusPDUError) FunctionFlag() uint8 {
-	return 0
-}
-
 func (m *ModbusPDUError) GetFunctionFlag() uint8 {
 	return 0
 }
 
-func (m *ModbusPDUError) Response() bool {
-	return false
-}
-
 func (m *ModbusPDUError) GetResponse() bool {
 	return false
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterRequest.go
index 49ea9a6..daef84b 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterRequest.go
@@ -44,26 +44,14 @@ type IModbusPDUGetComEventCounterRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUGetComEventCounterRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUGetComEventCounterRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUGetComEventCounterRequest) FunctionFlag() uint8 {
-	return 0x0B
-}
-
 func (m *ModbusPDUGetComEventCounterRequest) GetFunctionFlag() uint8 {
 	return 0x0B
 }
 
-func (m *ModbusPDUGetComEventCounterRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUGetComEventCounterRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go
index 2ddf4e5..ab0517d 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventCounterResponse.go
@@ -51,26 +51,14 @@ type IModbusPDUGetComEventCounterResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUGetComEventCounterResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUGetComEventCounterResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUGetComEventCounterResponse) FunctionFlag() uint8 {
-	return 0x0B
-}
-
 func (m *ModbusPDUGetComEventCounterResponse) GetFunctionFlag() uint8 {
 	return 0x0B
 }
 
-func (m *ModbusPDUGetComEventCounterResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUGetComEventCounterResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go
index 454234d..6fb0b6e 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogRequest.go
@@ -44,26 +44,14 @@ type IModbusPDUGetComEventLogRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUGetComEventLogRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUGetComEventLogRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUGetComEventLogRequest) FunctionFlag() uint8 {
-	return 0x0C
-}
-
 func (m *ModbusPDUGetComEventLogRequest) GetFunctionFlag() uint8 {
 	return 0x0C
 }
 
-func (m *ModbusPDUGetComEventLogRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUGetComEventLogRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
index a8cc274..1dec34c 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUGetComEventLogResponse.go
@@ -57,26 +57,14 @@ type IModbusPDUGetComEventLogResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUGetComEventLogResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUGetComEventLogResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUGetComEventLogResponse) FunctionFlag() uint8 {
-	return 0x0C
-}
-
 func (m *ModbusPDUGetComEventLogResponse) GetFunctionFlag() uint8 {
 	return 0x0C
 }
 
-func (m *ModbusPDUGetComEventLogResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUGetComEventLogResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go
index 43162d0..0997565 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterRequest.go
@@ -54,26 +54,14 @@ type IModbusPDUMaskWriteHoldingRegisterRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUMaskWriteHoldingRegisterRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUMaskWriteHoldingRegisterRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUMaskWriteHoldingRegisterRequest) FunctionFlag() uint8 {
-	return 0x16
-}
-
 func (m *ModbusPDUMaskWriteHoldingRegisterRequest) GetFunctionFlag() uint8 {
 	return 0x16
 }
 
-func (m *ModbusPDUMaskWriteHoldingRegisterRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUMaskWriteHoldingRegisterRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go
index 0d5d83d..90300b0 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUMaskWriteHoldingRegisterResponse.go
@@ -54,26 +54,14 @@ type IModbusPDUMaskWriteHoldingRegisterResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUMaskWriteHoldingRegisterResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUMaskWriteHoldingRegisterResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUMaskWriteHoldingRegisterResponse) FunctionFlag() uint8 {
-	return 0x16
-}
-
 func (m *ModbusPDUMaskWriteHoldingRegisterResponse) GetFunctionFlag() uint8 {
 	return 0x16
 }
 
-func (m *ModbusPDUMaskWriteHoldingRegisterResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUMaskWriteHoldingRegisterResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go
index a2c53ef..efb3436 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsRequest.go
@@ -51,26 +51,14 @@ type IModbusPDUReadCoilsRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadCoilsRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadCoilsRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadCoilsRequest) FunctionFlag() uint8 {
-	return 0x01
-}
-
 func (m *ModbusPDUReadCoilsRequest) GetFunctionFlag() uint8 {
 	return 0x01
 }
 
-func (m *ModbusPDUReadCoilsRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadCoilsRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
index e2d3e99..b2568c5 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadCoilsResponse.go
@@ -48,26 +48,14 @@ type IModbusPDUReadCoilsResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadCoilsResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadCoilsResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadCoilsResponse) FunctionFlag() uint8 {
-	return 0x01
-}
-
 func (m *ModbusPDUReadCoilsResponse) GetFunctionFlag() uint8 {
 	return 0x01
 }
 
-func (m *ModbusPDUReadCoilsResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUReadCoilsResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go
index 9b36011..bd91b20 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationRequest.go
@@ -55,26 +55,14 @@ type IModbusPDUReadDeviceIdentificationRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadDeviceIdentificationRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadDeviceIdentificationRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadDeviceIdentificationRequest) FunctionFlag() uint8 {
-	return 0x2B
-}
-
 func (m *ModbusPDUReadDeviceIdentificationRequest) GetFunctionFlag() uint8 {
 	return 0x2B
 }
 
-func (m *ModbusPDUReadDeviceIdentificationRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadDeviceIdentificationRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go
index 9df7122..e39b0a2 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDeviceIdentificationResponse.go
@@ -67,26 +67,14 @@ type IModbusPDUReadDeviceIdentificationResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadDeviceIdentificationResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadDeviceIdentificationResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadDeviceIdentificationResponse) FunctionFlag() uint8 {
-	return 0x2B
-}
-
 func (m *ModbusPDUReadDeviceIdentificationResponse) GetFunctionFlag() uint8 {
 	return 0x2B
 }
 
-func (m *ModbusPDUReadDeviceIdentificationResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUReadDeviceIdentificationResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go
index 9ca90dc..9e74d33 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsRequest.go
@@ -51,26 +51,14 @@ type IModbusPDUReadDiscreteInputsRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadDiscreteInputsRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadDiscreteInputsRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadDiscreteInputsRequest) FunctionFlag() uint8 {
-	return 0x02
-}
-
 func (m *ModbusPDUReadDiscreteInputsRequest) GetFunctionFlag() uint8 {
 	return 0x02
 }
 
-func (m *ModbusPDUReadDiscreteInputsRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadDiscreteInputsRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
index c8d258e..70b7cc1 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadDiscreteInputsResponse.go
@@ -48,26 +48,14 @@ type IModbusPDUReadDiscreteInputsResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadDiscreteInputsResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadDiscreteInputsResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadDiscreteInputsResponse) FunctionFlag() uint8 {
-	return 0x02
-}
-
 func (m *ModbusPDUReadDiscreteInputsResponse) GetFunctionFlag() uint8 {
 	return 0x02
 }
 
-func (m *ModbusPDUReadDiscreteInputsResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUReadDiscreteInputsResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go
index 50c863f..e9b80cc 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusRequest.go
@@ -44,26 +44,14 @@ type IModbusPDUReadExceptionStatusRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadExceptionStatusRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadExceptionStatusRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadExceptionStatusRequest) FunctionFlag() uint8 {
-	return 0x07
-}
-
 func (m *ModbusPDUReadExceptionStatusRequest) GetFunctionFlag() uint8 {
 	return 0x07
 }
 
-func (m *ModbusPDUReadExceptionStatusRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadExceptionStatusRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go
index dd2d9c0..2330fc7 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadExceptionStatusResponse.go
@@ -48,26 +48,14 @@ type IModbusPDUReadExceptionStatusResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadExceptionStatusResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadExceptionStatusResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadExceptionStatusResponse) FunctionFlag() uint8 {
-	return 0x07
-}
-
 func (m *ModbusPDUReadExceptionStatusResponse) GetFunctionFlag() uint8 {
 	return 0x07
 }
 
-func (m *ModbusPDUReadExceptionStatusResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUReadExceptionStatusResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go
index 6dae01a..b14b3e7 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueRequest.go
@@ -48,26 +48,14 @@ type IModbusPDUReadFifoQueueRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadFifoQueueRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadFifoQueueRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadFifoQueueRequest) FunctionFlag() uint8 {
-	return 0x18
-}
-
 func (m *ModbusPDUReadFifoQueueRequest) GetFunctionFlag() uint8 {
 	return 0x18
 }
 
-func (m *ModbusPDUReadFifoQueueRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadFifoQueueRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go
index c10e7c0..a936fac 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFifoQueueResponse.go
@@ -48,26 +48,14 @@ type IModbusPDUReadFifoQueueResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadFifoQueueResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadFifoQueueResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadFifoQueueResponse) FunctionFlag() uint8 {
-	return 0x18
-}
-
 func (m *ModbusPDUReadFifoQueueResponse) GetFunctionFlag() uint8 {
 	return 0x18
 }
 
-func (m *ModbusPDUReadFifoQueueResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUReadFifoQueueResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go
index 94350b9..d34306b 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordRequest.go
@@ -48,26 +48,14 @@ type IModbusPDUReadFileRecordRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadFileRecordRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadFileRecordRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadFileRecordRequest) FunctionFlag() uint8 {
-	return 0x14
-}
-
 func (m *ModbusPDUReadFileRecordRequest) GetFunctionFlag() uint8 {
 	return 0x14
 }
 
-func (m *ModbusPDUReadFileRecordRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadFileRecordRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go
index 020740a..73afd39 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadFileRecordResponse.go
@@ -48,26 +48,14 @@ type IModbusPDUReadFileRecordResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadFileRecordResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadFileRecordResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadFileRecordResponse) FunctionFlag() uint8 {
-	return 0x14
-}
-
 func (m *ModbusPDUReadFileRecordResponse) GetFunctionFlag() uint8 {
 	return 0x14
 }
 
-func (m *ModbusPDUReadFileRecordResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUReadFileRecordResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go
index 5e449c2..7ff3d73 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersRequest.go
@@ -51,26 +51,14 @@ type IModbusPDUReadHoldingRegistersRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadHoldingRegistersRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadHoldingRegistersRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadHoldingRegistersRequest) FunctionFlag() uint8 {
-	return 0x03
-}
-
 func (m *ModbusPDUReadHoldingRegistersRequest) GetFunctionFlag() uint8 {
 	return 0x03
 }
 
-func (m *ModbusPDUReadHoldingRegistersRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadHoldingRegistersRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
index 1d0e822..94e8742 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadHoldingRegistersResponse.go
@@ -48,26 +48,14 @@ type IModbusPDUReadHoldingRegistersResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadHoldingRegistersResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadHoldingRegistersResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadHoldingRegistersResponse) FunctionFlag() uint8 {
-	return 0x03
-}
-
 func (m *ModbusPDUReadHoldingRegistersResponse) GetFunctionFlag() uint8 {
 	return 0x03
 }
 
-func (m *ModbusPDUReadHoldingRegistersResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUReadHoldingRegistersResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go
index adffdd8..4988e32 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersRequest.go
@@ -51,26 +51,14 @@ type IModbusPDUReadInputRegistersRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadInputRegistersRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadInputRegistersRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadInputRegistersRequest) FunctionFlag() uint8 {
-	return 0x04
-}
-
 func (m *ModbusPDUReadInputRegistersRequest) GetFunctionFlag() uint8 {
 	return 0x04
 }
 
-func (m *ModbusPDUReadInputRegistersRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadInputRegistersRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
index 15990d7..4de5260 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadInputRegistersResponse.go
@@ -48,26 +48,14 @@ type IModbusPDUReadInputRegistersResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadInputRegistersResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadInputRegistersResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadInputRegistersResponse) FunctionFlag() uint8 {
-	return 0x04
-}
-
 func (m *ModbusPDUReadInputRegistersResponse) GetFunctionFlag() uint8 {
 	return 0x04
 }
 
-func (m *ModbusPDUReadInputRegistersResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUReadInputRegistersResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
index 7cdabf6..73532ea 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersRequest.go
@@ -60,26 +60,14 @@ type IModbusPDUReadWriteMultipleHoldingRegistersRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) FunctionFlag() uint8 {
-	return 0x17
-}
-
 func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) GetFunctionFlag() uint8 {
 	return 0x17
 }
 
-func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadWriteMultipleHoldingRegistersRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
index 88c8be6..b3b34e0 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReadWriteMultipleHoldingRegistersResponse.go
@@ -48,26 +48,14 @@ type IModbusPDUReadWriteMultipleHoldingRegistersResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) FunctionFlag() uint8 {
-	return 0x17
-}
-
 func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) GetFunctionFlag() uint8 {
 	return 0x17
 }
 
-func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUReadWriteMultipleHoldingRegistersResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go
index a665a34..d73c8fc 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdRequest.go
@@ -44,26 +44,14 @@ type IModbusPDUReportServerIdRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReportServerIdRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReportServerIdRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReportServerIdRequest) FunctionFlag() uint8 {
-	return 0x11
-}
-
 func (m *ModbusPDUReportServerIdRequest) GetFunctionFlag() uint8 {
 	return 0x11
 }
 
-func (m *ModbusPDUReportServerIdRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReportServerIdRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
index f53107c..51823a3 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUReportServerIdResponse.go
@@ -48,26 +48,14 @@ type IModbusPDUReportServerIdResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUReportServerIdResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUReportServerIdResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUReportServerIdResponse) FunctionFlag() uint8 {
-	return 0x11
-}
-
 func (m *ModbusPDUReportServerIdResponse) GetFunctionFlag() uint8 {
 	return 0x11
 }
 
-func (m *ModbusPDUReportServerIdResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUReportServerIdResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go
index 17a16b9..df2c2c8 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordRequest.go
@@ -48,26 +48,14 @@ type IModbusPDUWriteFileRecordRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUWriteFileRecordRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteFileRecordRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUWriteFileRecordRequest) FunctionFlag() uint8 {
-	return 0x15
-}
-
 func (m *ModbusPDUWriteFileRecordRequest) GetFunctionFlag() uint8 {
 	return 0x15
 }
 
-func (m *ModbusPDUWriteFileRecordRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteFileRecordRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go
index c1b28f6..a67f6cd 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteFileRecordResponse.go
@@ -48,26 +48,14 @@ type IModbusPDUWriteFileRecordResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUWriteFileRecordResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteFileRecordResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUWriteFileRecordResponse) FunctionFlag() uint8 {
-	return 0x15
-}
-
 func (m *ModbusPDUWriteFileRecordResponse) GetFunctionFlag() uint8 {
 	return 0x15
 }
 
-func (m *ModbusPDUWriteFileRecordResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUWriteFileRecordResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
index 7f1c946..b342996 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsRequest.go
@@ -54,26 +54,14 @@ type IModbusPDUWriteMultipleCoilsRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUWriteMultipleCoilsRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteMultipleCoilsRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUWriteMultipleCoilsRequest) FunctionFlag() uint8 {
-	return 0x0F
-}
-
 func (m *ModbusPDUWriteMultipleCoilsRequest) GetFunctionFlag() uint8 {
 	return 0x0F
 }
 
-func (m *ModbusPDUWriteMultipleCoilsRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteMultipleCoilsRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go
index c6054ee..01b69e3 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleCoilsResponse.go
@@ -51,26 +51,14 @@ type IModbusPDUWriteMultipleCoilsResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUWriteMultipleCoilsResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteMultipleCoilsResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUWriteMultipleCoilsResponse) FunctionFlag() uint8 {
-	return 0x0F
-}
-
 func (m *ModbusPDUWriteMultipleCoilsResponse) GetFunctionFlag() uint8 {
 	return 0x0F
 }
 
-func (m *ModbusPDUWriteMultipleCoilsResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUWriteMultipleCoilsResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
index 6d64b3c..f5061f0 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersRequest.go
@@ -54,26 +54,14 @@ type IModbusPDUWriteMultipleHoldingRegistersRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) FunctionFlag() uint8 {
-	return 0x10
-}
-
 func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) GetFunctionFlag() uint8 {
 	return 0x10
 }
 
-func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteMultipleHoldingRegistersRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go
index 49905d9..0379cb1 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteMultipleHoldingRegistersResponse.go
@@ -51,26 +51,14 @@ type IModbusPDUWriteMultipleHoldingRegistersResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) FunctionFlag() uint8 {
-	return 0x10
-}
-
 func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) GetFunctionFlag() uint8 {
 	return 0x10
 }
 
-func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUWriteMultipleHoldingRegistersResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go
index 39c338f..1c64445 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilRequest.go
@@ -51,26 +51,14 @@ type IModbusPDUWriteSingleCoilRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUWriteSingleCoilRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteSingleCoilRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUWriteSingleCoilRequest) FunctionFlag() uint8 {
-	return 0x05
-}
-
 func (m *ModbusPDUWriteSingleCoilRequest) GetFunctionFlag() uint8 {
 	return 0x05
 }
 
-func (m *ModbusPDUWriteSingleCoilRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteSingleCoilRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go
index 670b48c..f3c3bfa 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleCoilResponse.go
@@ -51,26 +51,14 @@ type IModbusPDUWriteSingleCoilResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUWriteSingleCoilResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteSingleCoilResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUWriteSingleCoilResponse) FunctionFlag() uint8 {
-	return 0x05
-}
-
 func (m *ModbusPDUWriteSingleCoilResponse) GetFunctionFlag() uint8 {
 	return 0x05
 }
 
-func (m *ModbusPDUWriteSingleCoilResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUWriteSingleCoilResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go
index be36c06..deca3fb 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterRequest.go
@@ -51,26 +51,14 @@ type IModbusPDUWriteSingleRegisterRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUWriteSingleRegisterRequest) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteSingleRegisterRequest) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUWriteSingleRegisterRequest) FunctionFlag() uint8 {
-	return 0x06
-}
-
 func (m *ModbusPDUWriteSingleRegisterRequest) GetFunctionFlag() uint8 {
 	return 0x06
 }
 
-func (m *ModbusPDUWriteSingleRegisterRequest) Response() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteSingleRegisterRequest) GetResponse() bool {
 	return bool(false)
 }
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go
index c4d046e..a0f6a99 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDUWriteSingleRegisterResponse.go
@@ -51,26 +51,14 @@ type IModbusPDUWriteSingleRegisterResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *ModbusPDUWriteSingleRegisterResponse) ErrorFlag() bool {
-	return bool(false)
-}
-
 func (m *ModbusPDUWriteSingleRegisterResponse) GetErrorFlag() bool {
 	return bool(false)
 }
 
-func (m *ModbusPDUWriteSingleRegisterResponse) FunctionFlag() uint8 {
-	return 0x06
-}
-
 func (m *ModbusPDUWriteSingleRegisterResponse) GetFunctionFlag() uint8 {
 	return 0x06
 }
 
-func (m *ModbusPDUWriteSingleRegisterResponse) Response() bool {
-	return bool(true)
-}
-
 func (m *ModbusPDUWriteSingleRegisterResponse) GetResponse() bool {
 	return bool(true)
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go
index 7e3df93..e4f88ba 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionRequest.go
@@ -57,10 +57,6 @@ type ICOTPPacketConnectionRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *COTPPacketConnectionRequest) TpduCode() uint8 {
-	return 0xE0
-}
-
 func (m *COTPPacketConnectionRequest) GetTpduCode() uint8 {
 	return 0xE0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go
index 85ae7d8..3ab1a21 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketConnectionResponse.go
@@ -57,10 +57,6 @@ type ICOTPPacketConnectionResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *COTPPacketConnectionResponse) TpduCode() uint8 {
-	return 0xD0
-}
-
 func (m *COTPPacketConnectionResponse) GetTpduCode() uint8 {
 	return 0xD0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go
index 2995fd6..f8a3dee 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketData.go
@@ -54,10 +54,6 @@ type ICOTPPacketData interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *COTPPacketData) TpduCode() uint8 {
-	return 0xF0
-}
-
 func (m *COTPPacketData) GetTpduCode() uint8 {
 	return 0xF0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectRequest.go
index cb36d8c..f6903b7 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectRequest.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectRequest.go
@@ -57,10 +57,6 @@ type ICOTPPacketDisconnectRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *COTPPacketDisconnectRequest) TpduCode() uint8 {
-	return 0x80
-}
-
 func (m *COTPPacketDisconnectRequest) GetTpduCode() uint8 {
 	return 0x80
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectResponse.go
index 9fc5a3a..eedb25f 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketDisconnectResponse.go
@@ -54,10 +54,6 @@ type ICOTPPacketDisconnectResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *COTPPacketDisconnectResponse) TpduCode() uint8 {
-	return 0xC0
-}
-
 func (m *COTPPacketDisconnectResponse) GetTpduCode() uint8 {
 	return 0xC0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketTpduError.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketTpduError.go
index 5505182..923eec8 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketTpduError.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacketTpduError.go
@@ -54,10 +54,6 @@ type ICOTPPacketTpduError interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *COTPPacketTpduError) TpduCode() uint8 {
-	return 0x70
-}
-
 func (m *COTPPacketTpduError) GetTpduCode() uint8 {
 	return 0x70
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCalledTsap.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCalledTsap.go
index 15be3a4..2b89231 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCalledTsap.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCalledTsap.go
@@ -51,10 +51,6 @@ type ICOTPParameterCalledTsap interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *COTPParameterCalledTsap) ParameterType() uint8 {
-	return 0xC2
-}
-
 func (m *COTPParameterCalledTsap) GetParameterType() uint8 {
 	return 0xC2
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCallingTsap.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCallingTsap.go
index a32c188..5cc2f8e 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCallingTsap.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterCallingTsap.go
@@ -51,10 +51,6 @@ type ICOTPParameterCallingTsap interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *COTPParameterCallingTsap) ParameterType() uint8 {
-	return 0xC1
-}
-
 func (m *COTPParameterCallingTsap) GetParameterType() uint8 {
 	return 0xC1
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterChecksum.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterChecksum.go
index 017d488..8013c06 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterChecksum.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterChecksum.go
@@ -51,10 +51,6 @@ type ICOTPParameterChecksum interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *COTPParameterChecksum) ParameterType() uint8 {
-	return 0xC3
-}
-
 func (m *COTPParameterChecksum) GetParameterType() uint8 {
 	return 0xC3
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
index 4e7e3a4..4d87d44 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
@@ -51,10 +51,6 @@ type ICOTPParameterDisconnectAdditionalInformation interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *COTPParameterDisconnectAdditionalInformation) ParameterType() uint8 {
-	return 0xE0
-}
-
 func (m *COTPParameterDisconnectAdditionalInformation) GetParameterType() uint8 {
 	return 0xE0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterTpduSize.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterTpduSize.go
index f9af9f3..ea2263d 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterTpduSize.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterTpduSize.go
@@ -51,10 +51,6 @@ type ICOTPParameterTpduSize interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *COTPParameterTpduSize) ParameterType() uint8 {
-	return 0xC0
-}
-
 func (m *COTPParameterTpduSize) GetParameterType() uint8 {
 	return 0xC0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7AddressAny.go b/plc4go/internal/plc4go/s7/readwrite/model/S7AddressAny.go
index b2754c6..ec60193 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7AddressAny.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7AddressAny.go
@@ -64,10 +64,6 @@ type IS7AddressAny interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7AddressAny) AddressType() uint8 {
-	return 0x10
-}
-
 func (m *S7AddressAny) GetAddressType() uint8 {
 	return 0x10
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectRequest.go
index c422f35..700c011 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectRequest.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectRequest.go
@@ -60,10 +60,6 @@ type IS7MessageObjectRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7MessageObjectRequest) CpuFunctionType() uint8 {
-	return 0x04
-}
-
 func (m *S7MessageObjectRequest) GetCpuFunctionType() uint8 {
 	return 0x04
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectResponse.go
index e7c088d..fd83f45 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageObjectResponse.go
@@ -52,10 +52,6 @@ type IS7MessageObjectResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7MessageObjectResponse) CpuFunctionType() uint8 {
-	return 0x08
-}
-
 func (m *S7MessageObjectResponse) GetCpuFunctionType() uint8 {
 	return 0x08
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageRequest.go
index 4674977..0b6d487 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageRequest.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageRequest.go
@@ -44,10 +44,6 @@ type IS7MessageRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7MessageRequest) MessageType() uint8 {
-	return 0x01
-}
-
 func (m *S7MessageRequest) GetMessageType() uint8 {
 	return 0x01
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponse.go
index 07630c1..10316ec 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponse.go
@@ -51,10 +51,6 @@ type IS7MessageResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7MessageResponse) MessageType() uint8 {
-	return 0x02
-}
-
 func (m *S7MessageResponse) GetMessageType() uint8 {
 	return 0x02
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponseData.go b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponseData.go
index bf5c803..0d7f0dd 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponseData.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageResponseData.go
@@ -51,10 +51,6 @@ type IS7MessageResponseData interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7MessageResponseData) MessageType() uint8 {
-	return 0x03
-}
-
 func (m *S7MessageResponseData) GetMessageType() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageUserData.go b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageUserData.go
index 794ce60..b0fa929 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7MessageUserData.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7MessageUserData.go
@@ -44,10 +44,6 @@ type IS7MessageUserData interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7MessageUserData) MessageType() uint8 {
-	return 0x07
-}
-
 func (m *S7MessageUserData) GetMessageType() uint8 {
 	return 0x07
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterModeTransition.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterModeTransition.go
index c7d00f0..5595d15 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterModeTransition.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterModeTransition.go
@@ -61,18 +61,10 @@ type IS7ParameterModeTransition interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7ParameterModeTransition) ParameterType() uint8 {
-	return 0x01
-}
-
 func (m *S7ParameterModeTransition) GetParameterType() uint8 {
 	return 0x01
 }
 
-func (m *S7ParameterModeTransition) MessageType() uint8 {
-	return 0x07
-}
-
 func (m *S7ParameterModeTransition) GetMessageType() uint8 {
 	return 0x07
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarRequest.go
index 04edc56..b20e4e8 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarRequest.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarRequest.go
@@ -48,18 +48,10 @@ type IS7ParameterReadVarRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7ParameterReadVarRequest) ParameterType() uint8 {
-	return 0x04
-}
-
 func (m *S7ParameterReadVarRequest) GetParameterType() uint8 {
 	return 0x04
 }
 
-func (m *S7ParameterReadVarRequest) MessageType() uint8 {
-	return 0x01
-}
-
 func (m *S7ParameterReadVarRequest) GetMessageType() uint8 {
 	return 0x01
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarResponse.go
index c718ad1..38add4f 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterReadVarResponse.go
@@ -48,18 +48,10 @@ type IS7ParameterReadVarResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7ParameterReadVarResponse) ParameterType() uint8 {
-	return 0x04
-}
-
 func (m *S7ParameterReadVarResponse) GetParameterType() uint8 {
 	return 0x04
 }
 
-func (m *S7ParameterReadVarResponse) MessageType() uint8 {
-	return 0x03
-}
-
 func (m *S7ParameterReadVarResponse) GetMessageType() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterSetupCommunication.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterSetupCommunication.go
index 9dfbd03..7d8e4ff 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterSetupCommunication.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterSetupCommunication.go
@@ -55,18 +55,10 @@ type IS7ParameterSetupCommunication interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7ParameterSetupCommunication) ParameterType() uint8 {
-	return 0xF0
-}
-
 func (m *S7ParameterSetupCommunication) GetParameterType() uint8 {
 	return 0xF0
 }
 
-func (m *S7ParameterSetupCommunication) MessageType() uint8 {
-	return 0
-}
-
 func (m *S7ParameterSetupCommunication) GetMessageType() uint8 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserData.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserData.go
index 1f27191..090030e 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserData.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserData.go
@@ -48,18 +48,10 @@ type IS7ParameterUserData interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7ParameterUserData) ParameterType() uint8 {
-	return 0x00
-}
-
 func (m *S7ParameterUserData) GetParameterType() uint8 {
 	return 0x00
 }
 
-func (m *S7ParameterUserData) MessageType() uint8 {
-	return 0x07
-}
-
 func (m *S7ParameterUserData) GetMessageType() uint8 {
 	return 0x07
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go
index 6cee262..2543582 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterUserDataItemCPUFunctions.go
@@ -69,10 +69,6 @@ type IS7ParameterUserDataItemCPUFunctions interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7ParameterUserDataItemCPUFunctions) ItemType() uint8 {
-	return 0x12
-}
-
 func (m *S7ParameterUserDataItemCPUFunctions) GetItemType() uint8 {
 	return 0x12
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarRequest.go
index 908ff44..3ab0e5a 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarRequest.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarRequest.go
@@ -48,18 +48,10 @@ type IS7ParameterWriteVarRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7ParameterWriteVarRequest) ParameterType() uint8 {
-	return 0x05
-}
-
 func (m *S7ParameterWriteVarRequest) GetParameterType() uint8 {
 	return 0x05
 }
 
-func (m *S7ParameterWriteVarRequest) MessageType() uint8 {
-	return 0x01
-}
-
 func (m *S7ParameterWriteVarRequest) GetMessageType() uint8 {
 	return 0x01
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarResponse.go
index cacd388..0c09415 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7ParameterWriteVarResponse.go
@@ -48,18 +48,10 @@ type IS7ParameterWriteVarResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7ParameterWriteVarResponse) ParameterType() uint8 {
-	return 0x05
-}
-
 func (m *S7ParameterWriteVarResponse) GetParameterType() uint8 {
 	return 0x05
 }
 
-func (m *S7ParameterWriteVarResponse) MessageType() uint8 {
-	return 0x03
-}
-
 func (m *S7ParameterWriteVarResponse) GetMessageType() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarm8.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarm8.go
index d9a219c..55def26 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarm8.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarm8.go
@@ -48,26 +48,14 @@ type IS7PayloadAlarm8 interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadAlarm8) CpuFunctionType() uint8 {
-	return 0x00
-}
-
 func (m *S7PayloadAlarm8) GetCpuFunctionType() uint8 {
 	return 0x00
 }
 
-func (m *S7PayloadAlarm8) CpuSubfunction() uint8 {
-	return 0x05
-}
-
 func (m *S7PayloadAlarm8) GetCpuSubfunction() uint8 {
 	return 0x05
 }
 
-func (m *S7PayloadAlarm8) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadAlarm8) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmAckInd.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmAckInd.go
index 5cd1948..7dc0c58 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmAckInd.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmAckInd.go
@@ -48,26 +48,14 @@ type IS7PayloadAlarmAckInd interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadAlarmAckInd) CpuFunctionType() uint8 {
-	return 0x00
-}
-
 func (m *S7PayloadAlarmAckInd) GetCpuFunctionType() uint8 {
 	return 0x00
 }
 
-func (m *S7PayloadAlarmAckInd) CpuSubfunction() uint8 {
-	return 0x0c
-}
-
 func (m *S7PayloadAlarmAckInd) GetCpuSubfunction() uint8 {
 	return 0x0c
 }
 
-func (m *S7PayloadAlarmAckInd) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadAlarmAckInd) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmS.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmS.go
index 779d4c3..83afa79 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmS.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmS.go
@@ -48,26 +48,14 @@ type IS7PayloadAlarmS interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadAlarmS) CpuFunctionType() uint8 {
-	return 0x00
-}
-
 func (m *S7PayloadAlarmS) GetCpuFunctionType() uint8 {
 	return 0x00
 }
 
-func (m *S7PayloadAlarmS) CpuSubfunction() uint8 {
-	return 0x12
-}
-
 func (m *S7PayloadAlarmS) GetCpuSubfunction() uint8 {
 	return 0x12
 }
 
-func (m *S7PayloadAlarmS) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadAlarmS) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSC.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSC.go
index 547345a..718ba44 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSC.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSC.go
@@ -48,26 +48,14 @@ type IS7PayloadAlarmSC interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadAlarmSC) CpuFunctionType() uint8 {
-	return 0x00
-}
-
 func (m *S7PayloadAlarmSC) GetCpuFunctionType() uint8 {
 	return 0x00
 }
 
-func (m *S7PayloadAlarmSC) CpuSubfunction() uint8 {
-	return 0x13
-}
-
 func (m *S7PayloadAlarmSC) GetCpuSubfunction() uint8 {
 	return 0x13
 }
 
-func (m *S7PayloadAlarmSC) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadAlarmSC) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSQ.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSQ.go
index 3db813e..14c7b41 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSQ.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadAlarmSQ.go
@@ -48,26 +48,14 @@ type IS7PayloadAlarmSQ interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadAlarmSQ) CpuFunctionType() uint8 {
-	return 0x00
-}
-
 func (m *S7PayloadAlarmSQ) GetCpuFunctionType() uint8 {
 	return 0x00
 }
 
-func (m *S7PayloadAlarmSQ) CpuSubfunction() uint8 {
-	return 0x11
-}
-
 func (m *S7PayloadAlarmSQ) GetCpuSubfunction() uint8 {
 	return 0x11
 }
 
-func (m *S7PayloadAlarmSQ) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadAlarmSQ) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadDiagnosticMessage.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadDiagnosticMessage.go
index b3a42e7..6d1af5a 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadDiagnosticMessage.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadDiagnosticMessage.go
@@ -66,26 +66,14 @@ type IS7PayloadDiagnosticMessage interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadDiagnosticMessage) CpuFunctionType() uint8 {
-	return 0x00
-}
-
 func (m *S7PayloadDiagnosticMessage) GetCpuFunctionType() uint8 {
 	return 0x00
 }
 
-func (m *S7PayloadDiagnosticMessage) CpuSubfunction() uint8 {
-	return 0x03
-}
-
 func (m *S7PayloadDiagnosticMessage) GetCpuSubfunction() uint8 {
 	return 0x03
 }
 
-func (m *S7PayloadDiagnosticMessage) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadDiagnosticMessage) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify.go
index 270b409..9d8e780 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify.go
@@ -48,26 +48,14 @@ type IS7PayloadNotify interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadNotify) CpuFunctionType() uint8 {
-	return 0x00
-}
-
 func (m *S7PayloadNotify) GetCpuFunctionType() uint8 {
 	return 0x00
 }
 
-func (m *S7PayloadNotify) CpuSubfunction() uint8 {
-	return 0x06
-}
-
 func (m *S7PayloadNotify) GetCpuSubfunction() uint8 {
 	return 0x06
 }
 
-func (m *S7PayloadNotify) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadNotify) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify8.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify8.go
index 0ba4c92..7787168 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify8.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadNotify8.go
@@ -48,26 +48,14 @@ type IS7PayloadNotify8 interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadNotify8) CpuFunctionType() uint8 {
-	return 0x00
-}
-
 func (m *S7PayloadNotify8) GetCpuFunctionType() uint8 {
 	return 0x00
 }
 
-func (m *S7PayloadNotify8) CpuSubfunction() uint8 {
-	return 0x16
-}
-
 func (m *S7PayloadNotify8) GetCpuSubfunction() uint8 {
 	return 0x16
 }
 
-func (m *S7PayloadNotify8) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadNotify8) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go
index 5581fbb..8086465 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go
@@ -51,18 +51,10 @@ type IS7PayloadReadVarResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadReadVarResponse) ParameterParameterType() uint8 {
-	return 0x04
-}
-
 func (m *S7PayloadReadVarResponse) GetParameterParameterType() uint8 {
 	return 0x04
 }
 
-func (m *S7PayloadReadVarResponse) MessageType() uint8 {
-	return 0x03
-}
-
 func (m *S7PayloadReadVarResponse) GetMessageType() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go
index a232bf1..ae822ed 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go
@@ -51,18 +51,10 @@ type IS7PayloadUserData interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadUserData) ParameterParameterType() uint8 {
-	return 0x00
-}
-
 func (m *S7PayloadUserData) GetParameterParameterType() uint8 {
 	return 0x00
 }
 
-func (m *S7PayloadUserData) MessageType() uint8 {
-	return 0x07
-}
-
 func (m *S7PayloadUserData) GetMessageType() uint8 {
 	return 0x07
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAck.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAck.go
index f4c3795..cd9d751 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAck.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAck.go
@@ -51,26 +51,14 @@ type IS7PayloadUserDataItemCpuFunctionAlarmAck interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) CpuFunctionType() uint8 {
-	return 0x04
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) GetCpuFunctionType() uint8 {
 	return 0x04
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) CpuSubfunction() uint8 {
-	return 0x0b
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) GetCpuSubfunction() uint8 {
 	return 0x0b
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionAlarmAck) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go
index 2adc2fd..9e5329e 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.go
@@ -51,26 +51,14 @@ type IS7PayloadUserDataItemCpuFunctionAlarmAckResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) CpuFunctionType() uint8 {
-	return 0x08
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) GetCpuFunctionType() uint8 {
 	return 0x08
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) CpuSubfunction() uint8 {
-	return 0x0b
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) GetCpuSubfunction() uint8 {
 	return 0x0b
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionAlarmAckResponse) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go
index a8e8521..3646be7 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQuery.go
@@ -62,26 +62,14 @@ type IS7PayloadUserDataItemCpuFunctionAlarmQuery interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) CpuFunctionType() uint8 {
-	return 0x04
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) GetCpuFunctionType() uint8 {
 	return 0x04
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) CpuSubfunction() uint8 {
-	return 0x13
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) GetCpuSubfunction() uint8 {
 	return 0x13
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionAlarmQuery) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go
index 3fcad25..76d3ad2 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.go
@@ -57,26 +57,14 @@ type IS7PayloadUserDataItemCpuFunctionAlarmQueryResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) CpuFunctionType() uint8 {
-	return 0x08
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) GetCpuFunctionType() uint8 {
 	return 0x08
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) CpuSubfunction() uint8 {
-	return 0x13
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) GetCpuSubfunction() uint8 {
 	return 0x13
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go
index ede50f6..899af17 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscription.go
@@ -58,26 +58,14 @@ type IS7PayloadUserDataItemCpuFunctionMsgSubscription interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) CpuFunctionType() uint8 {
-	return 0x04
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) GetCpuFunctionType() uint8 {
 	return 0x04
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) CpuSubfunction() uint8 {
-	return 0x02
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) GetCpuSubfunction() uint8 {
 	return 0x02
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionMsgSubscription) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go
index cec9995..aa222b1 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.go
@@ -60,26 +60,14 @@ type IS7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) CpuFunctionType() uint8 {
-	return 0x08
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) GetCpuFunctionType() uint8 {
 	return 0x08
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) CpuSubfunction() uint8 {
-	return 0x02
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) GetCpuSubfunction() uint8 {
 	return 0x02
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) DataLength() uint16 {
-	return 0x05
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse) GetDataLength() uint16 {
 	return 0x05
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go
index 925a341..3cd7f78 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.go
@@ -44,26 +44,14 @@ type IS7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) CpuFunctionType() uint8 {
-	return 0x08
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) GetCpuFunctionType() uint8 {
 	return 0x08
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) CpuSubfunction() uint8 {
-	return 0x02
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) GetCpuSubfunction() uint8 {
 	return 0x02
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) DataLength() uint16 {
-	return 0x00
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse) GetDataLength() uint16 {
 	return 0x00
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go
index b00f932..db14977 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.go
@@ -51,26 +51,14 @@ type IS7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) CpuFunctionType() uint8 {
-	return 0x08
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) GetCpuFunctionType() uint8 {
 	return 0x08
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) CpuSubfunction() uint8 {
-	return 0x02
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) GetCpuSubfunction() uint8 {
 	return 0x02
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) DataLength() uint16 {
-	return 0x02
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse) GetDataLength() uint16 {
 	return 0x02
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go
index df2bdf3..83a7467 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlRequest.go
@@ -51,26 +51,14 @@ type IS7PayloadUserDataItemCpuFunctionReadSzlRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) CpuFunctionType() uint8 {
-	return 0x04
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) GetCpuFunctionType() uint8 {
 	return 0x04
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) CpuSubfunction() uint8 {
-	return 0x01
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) GetCpuSubfunction() uint8 {
 	return 0x01
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionReadSzlRequest) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go
index 28046f7..37d980a 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItemCpuFunctionReadSzlResponse.go
@@ -58,26 +58,14 @@ type IS7PayloadUserDataItemCpuFunctionReadSzlResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) CpuFunctionType() uint8 {
-	return 0x08
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) GetCpuFunctionType() uint8 {
 	return 0x08
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) CpuSubfunction() uint8 {
-	return 0x01
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) GetCpuSubfunction() uint8 {
 	return 0x01
 }
 
-func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) DataLength() uint16 {
-	return 0
-}
-
 func (m *S7PayloadUserDataItemCpuFunctionReadSzlResponse) GetDataLength() uint16 {
 	return 0
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go
index de04df7..f5120a7 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go
@@ -51,18 +51,10 @@ type IS7PayloadWriteVarRequest interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadWriteVarRequest) ParameterParameterType() uint8 {
-	return 0x05
-}
-
 func (m *S7PayloadWriteVarRequest) GetParameterParameterType() uint8 {
 	return 0x05
 }
 
-func (m *S7PayloadWriteVarRequest) MessageType() uint8 {
-	return 0x01
-}
-
 func (m *S7PayloadWriteVarRequest) GetMessageType() uint8 {
 	return 0x01
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go
index f509a01..6d99134 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go
@@ -51,18 +51,10 @@ type IS7PayloadWriteVarResponse interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7PayloadWriteVarResponse) ParameterParameterType() uint8 {
-	return 0x05
-}
-
 func (m *S7PayloadWriteVarResponse) GetParameterParameterType() uint8 {
 	return 0x05
 }
 
-func (m *S7PayloadWriteVarResponse) MessageType() uint8 {
-	return 0x03
-}
-
 func (m *S7PayloadWriteVarResponse) GetMessageType() uint8 {
 	return 0x03
 }
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItemAddress.go b/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItemAddress.go
index 0103311..4d409c2 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItemAddress.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7VarRequestParameterItemAddress.go
@@ -48,10 +48,6 @@ type IS7VarRequestParameterItemAddress interface {
 ///////////////////////////////////////////////////////////
 // Accessors for discriminator values.
 ///////////////////////////////////////////////////////////
-func (m *S7VarRequestParameterItemAddress) ItemType() uint8 {
-	return 0x12
-}
-
 func (m *S7VarRequestParameterItemAddress) GetItemType() uint8 {
 	return 0x12
 }