diff --git a/dockers/docker-bfn-sswsyncd-rpc/Dockerfile b/dockers/docker-bfn-sswsyncd-rpc/Dockerfile
deleted file mode 100644
index 4d1b3e49bc..0000000000
--- a/dockers/docker-bfn-sswsyncd-rpc/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-FROM docker-base
-
-## Make apt-get non-interactive
-ENV DEBIAN_FRONTEND=noninteractive
-
-## Pre-install the fundamental packages
-RUN apt-get update \
- && apt-get -y install  \
-    net-tools
-
-COPY deps /deps
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; \
-    dpkg_apt /deps/python-tabulate_*.deb    \
-    && dpkg_apt /deps/applibs_*.deb         \
-    && dpkg_apt /deps/applibs-dev_*.deb     \
-    && dpkg_apt /deps/sx-complib_*.deb      \
-    && dpkg_apt /deps/sxd-libs_*.deb        \
-    && dpkg_apt /deps/sx-scew_*.deb         \
-    && dpkg_apt /deps/sx-examples_*.deb     \
-    && dpkg_apt /deps/sx-gen-utils_*.deb    \
-    && dpkg_apt /deps/python-sdk-api_*.deb  \
-    && dpkg_apt /deps/sx-libnl_*.deb        \
-    && dpkg_apt /deps/iproute2_*.deb        \
-    && dpkg_apt /deps/libsswsdk_*.deb       \
-    && dpkg_apt /deps/libthrift-0.9.3_*.deb \
-    && dpkg_apt /deps/libthrift-dev_*.deb
-
-RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; \
-    dpkg_apt /deps/mlnx-sai_*.deb \
-    && dpkg_apt /deps/sswsyncd-saithrift_*.deb
-
-## Clean up
-RUN apt-get clean -y ; apt-get autoclean -y ; apt-get autoremove -y ; rm -rf /deps
-
-ENTRYPOINT service rsyslog start    \
-    && mkdir -p /dev/sxdevs && ( [ -e /dev/sxdevs/sxcdev ] || mknod /dev/sxdevs/sxcdev c 231 193 ) \
-    && service sswsyncd start       \
-    && /bin/bash
diff --git a/dockers/docker-bfn-sswsyncd/Dockerfile b/dockers/docker-bfn-sswsyncd/Dockerfile
deleted file mode 100755
index 9bb6c71e87..0000000000
--- a/dockers/docker-bfn-sswsyncd/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM docker-base
-
-## Make apt-get non-interactive
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update
-
-## Pre-install the fundamental packages
-RUN apt-get update \
- && apt-get -y install  \
-    net-tools
-
-COPY deps /deps
-
-ENTRYPOINT service rsyslog start    \
-    && sleep 5 && service sswsyncd start       \
-    && /bin/bash
diff --git a/dockers/docker-orchagent/swssconfig.sh b/dockers/docker-orchagent/swssconfig.sh
index bb1b91a319..84e8f560a8 100755
--- a/dockers/docker-orchagent/swssconfig.sh
+++ b/dockers/docker-orchagent/swssconfig.sh
@@ -27,7 +27,13 @@ fast_reboot
 
 HWSKU=`sonic-cfggen -d -v "DEVICE_METADATA['localhost']['hwsku']"`
 
-SWSSCONFIG_ARGS="00-copp.config.json ports.json switch.json "
+SWSSCONFIG_ARGS="00-copp.config.json "
+
+if [ "$HWSKU" != "montara" ] && [ "$HWSKU" != "mavericks" ] && [ "$HWSKU" != "OSW1800-48x6q" ] && [ "$HWSKU" != "INGRASYS-S9180-32X"]; then
+    SWSSCONFIG_ARGS+="ipinip.json "
+fi
+
+SWSSCONFIG_ARGS+="ports.json switch.json "
 
 if [ "$HWSKU" == "Force10-S6000" ]; then
     SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
@@ -42,10 +48,6 @@ elif [[ "$HWSKU" == "ACS-MSN27"* ]]; then
     SWSSCONFIG_ARGS+="msn27xx.32ports.buffers.json "
 fi
 
-if [ "$HWSKU" != "montara" ] && [ "$HWSKU" != "mavericks" ] && [ "$HWSKU" != "OSW1800-48x6q" ] && [ "$HWSKU" != "INGRASYS-S9180-32X"]; then
-    SWSSCONFIG_ARGS+="ipinip.json "
-fi
-
 for file in $SWSSCONFIG_ARGS; do
     swssconfig /etc/swss/config.d/$file
     sleep 1
diff --git a/dockers/docker-saiserver-bfn/start.sh b/dockers/docker-saiserver-bfn/start.sh
index 57ee5036de..16457d13e0 100755
--- a/dockers/docker-saiserver-bfn/start.sh
+++ b/dockers/docker-saiserver-bfn/start.sh
@@ -1,16 +1,8 @@
 #!/usr/bin/env bash
 
-start_mlnx()
-{
-    [ -e /dev/sxdevs/sxcdev ] || ( mkdir -p /dev/sxdevs && mknod /dev/sxdevs/sxcdev c 231 193 )
-}
-
-
 rm -f /var/run/rsyslogd.pid
 
 supervisorctl start rsyslogd
 
-start_mlnx
-
 supervisorctl start saiserver