diff --git a/apps/google-phylo/Chart.yaml b/apps/google-phylo/Chart.yaml
deleted file mode 100644
index 59c59f3..0000000
--- a/apps/google-phylo/Chart.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
----
-apiVersion: v1
-description: Google Video Analytics Application for Aether
-name: google-phylo
-
-version: 0.2.1
diff --git a/apps/google-phylo/templates/_helpers.tpl b/apps/google-phylo/templates/_helpers.tpl
deleted file mode 100644
index 9049cf5..0000000
--- a/apps/google-phylo/templates/_helpers.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-{{- /*
-
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-{{/*
-Renders a set of standardised labels
-*/}}
-{{- define "phylo.metadata_labels" -}}
-{{- $application := index . 0 -}}
-{{- $context := index . 1 -}}
-release: {{ $context.Release.Name }}
-app: {{ $application }}
-{{- end -}}
-
-{{/*
-Render the given template.
-*/}}
-{{- define "phylo.template" -}}
-{{- $name := index . 0 -}}
-{{- $context := index . 1 -}}
-{{- $last := base $context.Template.Name }}
-{{- $wtf := $context.Template.Name | replace $last $name -}}
-{{ include $wtf $context }}
-{{- end -}}
-
-{{/*
-Render ServiceAccount, Role, and RoleBinding required for kubernetes-entrypoint.
-*/}}
-{{- define "phylo.service_account" -}}
-{{- $context := index . 1 -}}
-{{- $saName := index . 0 -}}
-{{- $saNamespace := $context.Release.Namespace }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ $saName }}
-  namespace: {{ $saNamespace }}
-  labels:
-{{ tuple $saName $context | include "phylo.metadata_labels" | indent 4 }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ $saName }}
-  namespace: {{ $saNamespace }}
-  labels:
-{{ tuple $saName $context | include "phylo.metadata_labels" | indent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ $saName }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ $saName }}
-    namespace: {{ $saNamespace }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ $saName }}
-  namespace: {{ $saNamespace }}
-  labels:
-{{ tuple $saName $context | include "phylo.metadata_labels" | indent 4 }}
-rules:
-  - apiGroups:
-      - ""
-      - extensions
-      - batch
-      - apps
-    verbs:
-      - get
-      - list
-    resources:
-      - statefulsets
-      - daemonsets
-      - jobs
-      - pods
-      - services
-      - endpoints
-      - configmaps
-{{- end -}}
diff --git a/apps/google-phylo/templates/bin/_run-video-analytics-server.sh.tpl b/apps/google-phylo/templates/bin/_run-video-analytics-server.sh.tpl
deleted file mode 100644
index 44d4a64..0000000
--- a/apps/google-phylo/templates/bin/_run-video-analytics-server.sh.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-/google/video_analytics_server_main \
-        --mediapipe_graph_path=/google/demo_graph.pbtxt \
-        --person_detection_tf_saved_model_dir=/google/saved_model/ \
-        --camera_scene_geometry_path=/google/camera_scene_geometry.pbtxt \
-        --grpc_port=50051 \
-        --mq_address=localhost:5672 \
-        --mediapipe_detection_topic_name=phylo.mediapipe_detection \
-        --person_detection_topic_name=phylo.person_detection \
-        --bbox_decoded_video_frame_topic_name=phylo.bbox_decoded_video_frame \
-        --publish_to_mq=true \
-        --publish_to_log=true
diff --git a/apps/google-phylo/templates/configmap-phylo.yaml b/apps/google-phylo/templates/configmap-phylo.yaml
deleted file mode 100644
index b34c7ad..0000000
--- a/apps/google-phylo/templates/configmap-phylo.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-{{- /*
-
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: phylo
-  labels:
-{{ tuple "phylo" . | include "phylo.metadata_labels" | indent 4 }}
-data:
-  run-video-analytics-server.sh: |
-{{ tuple "bin/_run-video-analytics-server.sh.tpl" . | include "phylo.template" | indent 4 }}
diff --git a/apps/google-phylo/templates/deployment-phylo.yaml b/apps/google-phylo/templates/deployment-phylo.yaml
deleted file mode 100644
index 0158711..0000000
--- a/apps/google-phylo/templates/deployment-phylo.yaml
+++ /dev/null
@@ -1,145 +0,0 @@
-{{- /*
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/ -}}
-
-{{ tuple "phylo" . | include "phylo.service_account" }}
-
-{{ $context := . }}
-{{ range .Values.config.phylo.sources }}
-{{- $name := printf "%s-%s" "phylo" .key -}}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ $name }}
-  labels:
-{{ tuple $name $context | include "phylo.metadata_labels" | indent 4 }}
-spec:
-  selector:
-    matchLabels:
-{{ tuple $name $context | include "phylo.metadata_labels" | indent 6 }}
-  template:
-    metadata:
-      labels:
-{{ tuple $name $context | include "phylo.metadata_labels" | indent 8 }}
-    {{- if $context.Values.config.userPlane.enabled }}
-      annotations:
-        danm.k8s.io/interfaces: |
-          [
-            {"clusterNetwork": "default"},
-            {"clusterNetwork": {{ $context.Values.config.userPlane.name | quote }}, "ip": "dynamic"}
-          ]
-    {{- end }}
-    spec:
-    {{- if $context.Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ $context.Values.nodeSelectors.phylo.label }}: {{ $context.Values.nodeSelectors.phylo.value }}
-    {{- end }}
-    {{- if $context.Values.images.credentials }}
-      imagePullSecrets:
-        - name: {{ $context.Release.Name }}.registry
-    {{- end }}
-      serviceAccountName: phylo
-      initContainers:
-      - name: phylo-dep-check
-        image: {{ $context.Values.images.tags.depCheck | quote }}
-        imagePullPolicy: {{ $context.Values.images.pullPolicy }}
-        securityContext:
-          allowPrivilegeEscalation: false
-          readOnlyRootFilesystem: false
-          runAsUser: 0
-        env:
-          - name: POD_NAME
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.name
-          - name: NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
-          - name: PATH
-            value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/
-          - name: COMMAND
-            value: "echo done"
-          - name: DEPENDENCY_POD_JSON
-            value: '[{"labels": {"app": "wowza"}, "requireSameNode": false}]'
-          # add dependency job for make_certs.sh
-        command:
-          - kubernetes-entrypoint
-        volumeMounts:
-          []
-      containers:
-      - name: rabbitmq
-        image: {{ $context.Values.images.tags.phyloRabbitmq }}
-        imagePullPolicy: {{ $context.Values.images.pullPolicy }}
-      {{- if $context.Values.resources.enabled }}
-        resources:
-{{ toYaml $context.Values.resources.phyloRabbitmq | indent 10 }}
-      {{- end }}
-      - name: video-analytics-server
-        image: {{ $context.Values.images.tags.videoAnalyticsServer | quote }}
-        imagePullPolicy: {{ $context.Values.images.pullPolicy }}
-        env:
-        - name: GLOG_logtostderr
-          value: "1"
-        command: ["/bin/bash","-xc","sleep 60 && /bin/run-video-analytics-server.sh"]
-        resources:
-      {{- if $context.Values.resources.enabled }}
-{{ toYaml $context.Values.resources.videoAnalyticsServer | indent 10 }}
-      {{- end }}
-        volumeMounts:
-        - name: script
-          mountPath: /bin/run-video-analytics-server.sh
-          readOnly: true
-          subPath: run-video-analytics-server.sh
-      - name: camera-ingestion
-        image: {{ $context.Values.images.tags.cameraIngestion | quote }}
-        imagePullPolicy: {{ $context.Values.images.pullPolicy }}
-        env:
-        - name: GLOG_logtostderr
-          value: "1"
-        - name: SOURCE_URI
-          value: {{ .uri }}
-        command: ["/bin/bash","-xc","sleep 90 && /google/run.sh"]
-      {{- if $context.Values.resources.enabled }}
-        resources:
-{{ toYaml $context.Values.resources.cameraIngestion | indent 10 }}
-      {{- end }}
-      - name: phylo-rabbitmq-pubsub
-        image: {{ $context.Values.images.tags.phyloRabbitmqPubsub }}
-        imagePullPolicy: {{ $context.Values.images.pullPolicy }}
-      {{- if $context.Values.resources.enabled }}
-        resources:
-{{ toYaml $context.Values.resources.phyloRabbitmqPubsub | indent 10 }}
-      {{- end }}
-        env:
-        - name: SOURCE_URI
-          value: {{ .uri }}
-        - name: RMQ_HOST_NAME
-          value: "0.0.0.0"
-        command: ["/bin/bash","-xc","sleep 120 && /google/run.sh"]
-      - name: phylo-rtsp-server
-        image: {{ $context.Values.images.tags.rtspServer }}
-        imagePullPolicy: {{ $context.Values.images.pullPolicy }}
-      {{- if $context.Values.resources.enabled }}
-        resources:
-{{ toYaml $context.Values.resources.rtspServer | indent 10 }}
-      {{- end }}
-        command: ["/bin/bash","-xc","sleep 150 && \
-            /google/rmq_rtsp_server_main \
-            --rmq_broker_address=localhost:5672 \
-            --rmq_exchange_name=phylo.bbox_decoded_video_frame \
-            --resize_width=640 \
-            --resize_height=480 \
-            --rtsp_port=8554 \
-            --rtsp_url_suffix=/live"]
-      volumes:
-      - name: script
-        configMap:
-          defaultMode: 0700
-          name: phylo
-{{ end }}
diff --git a/apps/google-phylo/templates/deployment-wowza-server.yaml b/apps/google-phylo/templates/deployment-wowza-server.yaml
deleted file mode 100644
index 0ba1bd5..0000000
--- a/apps/google-phylo/templates/deployment-wowza-server.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-{{- /*
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/ -}}
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: wowza
-  labels:
-{{ tuple "wowza" . | include "phylo.metadata_labels" | indent 4 }}
-spec:
-  replicas: {{ .Values.config.wowza.replica }}
-  selector:
-    matchLabels:
-{{ tuple "wowza" . | include "phylo.metadata_labels" | indent 6 }}
-  template:
-    metadata:
-      labels:
-{{ tuple "wowza" . | include "phylo.metadata_labels" | indent 8 }}
-    {{- if .Values.config.userPlane.enabled }}
-      annotations:
-        danm.k8s.io/interfaces: |
-          [
-            {"clusterNetwork": "default"},
-            {"clusterNetwork": {{ .Values.config.userPlane.name | quote }}, "ip": "dynamic"}
-          ]
-    {{- end }}
-    spec:
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.wowza.label }}: {{ .Values.nodeSelectors.wowza.value }}
-    {{- end }}
-    {{- if .Values.images.credentials }}
-      imagePullSecrets:
-        - name: {{ .Release.Name }}.registry
-    {{- end }}
-      containers:
-      - name: wowza
-        image: {{ .Values.images.tags.wowza }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-      {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.wowza | indent 10 }}
-      {{- end }}
-        volumeMounts:
-        - mountPath: /usr/local/WowzaStreamingEngine/data
-          name: wowza
-      volumes:
-        - name: wowza
-          emptyDir: {}
diff --git a/apps/google-phylo/templates/secret-registry.yaml b/apps/google-phylo/templates/secret-registry.yaml
deleted file mode 100644
index 1502049..0000000
--- a/apps/google-phylo/templates/secret-registry.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- if .Values.images.credentials }}
----
-kind: Secret
-apiVersion: v1
-metadata:
-  name: {{ .Release.Name }}.registry
-  labels:
-    release: {{ .Release.Name }}
-type: kubernetes.io/dockerconfigjson
-data:
-  .dockerconfigjson: {{ printf `{"auths":{%s:{"auth":"%s"}}}` (.Values.images.credentials.registry | quote) (printf "%s:%s" .Values.images.credentials.username .Values.images.credentials.password | b64enc) | b64enc | quote }}
-{{- end }}
diff --git a/apps/google-phylo/templates/service-phylo-rabbitmq.yaml b/apps/google-phylo/templates/service-phylo-rabbitmq.yaml
deleted file mode 100644
index d788b74..0000000
--- a/apps/google-phylo/templates/service-phylo-rabbitmq.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-{{/*
-# Copyright 2019-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- $context := . -}}
-{{ range .Values.config.phylo.sources }}
-{{- $name := printf "%s-%s" "phylo" .key -}}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: rabbitmq-{{ .key }}
-  labels:
-{{ tuple $name $context | include "phylo.metadata_labels" | indent 4 }}
-spec:
-  selector:
-{{ tuple $name $context | include "phylo.metadata_labels" | indent 4 }}
-  ports:
-    - port: 15672
-      targetPort: 15672
-      protocol: TCP
-      name: tcp-15672
-    - port: 5672
-      targetPort: 5672
-      protocol: TCP
-      name: tcp-5672
-  type: NodePort
-{{ end }}
diff --git a/apps/google-phylo/templates/service-phylo-rtsp-server.yaml b/apps/google-phylo/templates/service-phylo-rtsp-server.yaml
deleted file mode 100644
index 22a0a81..0000000
--- a/apps/google-phylo/templates/service-phylo-rtsp-server.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-{{/*
-# Copyright 2019-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- $context := . -}}
-{{ range .Values.config.phylo.sources }}
-{{- $name := printf "%s-%s" "phylo" .key -}}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: rtsp-server-{{ .key }}
-  labels:
-{{ tuple $name $context | include "phylo.metadata_labels" | indent 4 }}
-{{- if $context.Values.config.userPlane.enabled }}
-  annotations:
-    danm.k8s.io/clusterNetwork: {{ $context.Values.config.userPlane.name }}
-    danm.k8s.io/selector: '{"app": {{ $name | quote }}}'
-{{- end }}
-spec:
-{{- if $context.Values.config.userPlane.enabled }}
-  clusterIP: None
-{{- else }}
-  selector:
-{{ tuple $name $context | include "phylo.metadata_labels" | indent 4 }}
-  type: NodePort
-  ports:
-    - port: 8554
-      targetPort: 8554
-      protocol: TCP
-      name: tcp-8554
-{{- end }}
-{{ end }}
diff --git a/apps/google-phylo/templates/service-wowza.yaml b/apps/google-phylo/templates/service-wowza.yaml
deleted file mode 100644
index 09993bd..0000000
--- a/apps/google-phylo/templates/service-wowza.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-{{- /*
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/ -}}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: wowza
-  labels:
-{{ tuple "wowza" . | include "phylo.metadata_labels" | indent 4 }}
-{{- if .Values.config.userPlane.enabled }}
-  annotations:
-    danm.k8s.io/clusterNetwork: {{ .Values.config.userPlane.name }}
-    danm.k8s.io/selector: '{"app": "wowza"}'
-{{- end }}
-spec:
-{{- if .Values.config.userPlane.enabled }}
-  clusterIP: None
-{{- else }}
-  selector:
-{{ tuple "wowza" . | include "phylo.metadata_labels" | indent 4 }}
-  type: NodePort
-  ports:
-    - name: management
-      port: 8088
-      protocol: TCP
-      nodePort: 30088
-    - name: rtmp
-      port: 1935 # RTMP/RTMPT/RTMPE/RTSP(interleaved)
-      targetPort: 1935
-      protocol: TCP
-      nodePort: 31935
-{{- end }}
diff --git a/apps/google-phylo/values.yaml b/apps/google-phylo/values.yaml
deleted file mode 100644
index f05db5b..0000000
--- a/apps/google-phylo/values.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-images:
-  tags:
-    cameraIngestion: registry.aetherproject.org/google/phylo-camera-ingestion-client:latest
-    videoAnalyticsServer: registry.aetherproject.org/google/phylo-video-analytics-server:latest
-    phyloRabbitmq: registry.aetherproject.org/google/phylo-rabbitmq:latest
-    phyloRabbitmqPubsub: registry.aetherproject.org/google/phylo-rmq-pubsub:latest
-    rtspServer: registry.aetherproject.org/google/phylo_rmq-rtsp-server:0.2.0
-    wowza: registry.aetherproject.org/google/wowza:latest
-    depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-  pullPolicy: "Always"
-  credentials: {}
-  # If specified, use this credential to access the image
-  #  registry: registry.aetherproject.org
-  #  username:
-  #  password:
-
-nodeSelectors:
-  enabled: false
-  phylo:
-    label: google-phylo
-    value: enabled
-  wowza:
-    label: google-phylo
-    value: enabled
-
-resources:
-  enabled: false
-  rtspServer:
-    requests:
-      cpu: 2
-      memory: 2048Mi
-    limits:
-      cpu: 2
-      memory: 2048Mi
-  phyloRabbitmq:
-    requests:
-      cpu: 2
-      memory: 2048Mi
-    limits:
-      cpu: 2
-      memory: 2048Mi
-  phyloRabbitmqPubsub:
-    requests:
-      cpu: 2
-      memory: 2048Mi
-    limits:
-      cpu: 2
-      memory: 2048Mi
-  videoAnalyticsServer:
-    requests:
-      cpu: 5
-      memory: 2048Mi
-    limits:
-      cpu: 5
-      memory: 2048Mi
-  cameraIngestion:
-    requests:
-      cpu: 2
-      memory: 2048Mi
-    limits:
-      cpu: 2
-      memory: 2048Mi
-  wowza:
-    requests:
-      cpu: 2
-      memory: 2048Mi
-    limits:
-      cpu: 2
-      memory: 2048Mi
-
-config:
-  phylo:
-    sources:
-      - key: mystream
-        uri: rtmp://wowza:1935/live/myStream
-  wowza:
-    # wowza login: mwc / stream
-    replica: 1
-  userPlane:
-    # Set true if a separate user plane network is applicable
-    enabled: true
-    name: core
diff --git a/apps/infosys-deepstream/Chart.yaml b/apps/infosys-deepstream/Chart.yaml
deleted file mode 100644
index 04299b8..0000000
--- a/apps/infosys-deepstream/Chart.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
----
-apiVersion: v1
-description: Infosys deepstream application for Aether
-name: infosys-deepstream
-
-version: 0.1.0
diff --git a/apps/infosys-deepstream/files/infer_config.txt b/apps/infosys-deepstream/files/infer_config.txt
deleted file mode 100755
index d3b9602..0000000
--- a/apps/infosys-deepstream/files/infer_config.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-[property]
-gpu-id=0
-net-scale-factor=0.0039215697906911373
-model-engine-file=/models/Primary_Detector/resnet10.caffemodel_b1_fp16.engine
-labelfile-path=/models/Primary_Detector/labels.txt
-
-batch-size=1
-process-mode=1
-model-color-format=0
-network-mode=2
-num-detected-classes=4
-interval=2
-gie-unique-id=1
-
-[class-attrs-all]
-threshold=0.2
-group-threshold=1
-eps=0.2
-roi-top-offset=0
-roi-bottom-offset=0
-detected-min-w=0
-detected-min-h=0
-detected-max-w=0
-detected-max-h=0
-
-# Per class configuration
-#Car
-[class-attrs-0]
-threshold=1.0
-group-threshold=1
-eps=0.2
-roi-top-offset=0
-roi-bottom-offset=0
-detected-min-w=0
-detected-min-h=0
-detected-max-w=0
-detected-max-h=0
-
-#Bicycle
-[class-attrs-1]
-threshold=1.0
-group-threshold=1
-eps=0.2
-roi-top-offset=0
-roi-bottom-offset=0
-detected-min-w=0
-detected-min-h=0
-detected-max-w=0
-detected-max-h=0
-
-# Roadsign
-[class-attrs-3]
-threshold=1.0
-group-threshold=1
-eps=0.2
-roi-top-offset=0
-roi-bottom-offset=0
-detected-min-w=0
-detected-min-h=0
-detected-max-w=0
-detected-max-h=0
diff --git a/apps/infosys-deepstream/files/infer_config.txt.license b/apps/infosys-deepstream/files/infer_config.txt.license
deleted file mode 100644
index 889687c..0000000
--- a/apps/infosys-deepstream/files/infer_config.txt.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
diff --git a/apps/infosys-deepstream/files/msg_config.txt b/apps/infosys-deepstream/files/msg_config.txt
deleted file mode 100755
index 8c9bcb6..0000000
--- a/apps/infosys-deepstream/files/msg_config.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-## Group 0
-
-[sensor0]
-enable=1
-type=Camera
-id=CSI
-location=45.293701447;-75.8303914499;48.1557479338
-description=CSI Camera
-coordinate=5.2;10.1;11.2
-
-[place0]
-enable=1
-id=0
-type=intersection/road
-name=HWY_20_AND_LOCUST__EBA
-location=30.32;-40.55;100.0
-coordinate=1.0;2.0;3.0
-place-sub-field1=C_127_158
-place-sub-field2=Lane 1
-place-sub-field3=P1
-
-## Group 1
-
-[sensor1]
-enable=1
-type=Camera
-id=RTSP_1
-location=45.293701447;-75.8303914499;48.1557479338
-description=RTSP feed from Mobile Camera
-coordinate=5.2;10.1;11.2
-
-[place1]
-enable=1
-id=0
-type=intersection/road
-name=INT2_HWY_20_AND_LOCUST__EBA
-location=30.32;-40.55;100.0
-coordinate=1.0;2.0;3.0
-place-sub-field1=C_127_158
-place-sub-field2=Lane 1
-place-sub-field3=P1
-
-## Group 2
-
-[sensor2]
-enable=1
-type=Camera
-id=1
-location=45.293701447;-75.8303914499;48.1557479338
-description=Mobile Camera
-coordinate=5.2;10.1;11.2
-
-[place2]
-enable=1
-id=0
-type=intersection/road
-name=INT2_HWY_20_AND_LOCUST__EBA
-location=30.32;-40.55;100.0
-coordinate=1.0;2.0;3.0
-place-sub-field1=C_127_158
-place-sub-field2=Lane 1
-place-sub-field3=P1
-
diff --git a/apps/infosys-deepstream/files/msg_config.txt.license b/apps/infosys-deepstream/files/msg_config.txt.license
deleted file mode 100644
index 889687c..0000000
--- a/apps/infosys-deepstream/files/msg_config.txt.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
diff --git a/apps/infosys-deepstream/files/tracker_config.yml b/apps/infosys-deepstream/files/tracker_config.yml
deleted file mode 100755
index fdf231b..0000000
--- a/apps/infosys-deepstream/files/tracker_config.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-%YAML:1.0
-
-NvDCF:
-  maxTargetsPerStream: 50 # Max number of targets to track per stream. Recommended to set >10. Note: this value should account for the targets being tracked in shadow mode as well. Max value depends on the GPU memory capacity
-
-  filterLr: 0.11 # learning rate for DCF filter in exponential moving average. Valid Range: [0.0, 1.0]
-  gaussianSigma: 0.75 # Standard deviation for Gaussian for desired response when creating DCF filter
-
-  minDetectorConfidence: 0.0 # If the confidence of a detector bbox is lower than this, then it won't be considered for tracking
-  minTrackerConfidence: 0.6 # If the confidence of an object tracker is lower than this on the fly, then it will be tracked in shadow mode. Valid Range: [0.0, 1.0]
-
-  featureImgSizeLevel: 1 # Size of a feature image. Valid range: {1, 2, 3, 4, 5}, from the smallest to the largest
-  SearchRegionPaddingScale: 3 # Search region size. Determines how large the search region should be scaled from the target bbox.  Valid range: {1, 2, 3}, from the smallest to the largest
-
-  maxShadowTrackingAge: 9        # Max length of shadow tracking (the shadow tracking age is incremented when (1) there's detector input yet no match or (2) tracker confidence is lower than minTrackerConfidence). Once reached, the tracker will be terminated.
-  probationAge: 0                # Once the tracker age (incremented at every frame) reaches this, the tracker is considered to be valid
-  earlyTerminationAge: 0         # Early termination age (in terms of shadow tracking age) during the probation period
-
-  minVisibiilty4Tracking: 0.5    # If the visibility of the bbox of a tracker gets lower, then it will be terminated
diff --git a/apps/infosys-deepstream/templates/_helpers.tpl b/apps/infosys-deepstream/templates/_helpers.tpl
deleted file mode 100644
index 8e0a0f0..0000000
--- a/apps/infosys-deepstream/templates/_helpers.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{{- /*
-
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-{{/*
-Renders a set of standardised labels
-*/}}
-{{- define "deepstream.metadata_labels" -}}
-{{- $application := index . 0 -}}
-{{- $context := index . 1 -}}
-release: {{ $context.Release.Name }}
-app: {{ $application }}
-{{- end -}}
-
-{{/*
-Render the given template.
-*/}}
-{{- define "deepstream.template" -}}
-{{- $name := index . 0 -}}
-{{- $context := index . 1 -}}
-{{- $last := base $context.Template.Name }}
-{{- $wtf := $context.Template.Name | replace $last $name -}}
-{{ include $wtf $context }}
-{{- end -}}
diff --git a/apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl b/apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
deleted file mode 100755
index b2be9e8..0000000
--- a/apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved.
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-# SPDX-License-Identifier: MIT
-
-[message-broker]
-password = {{ .Values.config.deepstream.amqp.password }}
-hostname = {{ .Values.config.deepstream.amqp.host }}
-username = {{ .Values.config.deepstream.amqp.username }}
-port = {{ .Values.config.deepstream.amqp.port }}
-exchange = amq.topic
-topic = jetson
diff --git a/apps/infosys-deepstream/templates/config/_main_config.txt.tpl b/apps/infosys-deepstream/templates/config/_main_config.txt.tpl
deleted file mode 100755
index 3a2a1de..0000000
--- a/apps/infosys-deepstream/templates/config/_main_config.txt.tpl
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved.
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-# SPDX-License-Identifier: MIT
-
-[application]
-enable-perf-measurement=1
-perf-measurement-interval-sec=5
-
-[tiled-display]
-enable={{ .Values.config.deepstream.display.enabled }}
-rows=1
-columns=1
-width=900
-height=500
-gpu-id=0
-nvbuf-memory-type=4
-
-[source0]
-enable=1
-#Type - 1=CameraV4L2 2=URI 3=MultiURI 4=RTSP, 5=CSI
-type=2
-uri={{ .Values.config.deepstream.source }}
-num-sources=1
-#drop-frame-interval=5
-gpu-id=0
-cudadec-memtype=0
-
-[source1]
-enable=0
-#Type - 1=CameraV4L2 2=URI 3=MultiURI 4=RTSP, 5=CSI
-type=2
-uri=file:/root/deepstream_sdk_v4.0.2_jetson/samples/streams/sample_1080p_h265.mp4
-num-sources=1
-gpu-id=0
-cudadec-memtype=0
-
-[sink0]
-enable=1
-#Type - 1=FakeSink 2=EglSink 3=File 4=RTSPStreaming 5=Overlay
-type=5
-sync=0
-display-id=0
-offset-x=100
-offset-y=0
-width=900
-height=500
-overlay-id=1
-source-id=0
-
-[sink1]
-enable=1
-#Type - 1=FakeSink 2=EglSink 3=File 4=UDPSink 5=nvoverlaysink 6=MsgConvBroker
-type=6
-msg-conv-config=/configs/msg_config.txt
-msg-conv-payload-type=1
-msg-broker-proto-lib=/opt/nvidia/deepstream/deepstream-4.0/lib/libnvds_amqp_proto.so
-msg-broker-config=/configs/amqp_config.txt
-
-[osd]
-enable=1
-border-width=1
-text-size=0
-text-color=1;1;1;1;
-text-bg-color=0.3;0.3;0.3;0
-font=Serif
-show-clock=1
-clock-x-offset=10
-clock-y-offset=10
-clock-text-size=12
-clock-color=0;0;0;.8
-
-[streammux]
-live-source=1
-batch-size=1
-batched-push-timeout=40000
-width=1280
-height=720
-
-[primary-gie]
-enable=1
-batch-size=1
-bbox-border-color0=1;0;0;1
-bbox-border-color1=0;1;1;1
-bbox-border-color2=0;0;1;1
-bbox-border-color3=0;1;0;1
-interval=0
-gie-unique-id=1
-config-file=/configs/infer_config.txt
-
-[tracker]
-enable=1
-tracker-width=480
-tracker-height=272
-ll-lib-file=/opt/nvidia/deepstream/deepstream-4.0/lib/libnvds_nvdcf.so
-ll-config-file=/configs/tracker_config.yml
-gpu-id=0
-enable-batch-process=1
-
diff --git a/apps/infosys-deepstream/templates/configmap-deepstream.yaml b/apps/infosys-deepstream/templates/configmap-deepstream.yaml
deleted file mode 100644
index 02685bf..0000000
--- a/apps/infosys-deepstream/templates/configmap-deepstream.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-{{- /*
-
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: deepstream
-  labels:
-{{ tuple "deepstream" . | include "deepstream.metadata_labels" | indent 4 }}
-data:
-  main_config.txt: |
-{{ tuple "config/_main_config.txt.tpl" . | include "deepstream.template" | indent 4 }}
-  amqp_config.txt: |
-{{ tuple "config/_amqp_config.txt.tpl" . | include "deepstream.template" | indent 4 }}
-  infer_config.txt: |
-{{ .Files.Get "files/infer_config.txt" | indent 4 }}
-  msg_config.txt: |
-{{ .Files.Get "files/msg_config.txt" | indent 4 }}
-  tracker_config.yml: |
-{{ .Files.Get "files/tracker_config.yml" | indent 4 }}
diff --git a/apps/infosys-deepstream/templates/deployment-deepstream.yaml b/apps/infosys-deepstream/templates/deployment-deepstream.yaml
deleted file mode 100644
index 03acf63..0000000
--- a/apps/infosys-deepstream/templates/deployment-deepstream.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-{{- /*
-
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: deepstream
-  labels:
-{{ tuple "deepstream" . | include "deepstream.metadata_labels" | indent 4 }}
-spec:
-  selector:
-    matchLabels:
-{{ tuple "deepstream" . | include "deepstream.metadata_labels" | indent 6 }}
-  template:
-    metadata:
-      labels:
-{{ tuple "deepstream" . | include "deepstream.metadata_labels" | indent 8 }}
-    spec:
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.deepstream.label }}: {{ .Values.nodeSelectors.deepstream.value }}
-    {{- end }}
-      hostNetwork: true
-      containers:
-      - name: deepstream
-        image: {{ .Values.images.tags.deepstreamTx2 }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-      {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.deepstream | indent 10 }}
-      {{- end }}
-        env:
-        - name: DISPLAY
-          value: {{ .Values.config.deepstream.display.display }}
-        volumeMounts:
-        - name: configs
-          mountPath: /configs
-          readOnly: true
-        - name: x11-unix
-          mountPath: /tmp/.X11-unix
-        - name: argus-socket
-          mountPath: /tmp/argus_socket
-      volumes:
-      - name: configs
-        configMap:
-          defaultMode: 0644
-          name: deepstream
-      - name: x11-unix
-        hostPath:
-          path: /tmp/.X11-unix
-      - name: argus-socket
-        hostPath:
-          path: /tmp/argus_socket
diff --git a/apps/infosys-deepstream/values.yaml b/apps/infosys-deepstream/values.yaml
deleted file mode 100644
index b90121d..0000000
--- a/apps/infosys-deepstream/values.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-images:
-  tags:
-    deepstreamTx2: registry.central.aetherproject.net/infosys/deepstream-tx2:0.1
-  pullPolicy: "IfNotPresent"
-
-nodeSelectors:
-  enabled: true
-  deepstream:
-    label: deepstream
-    value: enabled
-
-resources:
-  enabled: false
-  deepstream:
-    requests:
-      cpu: 2
-      memory: 2048Mi
-    limits:
-      cpu: 2
-      memory: 2048Mi
-
-config:
-  deepstream:
-    source: rtsp://10.251.255.241:5554/test
-    # set display to 1 to enalbe and 0 to disable
-    display:
-      display: ":1"
-      enabled: 1
-    amqp:
-      host: 172.16.0.10
-      port: 5672
-      username: admin
-      password: A3ther
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/Chart.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/Chart.yaml
deleted file mode 100644
index 6d7be77..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/Chart.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-name: accelleran-cbrs-common
-description: A Helm chart to install Accelleran common to run Accelleran CU on CBRS band
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 0.2.3
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/_helpers.tpl b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/_helpers.tpl
deleted file mode 100644
index fe44c87..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/_helpers.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-{{/*
-Render a set of standardised label
-*/}}
-{{- define "accelleran-cbrs-common.metadata_labels" -}}
-{{- $application := index . 0 -}}
-{{- $context := index . 1 -}}
-release: {{ $context.Release.Name }}
-app: {{ $application }}
-{{- end -}}
-
-{{/*
-Render ServiceAccount, Role, and RoleBinding required for kubernetes-entrypoint.
-*/}}
-{{- define "accelleran-cbrs-common.service_account" -}}
-{{- $context := index . 1 -}}
-{{- $saName := index . 0 -}}
-{{- $saNamespace := $context.Release.Namespace }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ $saName }}
-  namespace: {{ $saNamespace }}
-  labels:
-{{ tuple $saName $context | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
----
-{{- if semverCompare ">=1.16-0" $context.Capabilities.KubeVersion.GitVersion }}
-apiVersion: rbac.authorization.k8s.io/v1
-{{- else }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-{{- end }}
-kind: RoleBinding
-metadata:
-  name: {{ $saName }}
-  namespace: {{ $saNamespace }}
-  labels:
-{{ tuple $saName $context | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ $saName }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ $saName }}
-    namespace: {{ $saNamespace }}
----
-{{- if semverCompare ">=1.16-0" $context.Capabilities.KubeVersion.GitVersion }}
-apiVersion: rbac.authorization.k8s.io/v1
-{{- else }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-{{- end }}
-kind: Role
-metadata:
-  name: {{ $saName }}
-  namespace: {{ $saNamespace }}
-  labels:
-{{ tuple $saName $context | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-rules:
-  - apiGroups:
-      - ""
-      - extensions
-      - batch
-      - apps
-    verbs:
-      - get
-      - list
-      - patch
-    resources:
-      - statefulsets
-      - daemonsets
-      - jobs
-      - pods
-      - services
-      - endpoints
-      - configmaps
-{{- end -}}
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/configmap-accelleran-cbrs-ric.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/configmap-accelleran-cbrs-ric.yaml
deleted file mode 100644
index 5079605..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/configmap-accelleran-cbrs-ric.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: accelleran-cbrs-ric-cm
-  labels:
-{{ tuple "accelleran-cbrs-ric-cm" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-data:
-  bootstrap: |
-    redis.hostname:{{ .Values.config.redis.hostName }}
-    redis.port:{{ .Values.config.redis.ports.redisPort.port }}
-    instance.filter:{{ .Values.config.ric.instanceId }}
-
-  zlog.conf: |
-    [global]
-    strict init = true
-    buffer min = {{ .Values.config.ric.zlogConf.bufferMin }}
-    buffer max = {{ .Values.config.ric.zlogConf.bufferMax }}
-    rotate lock file = /tmp/zlog.lock
-
-    [formats]
-    printf_format = "%d(%b %d %H:%M:%S).%ms %8.8H %m%n"
-    [rules]
-    user.* >stdout ;printf_format
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/job-redis-init.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/job-redis-init.yaml
deleted file mode 100644
index ec30179..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/job-redis-init.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-{{/*
-# Copyright 2019-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{/*
-It is the job to flush Redis database
-*/}}
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: job-redis-init
-  labels:
-{{ tuple "accelleran-cbrs-redis" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-spec:
-  template:
-    metadata:
-      labels:
-{{ tuple "accelleran-cbrs-redis" . | include "accelleran-cbrs-common.metadata_labels" | indent 8 }}
-    spec:
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.accelleranCBRSCommon.label }}: {{ .Values.nodeSelectors.accelleranCBRSCommon.value }}
-    {{- end }}
-      serviceAccountName: accelleran-cbrs-redis
-      restartPolicy: OnFailure
-      initContainers:
-      - name: accelleran-cbrs-redis-dep-check
-        image: {{ .Values.images.tags.depCheck | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        securityContext:
-          allowPrivilegeEscalation: false
-          readOnlyRootFilesystem: false
-          runAsUser: 0
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.name
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        - name: PATH
-          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/
-        - name: COMMAND
-          value: "echo done"
-        - name: DEPENDENCY_POD_JSON
-          value: '[{"labels": {"app": "accelleran-cbrs-redis"}, "requireSameNode": false}]'
-      containers:
-      - name: accelleran-cbrs-redis-init
-        image: {{ .Values.images.tags.redisClient }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        command: ["sh", "-c"]
-        args:
-        - redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} flushall;
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} set NATS_SERVICE_URL "nat://{{ .Values.config.nats.ip }}:{{ .Values.config.nats.ports.natsPort.nodePort }}";
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} keys '*';
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/service-accelleran-cbrs-nats.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/service-accelleran-cbrs-nats.yaml
deleted file mode 100644
index 7c27653..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/service-accelleran-cbrs-nats.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: accelleran-cbrs-nats
-  labels:
-{{ tuple "accelleran-cbrs-nats" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-spec:
-  selector:
-{{ tuple "accelleran-cbrs-nats" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-  ports:
-  - name: nats-port
-    port: {{ .Values.config.nats.ports.natsPort.port }}
-    protocol: {{ .Values.config.nats.ports.natsPort.protocol }}
-  - name: cluster-port
-    port: {{ .Values.config.nats.ports.clusterPort.port }}
-    protocol: {{ .Values.config.nats.ports.clusterPort.protocol }}
-  - name: console-port
-    port: {{ .Values.config.nats.ports.consolePort.port }}
-    protocol: {{ .Values.config.nats.ports.consolePort.protocol }}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: accelleran-cbrs-nats-exernal
-  labels:
-{{ tuple "accelleran-cbrs-nats" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-spec:
-  selector:
-{{ tuple "accelleran-cbrs-nats" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-  type: NodePort
-  ports:
-  - name: nats-port
-    port: {{ .Values.config.nats.ports.natsPort.port }}
-    nodePort: {{ .Values.config.nats.ports.natsPort.nodePort }}
-    protocol: {{ .Values.config.nats.ports.natsPort.protocol }}
-  - name: cluster-port
-    port: {{ .Values.config.nats.ports.clusterPort.port }}
-    nodePort: {{ .Values.config.nats.ports.clusterPort.nodePort }}
-    protocol: {{ .Values.config.nats.ports.clusterPort.protocol }}
-  - name: console-port
-    port: {{ .Values.config.nats.ports.consolePort.port }}
-    nodePort: {{ .Values.config.nats.ports.consolePort.nodePort }}
-    protocol: {{ .Values.config.nats.ports.consolePort.protocol }}
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/service-accelleran-cbrs-redis.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/service-accelleran-cbrs-redis.yaml
deleted file mode 100644
index 09d245d..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/service-accelleran-cbrs-redis.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: accelleran-cbrs-redis
-  labels:
-{{ tuple "accelleran-cbrs-redis" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-spec:
-  selector:
-{{ tuple "accelleran-cbrs-redis" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-  ports:
-  - name: redis-port
-    port: {{ .Values.config.redis.ports.redisPort.port }}
-    protocol: {{ .Values.config.redis.ports.redisPort.protocol }}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: accelleran-cbrs-redis-exernal
-  labels:
-{{ tuple "accelleran-cbrs-redis" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-spec:
-  selector:
-{{ tuple "accelleran-cbrs-redis" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-  type: NodePort
-  ports:
-  - name: redis-port
-    port: {{ .Values.config.redis.ports.redisPort.port }}
-    nodePort: {{ .Values.config.redis.ports.redisPort.nodePort }}
-    protocol: {{ .Values.config.redis.ports.redisPort.protocol }}
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/service-accelleran-cbrs-ricweb.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/service-accelleran-cbrs-ricweb.yaml
deleted file mode 100644
index ea5d829..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/service-accelleran-cbrs-ricweb.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: accelleran-cbrs-ricweb
-  labels:
-{{ tuple "accelleran-cbrs-ricweb" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-spec:
-  selector:
-{{ tuple "accelleran-cbrs-ricweb" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-  ports:
-  - name: ric-web-port
-    port: {{ .Values.config.ricWeb.ports.ricWebPort.port }}
-    protocol: {{ .Values.config.ricWeb.ports.ricWebPort.protocol }}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: accelleran-cbrs-ricweb-exernal
-  labels:
-{{ tuple "accelleran-cbrs-ricweb" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-spec:
-  selector:
-{{ tuple "accelleran-cbrs-ricweb" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-  type: NodePort
-  ports:
-  - name: ric-web-port
-    port: {{ .Values.config.ricWeb.ports.ricWebPort.port }}
-    nodePort: {{ .Values.config.ricWeb.ports.ricWebPort.nodePort }}
-    protocol: {{ .Values.config.ricWeb.ports.ricWebPort.protocol }}
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-nats.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-nats.yaml
deleted file mode 100644
index 2da6848..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-nats.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-{{ tuple "accelleran-cbrs-nats" . | include "accelleran-cbrs-common.service_account" }}
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: accelleran-cbrs-nats
-  labels:
-{{ tuple "accelleran-cbrs-nats" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-spec:
-  selector:
-    matchLabels:
-{{ tuple "accelleran-cbrs-nats" . | include "accelleran-cbrs-common.metadata_labels" | indent 6 }}
-  serviceName: accelleran-cbrs-nats
-  template:
-    metadata:
-      labels:
-{{ tuple "accelleran-cbrs-nats" . | include "accelleran-cbrs-common.metadata_labels" | indent 8 }}
-    spec:
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.accelleranCBRSCommon.label }}: {{ .Values.nodeSelectors.accelleranCBRSCommon.value }}
-    {{- end }}
-      serviceAccountName: accelleran-cbrs-nats
-    {{- if hasKey .Values.images "pullSecrets" }}
-      imagePullSecrets:
-{{ toYaml .Values.images.pullSecrets | indent 8 }}
-    {{- end }}
-      containers:
-      - name: nats
-        image: {{ .Values.images.tags.nats }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        command: ["/entrypoint.sh"]
-        args: ["/usr/bin/gnatsd",  "-c",  "/etc/gnatsd.conf" ]
-        {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.accelleranCBRSCommon | indent 10 }}
-        {{- end }}
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-redis.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-redis.yaml
deleted file mode 100644
index 4d3aa3b..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-redis.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-{{ tuple "accelleran-cbrs-redis" . | include "accelleran-cbrs-common.service_account" }}
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: accelleran-cbrs-redis
-  labels:
-{{ tuple "accelleran-cbrs-redis" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-spec:
-  selector:
-    matchLabels:
-{{ tuple "accelleran-cbrs-redis" . | include "accelleran-cbrs-common.metadata_labels" | indent 6 }}
-  serviceName: accelleran-cbrs-redis
-  template:
-    metadata:
-      labels:
-{{ tuple "accelleran-cbrs-redis" . | include "accelleran-cbrs-common.metadata_labels" | indent 8 }}
-    spec:
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.accelleranCBRSCommon.label }}: {{ .Values.nodeSelectors.accelleranCBRSCommon.value }}
-    {{- end }}
-      serviceAccountName: accelleran-cbrs-redis
-    {{- if hasKey .Values.images "pullSecrets" }}
-      imagePullSecrets:
-{{ toYaml .Values.images.pullSecrets | indent 8 }}
-    {{- end }}
-      containers:
-      - name: redis
-        image: {{ .Values.images.tags.redis }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        command: ["sh", "-c"]
-        args:
-        - /usr/local/bin/redis-server /etc/redis.conf
-        {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.accelleranCBRSCommon | indent 10 }}
-        {{- end }}
-        volumeMounts:
-        - mountPath: /data
-          name: redis-data-volume
-      volumes:
-{{- if not .Values.config.redis.persistence.enabled }}
-      - name: redis-data-volume
-        hostPath:
-          path: /etc/redis-storage
-          type: DirectoryOrCreate
-{{- else }}
-  volumeClaimTemplates:
-  - metadata:
-      name: redis-data-volume
-      labels:
-{{ tuple "accelleran-cbrs-redis" . | include "accelleran-cbrs-common.metadata_labels" | indent 8 }}
-    spec:
-      accessModes:
-      - {{ .Values.config.redis.persistence.accessMode | quote }}
-      resources:
-        requests:
-          storage: {{ .Values.config.redis.persistence.size | quote }}
-    {{- if .Values.config.redis.persistence.storageClass }}
-      storageClassName: "{{ .Values.config.redis.persistence.storageClass }}"
-    {{- end }}
-{{- end }}
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ric.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ric.yaml
deleted file mode 100644
index 44dfabd..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ric.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-{{ tuple "accelleran-cbrs-ric" . | include "accelleran-cbrs-common.service_account" }}
-
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: accelleran-cbrs-ric
-  labels:
-{{ tuple "accelleran-cbrs-ric" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-spec:
-  selector:
-    matchLabels:
-{{ tuple "accelleran-cbrs-ric" . | include "accelleran-cbrs-common.metadata_labels" | indent 6 }}
-  serviceName: accelleran-cbrs-ric
-  template:
-    metadata:
-      labels:
-{{ tuple "accelleran-cbrs-ric" . | include "accelleran-cbrs-common.metadata_labels" | indent 8 }}
-    spec:
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.accelleranCBRSCommon.label }}: {{ .Values.nodeSelectors.accelleranCBRSCommon.value }}
-    {{- end }}
-      serviceAccountName: accelleran-cbrs-ric
-    {{- if hasKey .Values.images "pullSecrets" }}
-      imagePullSecrets:
-{{ toYaml .Values.images.pullSecrets | indent 8 }}
-    {{- end }}
-      initContainers:
-      - name: redis-init-dep-check
-        image: {{ .Values.images.tags.depCheck }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        securityContext:
-          allowPrivilegeEscalation: false
-          readOnlyRootFilesystem: false
-          runAsUser: 0
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.name
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        - name: PATH
-          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/
-        - name: COMMAND
-          value: "echo done"
-        - name: DEPENDENCY_JOBS
-          value: job-redis-init
-      containers:
-      - name: ric
-        image: {{ .Values.images.tags.ric }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        securityContext:
-          privileged: true
-          capabilities:
-            add:
-            - NET_ADMIN
-            - IPC_LOCK
-            - SYS_NICE
-        env:
-        - name: ZLOG_CONF_PATH
-          value: /zlog.conf
-        - name: BOOTSTRAP_FILENAME
-          value: /bootstrap
-        - name: LD_LIBRARY_PATH
-          value: /data/
-        - name: FAP_DB_PATH
-          value: /data/
-        command: ["/data/ric"]
-        {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.accelleranCBRSCommon | indent 10 }}
-        {{- end }}
-        volumeMounts:
-        - name: ric-config-volume
-          mountPath: /bootstrap
-          subPath: bootstrap
-        - name: ric-config-volume
-          mountPath: /zlog.conf
-          subPath: zlog.conf
-      volumes:
-      - name: ric-config-volume
-        configMap:
-          name: accelleran-cbrs-ric-cm
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ricweb.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ricweb.yaml
deleted file mode 100644
index 7b3248b..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ricweb.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-{{ tuple "accelleran-cbrs-ricweb" . | include "accelleran-cbrs-common.service_account" }}
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: accelleran-cbrs-ricweb
-  labels:
-{{ tuple "accelleran-cbrs-ricweb" . | include "accelleran-cbrs-common.metadata_labels" | indent 4 }}
-spec:
-  selector:
-    matchLabels:
-{{ tuple "accelleran-cbrs-ricweb" . | include "accelleran-cbrs-common.metadata_labels" | indent 6 }}
-  serviceName: accelleran-cbrs-ricweb
-  template:
-    metadata:
-      labels:
-{{ tuple "accelleran-cbrs-ricweb" . | include "accelleran-cbrs-common.metadata_labels" | indent 8 }}
-    spec:
-      serviceAccountName: accelleran-cbrs-ricweb
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.accelleranCBRSCommon.label }}: {{ .Values.nodeSelectors.accelleranCBRSCommon.value }}
-    {{- end }}
-    {{- if hasKey .Values.images "pullSecrets" }}
-      imagePullSecrets:
-{{ toYaml .Values.images.pullSecrets | indent 8 }}
-    {{- end }}
-      initContainers:
-      - name: accelleran-cbrs-ric-dep-check
-        image: {{ .Values.images.tags.depCheck | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        securityContext:
-          allowPrivilegeEscalation: false
-          readOnlyRootFilesystem: false
-          runAsUser: 0
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.name
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        - name: PATH
-          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/
-        - name: COMMAND
-          value: "echo done"
-        - name: DEPENDENCY_POD_JSON
-          value: '[{"labels": {"app": "accelleran-cbrs-ric"}, "requireSameNode": false}]'
-
-      containers:
-      - name: ric-web
-        image: {{ .Values.images.tags.ricWeb }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        env:
-        - name: NATS_URL
-          value: {{ .Values.config.nats.url | quote }}
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/values.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/values.yaml
deleted file mode 100644
index df1613b..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/values.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-images:
-  tags:
-    initCU: "registry.aetherproject.org/accelleran/pod-init:1.0.0"
-    nats: "registry.aetherproject.org/accelleran/accelleran-cu-nats:v1.0.0"
-    redis: "registry.aetherproject.org/accelleran/accelleran-cu-redis:v1.0.0"
-    redisClient: "docker.io/redis:5.0.6-alpine3.10"
-    ric: "registry.aetherproject.org/accelleran/accelleran-cu-ric:v1.0.0"
-    ricWeb: "registry.aetherproject.org/accelleran/accelleran-cu-ricweb:v1.0.0"
-    depCheck: "quay.io/stackanetes/kubernetes-entrypoint:v0.3.1"
-  pullPolicy: IfNotPresent
-  pullSecrets:
-    - name: aether.registry
-
-nodeSelectors:
-  enabled: false
-  accelleranCBRSCommon:
-    label: accelleran-cbrs-common
-    value: enabled
-
-resources:
-  enabled: true
-  accelleranCBRSCommon:
-    requests:
-      cpu: 3
-      memory: 1Gi
-    limits:
-      cpu: 3
-      memory: 1Gi
-
-config:
-  nats:
-    url: accelleran-cbrs-nats:4222
-    ip: 119.0.0.30 # Node IP address of nats -- for accessing through NodePort
-    ports:
-      natsPort:
-        port: 4222
-        nodePort: 31000
-        protocol: TCP
-      clusterPort:
-        port: 6222
-        nodePort: 31001
-        protocol: TCP
-      consolePort:
-        port: 8222
-        nodePort: 31002
-        protocol: TCP
-  redis:
-    hostName: accelleran-cbrs-redis
-    ports:
-      redisPort:
-        port: 6379
-        nodePort: 32000
-        protocol: TCP
-    persistence:
-      enabled: true
-      storageClass: "fast-disks"
-      accessMode: ReadWriteOnce
-      size: 1Gi
-  ric:
-    zlogConf:
-      bufferMin: 64K
-      bufferMax: 64K
-    instanceId: ONFRIC001
-  ricWeb:
-    ports:
-      ricWebPort:
-        port: 8080
-        nodePort: 30000
-        protocol: TCP
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-cu/Chart.yaml b/ran/accelleran-cbrs/accelleran-cbrs-cu/Chart.yaml
deleted file mode 100644
index d8f40ed..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-cu/Chart.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-name: accelleran-cbrs-cu
-description: A Helm chart to install Accelleran CU on CBRS band
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 0.1.14
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/_helpers.tpl b/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/_helpers.tpl
deleted file mode 100644
index 34b414a..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/_helpers.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-{{/*
-Render a set of standardised label
-*/}}
-{{- define "accelleran-cbrs-cu.metadata_labels" -}}
-{{- $application := index . 0 -}}
-{{- $context := index . 1 -}}
-release: {{ $context.Release.Name }}
-app: {{ $application }}
-{{- end -}}
-
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/configmap-accelleran-cbrs-cu.yaml b/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/configmap-accelleran-cbrs-cu.yaml
deleted file mode 100644
index c4cfabb..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/configmap-accelleran-cbrs-cu.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: accelleran-cbrs-cu-{{ .Values.config.vranL3.instanceId }}-cm
-  labels:
-{{ tuple "accelleran-cbrs-cu-cm" . | include "accelleran-cbrs-cu.metadata_labels" | indent 4 }}
-data:
-  bootstrap: |
-    redis.hostname:{{ .Values.config.redis.hostName }}
-    redis.port:{{ .Values.config.redis.ports.redisPort.port }}
-    instance.filter:{{ .Values.config.vranL3.instanceId }}
-
-  zlog.conf: |
-    [global]
-    strict init = true
-    buffer min = {{ .Values.config.vranL3.zlogConf.bufferMin }}
-    buffer max = {{ .Values.config.vranL3.zlogConf.bufferMax }}
-    rotate lock file = /tmp/zlog.lock
-
-    [formats]
-    printf_format = "%d(%b %d %H:%M:%S).%ms %8.8H %m%n"
-    [rules]
-    user.* >stdout ;printf_format
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/service-accelleran-cbrs-cu.yaml b/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/service-accelleran-cbrs-cu.yaml
deleted file mode 100644
index e94f351..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/service-accelleran-cbrs-cu.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: accelleran-cbrs-cu-{{ .Values.config.vranL3.instanceId }}
-  labels:
-{{ tuple "accelleran-cbrs-cu" . | include "accelleran-cbrs-cu.metadata_labels" | indent 4 }}
-spec:
-  selector:
-{{ tuple "accelleran-cbrs-cu" . | include "accelleran-cbrs-cu.metadata_labels" | indent 4 }}
-  ports:
-  - name: s1ap-port
-    port: {{ .Values.config.vranL3.ports.s1ap.port }}
-    protocol: {{ .Values.config.vranL3.ports.s1ap.protocol }}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: accelleran-cbrs-cu-{{ .Values.config.vranL3.instanceId }}-exernal
-  labels:
-{{ tuple "accelleran-cbrs-cu" . | include "accelleran-cbrs-cu.metadata_labels" | indent 4 }}
-spec:
-  selector:
-{{ tuple "accelleran-cbrs-cu" . | include "accelleran-cbrs-cu.metadata_labels" | indent 4 }}
-  type: NodePort
-  ports:
-  - name: s1ap-port
-    port: {{ .Values.config.vranL3.ports.s1ap.port }}
-    nodePort: {{ .Values.config.vranL3.ports.s1ap.nodePort }}
-    protocol: {{ .Values.config.vranL3.ports.s1ap.protocol }}
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/statefulset-accelleran-cbrs-cu.yaml b/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/statefulset-accelleran-cbrs-cu.yaml
deleted file mode 100644
index 1efc9c6..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/statefulset-accelleran-cbrs-cu.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: accelleran-cbrs-cu-{{ .Values.config.vranL3.instanceId }}
-  labels:
-    deployedCellId: {{ .Values.config.vranL3.instanceId }}
-{{ tuple "accelleran-cbrs-cu" . | include "accelleran-cbrs-cu.metadata_labels" | indent 4 }}
-spec:
-  selector:
-    matchLabels:
-{{ tuple "accelleran-cbrs-cu" . | include "accelleran-cbrs-cu.metadata_labels" | indent 6 }}
-  serviceName: accelleran-cbrs-cu-{{ .Values.config.vranL3.instanceId }}
-  template:
-    metadata:
-      labels:
-        deployedCellId: {{ .Values.config.vranL3.instanceId }}
-{{ tuple "accelleran-cbrs-cu" . | include "accelleran-cbrs-cu.metadata_labels" | indent 8 }}
-    spec:
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.accelleranCBRSCU.label }}: {{ .Values.nodeSelectors.accelleranCBRSCU.value }}
-    {{- end }}
-    {{- if hasKey .Values.images "pullSecrets" }}
-      imagePullSecrets:
-{{ toYaml .Values.images.pullSecrets | indent 8 }}
-    {{- end }}
-      initContainers:
-      - name: cu-init
-        image: {{ .Values.images.tags.initCU }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        securityContext:
-          privileged: true
-          runAsUser: 0
-        command: [ "sh",  "-c"]
-        args:
-        - >
-          iptables -I OUTPUT -p icmp --icmp-type destination-unreachable -j DROP;
-          if chroot /mnt/host-rootfs modinfo nf_conntrack_proto_sctp > /dev/null 2>&1; then \
-              chroot /mnt/host-rootfs modprobe nf_conntrack_proto_sctp; \
-          fi; \
-        volumeMounts:
-        - name: host-rootfs
-          mountPath: /mnt/host-rootfs
-      containers:
-      - name: vran-l3
-        image: {{ .Values.images.tags.vranL3 }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        env:
-        - name: ZLOG_CONF_PATH
-          value: /zlog.conf
-        - name: BOOTSTRAP_FILENAME
-          value: /bootstrap
-        - name: LD_LIBRARY_PATH
-          value: /data/
-        - name: FAP_DB_PATH
-          value: /data/
-        command: ["sh", "-c"]
-        args:
-        - sqlite3 /data/datastoreRemRw.db "update FapServiceCellConfigLteEpcPlmnList set PLMNID='{{ .Values.config.vranL3.plmnId }}';";
-          sqlite3 /data/datastoreRemRw.db "update FapServiceFapControlLteGateway set SecGWServer1='{{ .Values.config.mme.ip }}';";
-          sqlite3 /data/datastoreRemRw.db "update FapServiceFapControlLteGateway set SecGWServer2='{{ .Values.config.mme.ip }}';";
-          sqlite3 /data/datastoreRemRw.db "update FapServiceFapControlLteGateway set SecGWServer3='{{ .Values.config.mme.ip }}';";
-          sqlite3 /data/datastoreRemRw.db "update FapServiceFapControlLteGateway set S1SigLinkPort='{{ .Values.config.mme.s1apPort }}';";
-          sqlite3 /data/datastoreRemRw.db "update FapServiceFapControlLteGateway_S1SigLinkServerListList set S1SigLinkServerList='{{ .Values.config.mme.ip }}';";
-          sqlite3 /data/datastoreRemRw.db "update FapServiceCellConfigLteRanRf set FreqBandIndicator='{{ .Values.config.vranL3.freqBand }}';";
-          sqlite3 /data/datastore.db "update featureActivation set good1PPSRequired=0;";
-          sqlite3 /data/datastoreRemRw.db "update FapServiceCellConfigLteRanRf_EARFCNDLList set EARFCNDL='{{ .Values.config.vranL3.earfcnDl }}';";
-          sqlite3 /data/datastoreRemRw.db "update FapServiceCellConfigLteRanRf_EARFCNULList set EARFCNUL='{{ .Values.config.vranL3.earfcnUl }}';";
-          sqlite3 /data/datastoreRemRw.db "update FapServiceCellConfigLteEpc set TAC='{{ .Values.config.vranL3.tac }}';";
-          sqlite3 /data/datastoreRemRw.db "update FapServiceCellConfigLteRanCommon set CellIdentity='{{ mul .Values.config.vranL3.enbId 256 }}';";
-          sqlite3 /data/datastoreRemRw.db "select * from FapServiceCellConfigLteEpc;";
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hset ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICEFAPCONTROLLTEGATEWAYS1SIGLINKSERVERLIST[0] S1SIGLINKSERVERLIST {{ .Values.config.mme.ip }};
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hset ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICEFAPCONTROLLTEGATEWAY_S1SIGLINKSERVERLISTLIST[0] S1SIGLINKSERVERLIST {{ .Values.config.mme.ip }};
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hset ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICECELLCONFIGLTERANRF FREQBANDINDICATOR {{ .Values.config.vranL3.freqBand }};
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hset ENB_{{ .Values.config.vranL3.instanceId }}_FEATUREACTIVATION GOOD1PPSREQUIRED False;
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hset ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICECELLCONFIGLTEEPCPLMNLIST[0] PLMNID {{ .Values.config.vranL3.plmnId }};
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hset ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICECELLCONFIGLTERANRF_EARFCNDLLIST EARFCNDL {{ .Values.config.vranL3.earfcnDl }};
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hset ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICECELLCONFIGLTERANRF_EARFCNULLIST EARFCNUL {{ .Values.config.vranL3.earfcnUl }};
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hset ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICECELLCONFIGLTEEPC TAC {{ .Values.config.vranL3.tac }};
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hset ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICECELLCONFIGLTERANCOMMON TAC {{ mul .Values.config.vranL3.enbId 256 }};
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hgetall ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICEFAPCONTROLLTEGATEWAYS1SIGLINKSERVERLIST[0];
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hgetall ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICEFAPCONTROLLTEGATEWAY_S1SIGLINKSERVERLISTLIST[0];
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hgetall ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICECELLCONFIGLTERANRF;
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hgetall ENB_{{ .Values.config.vranL3.instanceId }}_FEATUREACTIVATION;
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hgetall ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICECELLCONFIGLTEEPCPLMNLIST[0];
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hgetall ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICECELLCONFIGLTERANRF_EARFCNDLLIST;
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hgetall ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICECELLCONFIGLTERANRF_EARFCNULLIST;
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hgetall ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICECELLCONFIGLTEEPC;
-          redis-cli -h {{ .Values.config.redis.hostName }} -p {{ .Values.config.redis.ports.redisPort.port }} hgetall ENB_{{ .Values.config.vranL3.instanceId }}_FAPSERVICECELLCONFIGLTERANCOMMON;
-          sleep 30;
-          /data/l3service;
-        securityContext:
-          privileged: true
-        {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.accelleranCBRSCU | indent 10 }}
-        {{- end }}
-        volumeMounts:
-        - name: l3-config-volume
-          mountPath: /bootstrap
-          subPath: bootstrap
-        - name: l3-config-volume
-          mountPath: /zlog.conf
-          subPath: zlog.conf
-      volumes:
-      - name: l3-config-volume
-        configMap:
-          name: accelleran-cbrs-cu-{{ .Values.config.vranL3.instanceId }}-cm
-      - name: host-rootfs
-        hostPath:
-          path: /
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-cu/values.yaml b/ran/accelleran-cbrs/accelleran-cbrs-cu/values.yaml
deleted file mode 100644
index b2e746b..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-cu/values.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-images:
-  tags:
-    initCU: "registry.aetherproject.org/accelleran/pod-init:1.0.0"
-    vranL3: "registry.aetherproject.org/accelleran/accelleran-cu-l3-tdd:v1.0.2"
-    depCheck: "quay.io/stackanetes/kubernetes-entrypoint:v0.3.1"
-  pullPolicy: IfNotPresent
-  pullSecrets:
-    - name: aether.registry
-
-nodeSelectors:
-  enabled: false
-  accelleranCBRSCU:
-    label: accelleran-cbrs-cu
-    value: enabled
-
-resources:
-  enabled: true
-  accelleranCBRSCU:
-    requests:
-      cpu: 3
-      memory: 1Gi
-    limits:
-      cpu: 3
-      memory: 1Gi
-
-config:
-  vranL3:
-    zlogConf:
-      bufferMin: 64K
-      bufferMax: 64K
-    instanceId: onfcell202 # Cell ID -- Unique value for each L2/DU-L3/CU pair, no capital and special character
-    tac: 202
-    enbId: 1
-    freqBand: 48
-    earfcnDl: 55990
-    earfcnUl: 55990
-    plmnId: "371211" # 130501 for aether If not, 315010 oldone: 371211
-    ports:
-      s1ap:
-        port: 36412
-        nodePort: 31412
-        protocol: SCTP
-  redis:
-    hostName: accelleran-cbrs-redis
-    ports:
-      redisPort:
-        port: 6379
-  mme:
-    ip: 10.90.0.151
-    s1apPort: 36412
diff --git a/ran/accelleran-cu/Chart.yaml b/ran/accelleran-cu/Chart.yaml
deleted file mode 100644
index 9535f92..0000000
--- a/ran/accelleran-cu/Chart.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-
-# Copyright 2018 Intel Corporation
-# Copyright 2018-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-name: accelleran-cu
-description: A Helm chart to install Accelleran CU
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 0.1.3
diff --git a/ran/accelleran-cu/templates/_helpers.tpl b/ran/accelleran-cu/templates/_helpers.tpl
deleted file mode 100644
index 0016ab3..0000000
--- a/ran/accelleran-cu/templates/_helpers.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-{{- /*
-
-# Copyright 2018 Intel Corporation
-# Copyright 2018-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-{{/*
-Renders a set of standardised labels
-*/}}
-{{- define "accelleran-cu.metadata_labels" -}}
-{{- $application := index . 0 -}}
-{{- $context := index . 1 -}}
-release: {{ $context.Release.Name }}
-app: {{ $application }}
-{{- end -}}
-
-{{/*
-Render ServiceAccount, Role, and RoleBinding required for kubernetes-entrypoint.
-*/}}
-{{- define "accelleran-cu.service_account" -}}
-{{- $context := index . 1 -}}
-{{- $saName := index . 0 -}}
-{{- $saNamespace := $context.Release.Namespace }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ $saName }}
-  namespace: {{ $saNamespace }}
-  labels:
-{{ tuple $saName $context | include "accelleran-cu.metadata_labels" | indent 4 }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ $saName }}
-  namespace: {{ $saNamespace }}
-  labels:
-{{ tuple $saName $context | include "accelleran-cu.metadata_labels" | indent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ $saName }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ $saName }}
-    namespace: {{ $saNamespace }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ $saName }}
-  namespace: {{ $saNamespace }}
-  labels:
-{{ tuple $saName $context | include "accelleran-cu.metadata_labels" | indent 4 }}
-{{- end -}}
diff --git a/ran/accelleran-cu/templates/configmap-accelleran.yaml b/ran/accelleran-cu/templates/configmap-accelleran.yaml
deleted file mode 100644
index 5aff126..0000000
--- a/ran/accelleran-cu/templates/configmap-accelleran.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{/*
-# Copyright 2019-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: accelleran-cu-config
-  labels:
-{{ tuple "accelleran-cu" . | include "accelleran-cu.metadata_labels" | indent 4 }}
-data:
-  bootstrap.txt: |
-    redis.hostname:accelleran-cu
-    redis.port:{{ .Values.config.vran.ports.redis.port }}
-    instance.filter:{{ .Values.config.vran.instId }}
diff --git a/ran/accelleran-cu/templates/service-accelleran.yaml b/ran/accelleran-cu/templates/service-accelleran.yaml
deleted file mode 100644
index e9fb3e0..0000000
--- a/ran/accelleran-cu/templates/service-accelleran.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-{{/*
-# Copyright 2019-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: accelleran-cu
-  labels:
-{{ tuple "accelleran-cu" . | include "accelleran-cu.metadata_labels" | indent 4 }}
-spec:
-  selector:
-{{ tuple "accelleran-cu" . | include "accelleran-cu.metadata_labels" | indent 4 }}
-  ports:
-  - name: s1ap
-    port: {{ .Values.config.vran.ports.s1ap.port }}
-    protocol: SCTP
-  - name: nats
-    port: {{ .Values.config.vran.ports.nats.port }}
-    protocol: TCP
-  - name: redis
-    port: {{ .Values.config.vran.ports.redis.port }}
-    protocol: TCP
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: acceleran-cu-external
-  labels:
-{{ tuple "accelleran-cu" . | include "accelleran-cu.metadata_labels" | indent 4 }}
-spec:
-  selector:
-{{ tuple "accelleran-cu" . | include "accelleran-cu.metadata_labels" | indent 4 }}
-  type: NodePort
-  ports:
-  - name: nats
-    port: {{ .Values.config.vran.ports.nats.port }}
-    protocol: TCP
-    nodePort: {{ .Values.config.vran.ports.nats.nodePort }}
-  - name: redis
-    port: {{ .Values.config.vran.ports.redis.port }}
-    protocol: TCP
-    nodePort: {{ .Values.config.vran.ports.redis.nodePort }}
diff --git a/ran/accelleran-cu/templates/statefulset-accelleran.yaml b/ran/accelleran-cu/templates/statefulset-accelleran.yaml
deleted file mode 100644
index c9751e2..0000000
--- a/ran/accelleran-cu/templates/statefulset-accelleran.yaml
+++ /dev/null
@@ -1,135 +0,0 @@
-{{/*
-# Copyright 2019-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{ tuple "accelleran-cu" . | include "accelleran-cu.service_account" }}
-
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: accelleran-cu
-  labels:
-{{ tuple "accelleran-cu" . | include "accelleran-cu.metadata_labels" | indent 4 }}
-spec:
-  replicas: {{ .Values.config.vran.replicas }}
-  selector:
-    matchLabels:
-{{ tuple "accelleran-cu" . | include "accelleran-cu.metadata_labels" | indent 6 }}
-  serviceName: "accelleran-cu"
-  template:
-    metadata:
-      labels:
-{{ tuple "accelleran-cu" . | include "accelleran-cu.metadata_labels" | indent 8 }}
-    spec:
-      terminationGracePeriodSeconds: 1
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.accelleranCU.label }}: {{ .Values.nodeSelectors.accelleranCU.value }}
-    {{- end }}
-      serviceAccountName: accelleran-cu
-      initContainers:
-      - name: cu-init
-        image: {{ .Values.images.tags.initCU }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        securityContext:
-          privileged: true
-          runAsUser: 0
-        command: [ "sh",  "-c"]
-        args:
-        - >
-          iptables -I OUTPUT -p icmp --icmp-type destination-unreachable -j DROP;
-          if chroot /mnt/host-rootfs modinfo nf_conntrack_proto_sctp > /dev/null 2>&1; then \
-              chroot /mnt/host-rootfs modprobe nf_conntrack_proto_sctp; \
-          fi; \
-        volumeMounts:
-        - name: host-rootfs
-          mountPath: /mnt/host-rootfs
-      containers:
-      - name: nats
-        image: {{ .Values.images.tags.nats }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        securityContext:
-          capabilities:
-            add:
-              - NET_ADMIN
-              - IPC_LOCK
-        stdin: true
-        tty: true
-        env:
-        - name: NATS_SERVICE_NAME
-          value: {{ .Values.config.nats.serviceName }}
-        command: [ "sh", "-c"]
-        args:
-        - gnatsd -DV -c /etc/gnatsd.conf;
-      {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.accelleranCU | indent 10 }}
-      {{- end }}
-      - name: redis
-        image: {{ .Values.images.tags.redis }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        securityContext:
-          capabilities:
-            add:
-              - NET_ADMIN
-              - IPC_LOCK
-        stdin: true
-        tty: true
-        command: ["sh", "-c"]
-        args:
-        # FIXME: Redis can't support with dns resolution, can't set hostname at here.
-        - (sleep 5; redis-cli -h localhost -p {{ .Values.config.vran.ports.redis.port }} set NATS_SERVICE_URL "nat://{{ .Values.config.nats.ip }}:{{ .Values.config.vran.ports.nats.port }}";) &
-          /usr/local/bin/redis-server
-      {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.accelleranCU | indent 10 }}
-      {{- end }}
-      - name: vran-l3
-        image: {{ .Values.images.tags.vranL3 }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        securityContext:
-          capabilities:
-            add:
-            - NET_ADMIN
-            - IPC_LOCK
-            - SYS_NICE
-        stdin: true
-        tty: true
-        env:
-          - name: MME_IP
-            value: {{ .Values.config.mme.ip }}
-        command: ["sh", "-c"]
-        args:
-        - sqlite3 /mnt/app/datastore.db "update cellS1apConfig set enbSctpPort={{ .Values.config.vran.ports.s1ap.port }};";
-          sqlite3 /mnt/app/datastoreRemRw.db "update FapServiceFapControlLteGateway set S1SigLinkPort={{ .Values.config.mme.s1apPort }};";
-          sqlite3 /mnt/app/datastoreRemRw.db "update FapServiceCellConfigLteEpcPlmnList set PLMNID={{ .Values.config.epc.plmnId }};";
-          sqlite3 /mnt/app/datastore.db "insert into enbSctpSocketInterface ('interfaceName') values ('{{ .Values.config.vran.socketInterface }}');";
-          sqlite3 /mnt/app/datastore.db "update logging set severity=7 where id=25;";
-{{- if .Values.config.progran.enabled }}
-          sqlite3 /mnt/app/datastore.db "update featureActivation set mmeSlicingEnabled=1;";
-          sqlite3 /mnt/app/datastore.db "update featureActivation set ranSlicingEnabled=1;";
-          sqlite3 /mnt/app/datastore.db "insert into pranServerAddress (pranServerIpAddress,pranServerPort) values ('{{ .Values.config.progran.ip }}', {{ .Values.config.progran.port }});";
-{{- end}}
-          sleep 10;
-          /l3/l3start;
-        volumeMounts:
-        - name: bbu-config
-          mountPath: /mnt/app/bootstrap.txt
-          subPath: bootstrap.txt
-      {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.accelleranCU | indent 10 }}
-      {{- end }}
-      volumes:
-        - name: bbu-config
-          configMap:
-            name: accelleran-cu-config
-            items:
-              - key: bootstrap.txt
-                path: bootstrap.txt
-        - name: host-rootfs
-          hostPath:
-            path: /
diff --git a/ran/accelleran-cu/values.yaml b/ran/accelleran-cu/values.yaml
deleted file mode 100644
index 8a19c80..0000000
--- a/ran/accelleran-cu/values.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2018 Intel Corporation
-# Copyright 2018-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-images:
-  tags:
-    initCU: docker.io/omecproject/pod-init:1.0.0
-    nats: registry.aether.opennetworking.org/aether/accelleran-cu-nats-b17:v1.0.0
-    redis: registry.aether.opennetworking.org/aether/accelleran-cu-redis-b17:v1.0.0
-    vranL3: registry.aether.opennetworking.org/aether/accelleran-cu-l3-fdd-b17:v1.0.0
-  pullPolicy: IfNotPresent
-
-nodeSelectors:
-  enabled: false
-  accelleranCU:
-    label: accelleran-cu
-    value: enabled
-
-resources:
-  enabled: true
-  accelleranCU:
-    requests:
-      cpu: 3
-      memory: 1Gi
-    limits:
-      cpu: 3
-      memory: 1Gi
-
-config:
-  vran:
-    replicas: 1
-    socketInterface: eth0
-    instId: "enb_key"
-    ports:
-      s1ap:
-        port: 36412
-      nats:
-        port: 4222
-        nodePort: 4222
-      redis:
-        port: 6379
-        nodePort: 6379
-  nats:
-    serviceName: "nats-cluster"
-    ip: 10.90.0.151
-  epc:
-    plmnId: 371211
-  mme:
-    ip: 10.90.0.151
-    s1apPort: 36412
-  progran:
-    enabled: false
-    # ONOS ProgRAN IP address
-    ip: 10.90.0.151
-    port: 30410
-
-