diff --git a/agent_based/ospfv3_area.py b/agent_based/ospfv3_area.py
index fc87fa8e505ee2de5c410591f3111fc381747c93..2117ba01aeb2ddd741105143a01bd1190d536357 100644
--- a/agent_based/ospfv3_area.py
+++ b/agent_based/ospfv3_area.py
@@ -186,7 +186,6 @@ register.snmp_section(
             '14',  # ospfv3AreaNssaTranslatorEvents
             '15',  # ospfv3AreaStubMetricType
             '16',  # ospfv3AreaTEEnabled
-            # '9',  # ospfv3AreaRowStatus
         ]
     ),
     detect=exists('.1.3.6.1.2.1.191.1.2.1.2.*')  # OSPFV3-MIB::ospfv3AreaImportAsExtern
diff --git a/agent_based/ospfv3_general.py b/agent_based/ospfv3_general.py
index 7549ff837e61c34ff9f8ce6ceda51a0a265c2750..7e790d807d824475ce53e0ef9c66f3bc5ad9a68a 100644
--- a/agent_based/ospfv3_general.py
+++ b/agent_based/ospfv3_general.py
@@ -160,17 +160,6 @@ register.snmp_section(
             '14',  # ospfv3ReferenceBandwidth
             '22',  # ospfv3StubRouterSupport
             '23',  # ospfv3StubRouterAdvertisement
-            # '12',  # ospfv3ExitOverflowInterval
-            # '13',  # ospfv3DemandExtensions
-            # '15',  # ospfv3RestartSupport
-            # '16',  # ospfv3RestartInterval
-            # '17',  # ospfv3RestartStrictLsaChecking
-            # '18',  # ospfv3RestartStatus
-            # '19',  # ospfv3RestartAge
-            # '20',  # ospfv3RestartExitReason
-            # '21',  # ospfv3NotificationEnable
-            # '24',  # ospfv3DiscontinuityTime
-            # '25',  # ospfv3RestartTime
         ]
     ),
     detect=exists('.1.3.6.1.2.1.191.1.1.1.*')  # OSPFV3-MIB::ospfv3RouterId
diff --git a/agent_based/ospfv3_interface.py b/agent_based/ospfv3_interface.py
index 479e31885e4c241b8d3c33257aafc26257d16e65..79b5d3801d09ea0aa1f7d0c045b1cdaeda3d0102 100644
--- a/agent_based/ospfv3_interface.py
+++ b/agent_based/ospfv3_interface.py
@@ -232,15 +232,6 @@ register.snmp_section(
                 '18',  # ospfv3IfMetricValue
                 '19',  # ospfv3IfLinkScopeLsaCount
                 '20',  # ospfv3IfLinkLsaCksumSum
-                # '7',  # ospfv3IfTransitDelay
-                # '8',  # ospfv3IfRetransInterval
-                # '16',  # ospfv3IfRowStatus
-                # '17',  # ospfv3IfDemand
-                # '21',  # ospfv3IfDemandNbrProbe
-                # '22',  # ospfv3IfDemandNbrProbeRetransLimit
-                # '23',  # ospfv3IfDemandNbrProbeInterval
-                # '24',  # ospfv3IfTEDisabled
-                # '25',  # ospfv3IfLinkLSASuppression
             ]
         ),
         SNMPTree(
diff --git a/agent_based/ospfv3_neighbor.py b/agent_based/ospfv3_neighbor.py
index 60e96f58ad74c178055c16d664a6dd7e0652ca13..2f7c9b786e79ec468aa04de2e3f7626a3379a3ae 100644
--- a/agent_based/ospfv3_neighbor.py
+++ b/agent_based/ospfv3_neighbor.py
@@ -90,7 +90,6 @@ from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
 )
 
 from cmk.base.plugins.agent_based.utils.ospfv3 import (
-    ospf_nbr_addresstype,
     ospf_nbr_hellosuppressed,
     ospf_nbr_helperstatus,
     ospf_nbr_helperexitreason,
@@ -103,9 +102,6 @@ from cmk.base.plugins.agent_based.utils.ospfv3 import (
 
 @dataclass
 class OspfV3Neighbor:
-    # nbrLocalInterface: str,
-    # nbrAddressType: str
-    # nbrAddress: str
     nbrRtrId: str
     nbrOptions: str
     nbrPriority: int
@@ -137,9 +133,6 @@ def parse_ospfv3_neighbor(string_table: List[StringTable]) -> Dict[str, OspfV3Ne
                     nbrLocalInterface = get_short_if_name(ifName)
 
             neighbors[f'{nbrAddress} on {nbrLocalInterface}'] = OspfV3Neighbor(
-                # nbrLocalInterface=nbrLocalInterface,
-                # nbrAddressType=ospf_nbr_addresstype(nbrAddressType),
-                # nbrAddress=nbrAddress,
                 nbrRtrId=render_ipv4_neighbor_id(nbrRtrId),
                 nbrOptions=nbrOptions,
                 nbrPriority=int(nbrPriority),
diff --git a/agent_based/ospfv3_virtuallink.py b/agent_based/ospfv3_virtuallink.py
index 31eeb5d269e28e8f33d387f07fed1d529a25be9f..ae87d874cd185b60344e550faa8f4afb907abb47 100644
--- a/agent_based/ospfv3_virtuallink.py
+++ b/agent_based/ospfv3_virtuallink.py
@@ -88,7 +88,6 @@ from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
 )
 
 from cmk.base.plugins.agent_based.utils.ospfv3 import (
-    ospf_nbr_addresstype,
     ospf_nbr_hellosuppressed,
     ospf_nbr_helperstatus,
     ospf_nbr_helperexitreason,
diff --git a/ospfv3.mkp b/ospfv3.mkp
index 8f580d202a5d258d94c98f2f806e5035e205583e..feec749c93e67af08cd9b58416d1dc7642effca2 100644
Binary files a/ospfv3.mkp and b/ospfv3.mkp differ
diff --git a/web/plugins/metrics/ospfv3.py b/web/plugins/metrics/ospfv3.py
index 0cb2beb915d14725f8b9a436a6745fbfd458f388..20a91836b69b5d4d730d10d998f18fffe649fb86 100644
--- a/web/plugins/metrics/ospfv3.py
+++ b/web/plugins/metrics/ospfv3.py
@@ -7,7 +7,7 @@
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2019-11-02
 #
-# OSPFv3 metrics plugin
+# OSPFv3 plugin metrics
 #
 from cmk.gui.i18n import _
 
diff --git a/web/plugins/wato/ospfv3.py b/web/plugins/wato/ospfv3.py
index b6a632e9dbbbd036c157ad8ded1a4e164d35ae2a..a5ccd68c515951bc22a9af7aea4f8fe5131913e5 100644
--- a/web/plugins/wato/ospfv3.py
+++ b/web/plugins/wato/ospfv3.py
@@ -7,7 +7,7 @@
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2021-09-28
 #
-# wato plugin for ospfv3_neighbor check
+# wato plugin for ospfv3 check
 #
 #
 from cmk.gui.i18n import _
@@ -300,7 +300,7 @@ rulespec_registry.register(
     CheckParameterRulespecWithItem(
         check_group_name='ospfv3_neighbor',
         group=RulespecGroupCheckParametersNetworking,
-        item_spec=lambda: TextAscii(title=_('OSPFv3 Neighbor'), ),
+        item_spec=lambda: TextAscii(title=_('OSPFv3 neighbor'), ),
         match_type='dict',
         parameter_valuespec=_parameter_valuespec_ospfv3_neighbor,
         title=lambda: _('OSPFv3 neighbor'),