diff --git a/docs/architecture/c4.container.png b/docs/architecture/c4.container.png
index 7d93d44..3900508 100644
Binary files a/docs/architecture/c4.container.png and b/docs/architecture/c4.container.png differ
diff --git a/wis2-gdc-management/requirements.txt b/wis2-gdc-management/requirements.txt
index 80e1bd5..db5caee 100644
--- a/wis2-gdc-management/requirements.txt
+++ b/wis2-gdc-management/requirements.txt
@@ -1,5 +1,4 @@
 click
-prometheus-client
 pywcmp
 pywis-pubsub
 requests
diff --git a/wis2-gdc-management/wis2_gdc/__init__.py b/wis2-gdc-management/wis2_gdc/__init__.py
index 401cf7d..2c08ae0 100644
--- a/wis2-gdc-management/wis2_gdc/__init__.py
+++ b/wis2-gdc-management/wis2_gdc/__init__.py
@@ -22,7 +22,6 @@
 import click
 
 from wis2_gdc.registrar import register, setup, teardown
-from wis2_gdc.monitor import monitor
 from wis2_gdc.archive import archive
 from wis2_gdc.sync import sync
 
@@ -41,5 +40,4 @@ def cli():
 cli.add_command(teardown)
 cli.add_command(register)
 cli.add_command(sync)
-cli.add_command(monitor)
 cli.add_command(archive)
diff --git a/wis2-gdc-management/wis2_gdc/monitor/__init__.py b/wis2-gdc-management/wis2_gdc/monitor/__init__.py
deleted file mode 100644
index 8e65cfa..0000000
--- a/wis2-gdc-management/wis2_gdc/monitor/__init__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-###############################################################################
-
-import click
-
-
-@click.group()
-def monitor():
-    """Monitoring utilities"""
-
-    pass