diff --git a/lib/rdk/Start_MaintenanceTasks.sh b/lib/rdk/Start_MaintenanceTasks.sh
index ba6671f6..88490b42 100644
--- a/lib/rdk/Start_MaintenanceTasks.sh
+++ b/lib/rdk/Start_MaintenanceTasks.sh
@@ -98,7 +98,6 @@ runMaintenanceRFCTask()
         rfcLog "No RFC Bin/ Script"
         result=-1
     fi
-    touch /tmp/.RFCsynccomplete
     # Handle both success (0) and acceptable warning (1) exit codes, flag other results as errors
     if [ "$result" -ne 0 ] && [ "$result" -ne 1 ]; then
         eventSender "MaintenanceMGR" "$MAINT_RFC_ERROR"
diff --git a/lib/rdk/start_ssh.sh b/lib/rdk/start_ssh.sh
index 5ecb13cc..77d52ac8 100755
--- a/lib/rdk/start_ssh.sh
+++ b/lib/rdk/start_ssh.sh
@@ -74,19 +74,12 @@ checkForInterface()
    fi
 }
 
-if [ "BUILD_TYPE" != "dev" ]; then
-    DEVICETYPE=$(tr181 -d Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType 2>&1 > /dev/null)
-    if [ "$DEVICETYPE" = "TEST" ]; then
-        USE_DEVKEYS="-f authorized_keys_dev"
-        echo " dropbear using dev authorization keys"
-    else
-        USE_DEVKEYS=""
-        echo " dropbear using prod authorization keys"
-    fi
-else
+USE_DEVKEYS="-f authorized_keys_dev"
+DEVICETYPE=$(tr181 -g Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType 2>&1)
+if [ "$BUILD_TYPE" = "prod" ] && [ "$DEVICETYPE" = "PROD" ]; then
     USE_DEVKEYS=""
-    echo " Build type is dev , use dev authorization keys by default"
 fi
+
 /bin/systemctl set-environment USE_DEVKEYS="$USE_DEVKEYS"
 
 #RFC check for MOCA SSH enable/not.