diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index 67ffbcc..1066fac 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -174,7 +174,6 @@
 
 #Add NON-HLOS files for ota upgrade
 ADD_RADIO_FILES := true
-#TARGET_RECOVERY_UI_LIB := librecovery_ui_msm
 TARGET_RECOVERY_UI_LIB := librecovery_ui_nanohub
 
 #Add support for firmare upgrade on 8996
diff --git a/recovery/miniui/Android.mk b/recovery/miniui/Android.mk
deleted file mode 100644
index ff727d3..0000000
--- a/recovery/miniui/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-ifeq ($(TARGET_RECOVERY_UI_LIB),librecovery_ui_msm)
-ifneq ($(TARGET_SIMULATOR),true)
-ifneq ($(filter arm arm64, $(TARGET_ARCH)),)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := librecovery_ui_msm
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_C_INCLUDES += bootable/recovery
-
-LOCAL_SRC_FILES += msm_recovery_ui.cpp
-
-include $(BUILD_STATIC_LIBRARY)
-endif   # TARGET_ARCH == arm
-endif   # !TARGET_SIMULATOR
-endif
diff --git a/recovery/miniui/msm_recovery_ui.cpp b/recovery/miniui/msm_recovery_ui.cpp
deleted file mode 100644
index 8f29050..0000000
--- a/recovery/miniui/msm_recovery_ui.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-  Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are
-  met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "device.h"
-#include "screen_ui.h"
-
-
-class MSM_Device : public Device
-{
-public:
-  MSM_Device(ScreenRecoveryUI* ui) : Device(ui) {}
-
-  bool PostWipeDevice() {
-    clear_keys_required = true;
-    return true;
-  }
-
-  char const* GetRebootReason() {
-    if (clear_keys_required)
-      return "keys clear";
-    return "";
-  }
-
-private:
-  bool clear_keys_required = false;
-};
-
-Device* make_device() {
-  return new MSM_Device(new ScreenRecoveryUI);
-}
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
index 04d3aa0..756a454 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -170,7 +170,6 @@
 
 #Add NON-HLOS files for ota upgrade
 ADD_RADIO_FILES := true
-#TARGET_RECOVERY_UI_LIB := librecovery_ui_msm
 TARGET_RECOVERY_UI_LIB := librecovery_ui_nanohub
 
 #Add support for firmare upgrade on 8996