diff --git a/telemetry_tempest_plugin/config.py b/telemetry_tempest_plugin/config.py
index 68e47ce..136356a 100644
--- a/telemetry_tempest_plugin/config.py
+++ b/telemetry_tempest_plugin/config.py
@@ -45,16 +45,13 @@ telemetry_group = cfg.OptGroup(name='telemetry',
 telemetry_services_group = cfg.OptGroup(name='telemetry_services',
                                         title='Telemetry Services')
 
-event_group = cfg.OptGroup(name='event',
-                           title='Event Service Options')
-
 alarming_group = cfg.OptGroup(name='alarming_plugin',
                               title='Alarming Service Options')
 
 metric_group = cfg.OptGroup(name='metric',
                             title='Metric Service Options')
 
-TelemetryGroup = [
+telemetry_opts = [
     cfg.IntOpt('notification_wait',
                default=120,
                help="The seconds to wait for notifications which "
@@ -118,18 +115,7 @@ telemetry_services_opts = [
                help="Database used by the aodh service"),
 ]
 
-event_opts = [
-    cfg.StrOpt('catalog_type',
-               default='event',
-               help="Catalog type of the Event service."),
-    cfg.StrOpt('endpoint_type',
-               default='publicURL',
-               choices=['public', 'admin', 'internal',
-                        'publicURL', 'adminURL', 'internalURL'],
-               help="The endpoint type to use for the event service."),
-]
-
-AlarmingGroup = [
+alarming_opts = [
     cfg.StrOpt('catalog_type',
                default='alarming',
                help="Catalog type of the Alarming service."),
diff --git a/telemetry_tempest_plugin/plugin.py b/telemetry_tempest_plugin/plugin.py
index 51c40f9..1ac2a20 100644
--- a/telemetry_tempest_plugin/plugin.py
+++ b/telemetry_tempest_plugin/plugin.py
@@ -36,30 +36,25 @@ class TelemetryTempestPlugin(plugins.TempestPlugin):
             tempest_config.service_option)
         config.register_opt_group(
             conf, tempest_config.telemetry_group,
-            tempest_config.TelemetryGroup)
+            tempest_config.telemetry_opts)
         config.register_opt_group(
             conf, tempest_config.telemetry_services_group,
             tempest_config.telemetry_services_opts)
-        config.register_opt_group(
-            conf, tempest_config.event_group,
-            tempest_config.event_opts)
         config.register_opt_group(
             conf, tempest_config.alarming_group,
-            tempest_config.AlarmingGroup)
+            tempest_config.alarming_opts)
         config.register_opt_group(
             conf, tempest_config.metric_group,
             tempest_config.metric_opts)
 
     def get_opt_lists(self):
         return [(tempest_config.telemetry_group.name,
-                 tempest_config.TelemetryGroup),
+                 tempest_config.telemetry_opts),
                 (tempest_config.telemetry_services_group.name,
                  tempest_config.telemetry_services_opts),
-                (tempest_config.event_group.name,
-                 tempest_config.event_opts),
                 (config.service_available_group.name,
                  tempest_config.service_option),
                 (tempest_config.alarming_group.name,
-                 tempest_config.AlarmingGroup),
+                 tempest_config.alarming_opts),
                 (tempest_config.metric_group.name,
                  tempest_config.metric_opts)]