diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
deleted file mode 100644
index 1ae31b2..0000000
--- a/bbsim/Chart.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed 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.
-
-name: bbsim
-description: Broadband Simulator
-icon: https://guide.opencord.org/logos/cord.svg
-apiVersion: v1
-version: 4.3.0
-appVersion: 1.7.0
diff --git a/bbsim/templates/NOTES.txt b/bbsim/templates/NOTES.txt
deleted file mode 100644
index 700b9b7..0000000
--- a/bbsim/templates/NOTES.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-BBSim deployed with release name: {{ .Release.Name }}
-
-OLT ID: {{ .Values.olt_id }}
-# of NNI Ports: {{ .Values.nni }}
-# of PON Ports: {{ .Values.pon }}
-# of ONU Ports: {{ .Values.onu }}
-Total ONUs: (total: {{ mul .Values.pon .Values.onu}})
-
-OLT is listening on: "bbsim:{{ .Values.olt_tcp_port }}"
diff --git a/bbsim/templates/_helpers.tpl b/bbsim/templates/_helpers.tpl
deleted file mode 100644
index af6ac67..0000000
--- a/bbsim/templates/_helpers.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Copyright 2018-present Open Networking Foundation
-
-Licensed 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.
-*/}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "bbsim.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "bbsim.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "bbsim.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
diff --git a/bbsim/templates/configmap-services.yaml b/bbsim/templates/configmap-services.yaml
deleted file mode 100644
index 49c5409..0000000
--- a/bbsim/templates/configmap-services.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed 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.
-
-# This configmap mounts a yaml file in the container to describe the bbsim services
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: bbsim-services-{{ .Values.olt_id }}
-data:
-  bbsimServicesConfig: |
-{{ toYaml .Values.servicesConfig | indent 4 }}
diff --git a/bbsim/templates/deployment.yaml b/bbsim/templates/deployment.yaml
deleted file mode 100644
index b867db1..0000000
--- a/bbsim/templates/deployment.yaml
+++ /dev/null
@@ -1,150 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed 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.
-{{- $log_level := tpl .Values.log_level . }}
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ template "bbsim.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: "bbsim"
-    name: {{ template "bbsim.name" . }}
-    chart: {{ template "bbsim.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: "bbsim"
-      name: {{ template "bbsim.name" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: "bbsim"
-        name: {{ template "bbsim.name" . }}
-        release: {{ .Release.Name }}
-        app.kubernetes.io/name: "bbsim"
-        app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
-        app.kubernetes.io/component: "device-emulator"
-        app.kubernetes.io/part-of: "voltha"
-        app.kubernetes.io/managed-by: {{ quote .Release.Service }}
-        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    spec:
-      serviceAccount: {{ .Values.serviceAccountName }}
-      serviceAccountName: {{ .Values.serviceAccountName }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: '{{ tpl .Values.images.bbsim.registry . }}{{ tpl .Values.images.bbsim.repository . }}:{{ tpl ( tpl .Values.images.bbsim.tag . ) . }}'
-          imagePullPolicy: {{ tpl .Values.images.bbsim.pullPolicy . }}
-          securityContext:
-            privileged: {{ .Values.privileged }}
-          livenessProbe:
-            exec:
-              command:
-              - bbsimctl
-              - olt
-              - get
-            initialDelaySeconds: 5
-            periodSeconds: 30
-          readinessProbe:
-            httpGet:
-              path: /v2/cfg
-              port: {{ .Values.bbsim_sadis_port }}
-              httpHeaders:
-            initialDelaySeconds: 5
-            periodSeconds: 30
-          command: [
-            "/app/bbsim",
-            "-openolt_address", ":{{ .Values.olt_tcp_port }}",
-            "-olt_id", "{{ .Values.olt_id }}",
-            "-nni", "{{ .Values.nni }}",
-            "-pon", "{{ .Values.pon }}",
-            "-onu", "{{ .Values.onu }}",
-            "-bp_format", "{{ .Values.bp_format }}",
-            "-oltRebootDelay", "{{ .Values.oltRebootDelay }}",
-            "-logLevel", "{{ $log_level }}",
-            "-delay", "{{ .Values.delay }}",
-            "-services", "configs/services.yaml",
-            "-rest_api_address", ":{{ .Values.bbsim_rest_port }}",
-            "-ca", "{{ .Values.controlledActivation }}",
-            "-omci_response_rate", "{{ .Values.omci_response_rate }}",
-            {{ if .Values.enableEvents -}}
-            "-enableEvents",
-            "-kafkaAddress", "{{ .Values.kafkaAddress }}",
-            {{ end -}}
-            {{ if .Values.enablePerf -}}
-            "-enableperf",
-            {{ end -}}
-            "-kafkaEventTopic", "{{ .Values.kafkaEventTopic }}",
-            {{ if .Values.authRetry -}}
-            "-authRetry",
-            {{ end -}}
-            {{ if .Values.dhcpRetry -}}
-            "-dhcpRetry",
-            {{ end -}}
-          ]
-          ports:
-            - name: "bbsim-{{ .Values.olt_id }}"
-              containerPort: {{ .Values.olt_tcp_port }}
-              protocol: TCP
-            - name: "bbsim-{{ .Values.olt_id }}-api"
-              containerPort: {{ .Values.bbsim_api_port }}
-              protocol: TCP
-            - name: "bbsim-{{ .Values.olt_id }}-sadis"
-              containerPort: {{ .Values.bbsim_sadis_port }}
-              protocol: TCP
-            - name: "bbsim-{{ .Values.olt_id }}-rest"
-              containerPort: {{ .Values.bbsim_rest_port }}
-              protocol: TCP
-            - name: "bbsim-{{ .Values.olt_id }}-dmi"
-              containerPort: {{ .Values.bbsim_dmi_port }}
-              protocol: TCP
-          env:
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-          volumeMounts:
-            - name: bbsim-services-config
-              mountPath: /app/configs/services.yaml
-              subPath: services.yaml
-      volumes:
-        - name: bbsim-services-config
-          configMap:
-            name: bbsim-services-{{ .Values.olt_id }}
-            items:
-              - key: bbsimServicesConfig
-                path: services.yaml
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
diff --git a/bbsim/templates/service.yaml b/bbsim/templates/service.yaml
deleted file mode 100644
index 8b19af6..0000000
--- a/bbsim/templates/service.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed 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.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "bbsim.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: "bbsim"
-    name: {{ template "bbsim.name" . }}
-    chart: {{ template "bbsim.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - name: "bbsim-{{ .Values.olt_id }}"
-      port: {{ .Values.olt_tcp_port }}
-      protocol: TCP
-    - name: "bbsim-{{ .Values.olt_id }}-api"
-      port: {{ .Values.bbsim_api_port }}
-      protocol: TCP
-    - name: "bbsim-{{ .Values.olt_id }}-sadis"
-      port: {{ .Values.bbsim_sadis_port }}
-      protocol: TCP
-    - name: "bbsim-{{ .Values.olt_id }}-rest"
-      port: {{ .Values.bbsim_rest_port }}
-      protocol: TCP
-    - name: "bbsim-{{ .Values.olt_id }}-dmi"
-      port: {{ .Values.bbsim_dmi_port }}
-      protocol: TCP
-  selector:
-    app: "bbsim"
-    name: {{ template "bbsim.name" . }}
-    release: {{ .Release.Name }}
diff --git a/bbsim/values.yaml b/bbsim/values.yaml
deleted file mode 100644
index d6b0272..0000000
--- a/bbsim/values.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed 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.
-
-# bbsim values
-
-# Default overrides
-global:
-  log_level: "DEBUG"
-  image_registry: ""
-  image_tag: ~
-  image_org: "voltha/"
-  image_pullPolicy: "Always"
-
-# CLI switches passed to bbsim
-olt_id: 0
-nni: 1
-pon: 1
-onu: 1
-# time that BBSim should wait to emulate an hardware reboot
-oltRebootDelay: 60
-# delay between ONU discovery indication
-delay: 200
-log_level: '{{ .Values.global.log_level }}'
-kafkaEventTopic: ""
-authRetry: false
-dhcpRetry: false
-# default, only-onu, only-pon, both
-controlledActivation: default
-omci_response_rate: 10
-bp_format: mef
-
-# TODO read this values in the config
-olt_tcp_port: 50060
-bbsim_api_port: 50070
-bbsim_rest_port: 50071
-bbsim_sadis_port: 50074
-bbsim_dmi_port: 50075
-enablePerf: false
-enableEvents: false
-kafkaAddress: ":9092"
-
-servicesConfig:
-  workflow: att
-  services:
-    - name: hsia
-      c_tag: 900
-      c_tag_allocation: unique
-      s_tag: 900
-      s_tag_allocation: shared
-      needs_eapol: true
-      needs_dhcp: true
-      tp_id: 64
-
-images:
-  bbsim:
-    registry: '{{ .Values.global.image_registry }}'
-    repository: '{{ .Values.global.image_org }}bbsim'
-    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
-    pullPolicy: '{{ .Values.global.image_pullPolicy | default "Always" }}'
-
-
-serviceAccountName: default
-
-nameOverride: ""
-fullnameOverride: ""
-
-replicaCount: 1
-
-resources: {}
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-privileged: false