diff --git a/manifests/bgpls_speakerservice.yaml b/manifests/bgpls_speakerservice.yaml
index 91e3c5271cc343240499e2d83b7c822f51b5f4bf..aa985d13ea81ad5f5aafdee4b62ca1c54915e527 100644
--- a/manifests/bgpls_speakerservice.yaml
+++ b/manifests/bgpls_speakerservice.yaml
@@ -45,11 +45,11 @@ spec:
             command: ["/bin/grpc_health_probe", "-addr=:20030"]
         resources:
           requests:
-            cpu: 50m
-            memory: 64Mi
+            cpu: 250m
+            memory: 128Mi
           limits:
-            cpu: 500m
-            memory: 512Mi
+            cpu: 1000m
+            memory: 1024Mi
 ---
 apiVersion: v1
 kind: Service
diff --git a/src/bgpls_speaker/Dockerfile b/src/bgpls_speaker/Dockerfile
index d90ebf82b0d7d1949471db51ca0e1dd5c4ed1e80..efb4f0e574f298e4716d03a8e07708f6aa28987c 100644
--- a/src/bgpls_speaker/Dockerfile
+++ b/src/bgpls_speaker/Dockerfile
@@ -135,10 +135,8 @@ COPY --from=build /var/teraflow/bgpls/service/java/netphony-topology/target/bgp-
 
 # Add component files into working directory
 WORKDIR /var/teraflow
-COPY src/context/. context/
-COPY src/device/. device/
-COPY src/pathcomp/frontend/. pathcomp/frontend/
-COPY src/service/. service/
+COPY src/context/__init__.py context/__init__.py
+COPY src/context/client/. context/client/
 COPY src/bgpls_speaker/. bgpls_speaker/
 
 # Start the service
diff --git a/src/bgpls_speaker/requirements.in b/src/bgpls_speaker/requirements.in
index b4a94b3cdb3b146b7f8a02bbe7c1cb1de6c8925b..ad4499418ca79d78bfd343dcf9439aff9c88ac77 100644
--- a/src/bgpls_speaker/requirements.in
+++ b/src/bgpls_speaker/requirements.in
@@ -12,5 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+lxml==4.9.1
 pytz==2021.3
 xmltodict==0.12.0
diff --git a/src/bgpls_speaker/service/BgplsServiceServicerImpl.py b/src/bgpls_speaker/service/BgplsServiceServicerImpl.py
index 5e61afafbf2e574d303fcb2022d346808461fb2c..cc87bf095069964ad49bfefabd10180a5109e332 100644
--- a/src/bgpls_speaker/service/BgplsServiceServicerImpl.py
+++ b/src/bgpls_speaker/service/BgplsServiceServicerImpl.py
@@ -12,21 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import grpc, json, logging
-from typing import Optional
+import grpc, logging
 from bgpls_speaker.service.tools.DiscoveredDBManager import  DiscoveredDBManager, GetContextDevices
 from bgpls_speaker.service.tools.GrpcServer import GrpcServer
 from common.method_wrappers.Decorator import MetricsPool, safe_and_metered_rpc_method
-from common.method_wrappers.ServiceExceptions import AlreadyExistsException, InvalidArgumentException
-from common.proto.context_pb2 import (DeviceId, Empty, EndPointId, Link, LinkId, Service, ServiceId, ServiceStatusEnum, ServiceTypeEnum, TopologyId,ContextId,Topology
-    ,Device,DeviceDriverEnum, Uuid)
-from common.proto.pathcomp_pb2 import PathCompRequest
-from common.proto.service_pb2_grpc import ServiceServiceServicer
-from common.tools.grpc.Tools import grpc_message_to_json, grpc_message_to_json_string
+from common.proto.context_pb2 import DeviceId, Empty, EndPointId, Link, LinkId, Uuid
 from context.client.ContextClient import ContextClient
-from pathcomp.frontend.client.PathCompClient import PathCompClient
-from common.proto.bgpls_pb2 import (BgplsSpeaker,BgplsSpeakerId, DiscoveredDeviceList,DiscoveredDevice,
-                                    DiscoveredLink,DiscoveredLinkList,NodeDescriptors,BgplsSpeakerList)
+from common.proto.bgpls_pb2 import (
+    BgplsSpeaker, BgplsSpeakerId, DiscoveredDeviceList, DiscoveredDevice,
+    DiscoveredLink, DiscoveredLinkList, NodeDescriptors, BgplsSpeakerList
+)
 from common.proto.bgpls_pb2_grpc import BgplsServiceServicer
 
 LOGGER = logging.getLogger(__name__)
diff --git a/src/bgpls_speaker/service/__main__.py b/src/bgpls_speaker/service/__main__.py
index 3d3317e301a1c4c980983b9ba0d88835ec9ab3f2..6f55955650c9839a09960b3959030b8b51c28669 100644
--- a/src/bgpls_speaker/service/__main__.py
+++ b/src/bgpls_speaker/service/__main__.py
@@ -12,16 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging, signal, sys, threading, time
+import logging, signal, sys, threading
 from prometheus_client import start_http_server
-from common.Constants import ServiceNameEnum
-from common.Settings import (
-    ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_log_level, get_metrics_port,
-    wait_for_environment_variables)
-from context.client.ContextClient import ContextClient
+from common.Settings import get_log_level, get_metrics_port
 from .tools.DiscoveredDBManager import DiscoveredDBManager
 from .BgplsService import BgplsService
-from .tools.JavaRunner import JavaRunner
 from .tools.GrpcServer import GrpcServer
 
 terminate = threading.Event()