diff --git a/CleanSpec.mk b/CleanSpec.mk
index cff019a..51b1305 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -50,3 +50,4 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/phone_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/updatecmds/migrate_nfc.txt)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/keystore.tuna.so)
diff --git a/device.mk b/device.mk
index 8db5e82..f6e49e6 100644
--- a/device.mk
+++ b/device.mk
@@ -58,8 +58,8 @@
 PRODUCT_PACKAGES += \
 	tuna_hdcp_keys
 
-PRODUCT_PACKAGES += \
-	keystore.tuna
+#PRODUCT_PACKAGES += \
+#	keystore.tuna
 
 PRODUCT_COPY_FILES += \
 	$(LOCAL_KERNEL):kernel \