diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a22885e..e2b5ec4 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -47,7 +47,6 @@ DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml
 # Kernel
 BOARD_KERNEL_BASE := 0x00000000
 BOARD_KERNEL_CMDLINE := console=null androidboot.hardware=qcom user_debug=23 msm_rtb.filter=0x37 zcache.enabled=1 maxcpus=1
-BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 BOARD_KERNEL_IMAGE_NAME := zImage
 BOARD_KERNEL_PAGESIZE := 2048
 BOARD_KERNEL_SEPARATED_DT := true
@@ -98,7 +97,6 @@ TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom
 TARGET_RECOVERY_DENSITY := hdpi
 
 # SELinux
-CONFIG_MATISSE_SEPOLICY_TYPE := temporary
 include $(COMMON_PATH)/sepolicy/sepolicy.mk
 
 # Sensors
diff --git a/sepolicy/sepolicy.mk b/sepolicy/sepolicy.mk
index 39f29eb..5f08ec5 100644
--- a/sepolicy/sepolicy.mk
+++ b/sepolicy/sepolicy.mk
@@ -15,10 +15,5 @@
 #
 
 # Board specific SELinux policy variable definitions
-ifeq ($(CONFIG_MATISSE_SEPOLICY_TYPE), temporary)
-BOARD_SEPOLICY_DIRS += \
-    device/samsung/matisse-common/sepolicy/temporary
-else
 BOARD_SEPOLICY_DIRS += \
     device/samsung/matisse-common/sepolicy/common
-endif
diff --git a/sepolicy/temporary/file.te b/sepolicy/temporary/file.te
deleted file mode 100644
index 9bbdb2e..0000000
--- a/sepolicy/temporary/file.te
+++ /dev/null
@@ -1 +0,0 @@
-type tmp_root_mount_file, file_type;
diff --git a/sepolicy/temporary/file_contexts b/sepolicy/temporary/file_contexts
deleted file mode 100644
index 538bc39..0000000
--- a/sepolicy/temporary/file_contexts
+++ /dev/null
@@ -1,6 +0,0 @@
-# firmware files
-/bt_firmware(/.*)?	    u:object_r:tmp_root_mount_file:s0
-/firmware(/.*)?		    u:object_r:tmp_root_mount_file:s0
-/firmware-modem(/.*)?	u:object_r:tmp_root_mount_file:s0
-/persist(/.*)?		    u:object_r:tmp_root_mount_file:s0
-/tombstones(/.*)?	    u:object_r:tmp_root_mount_file:s0