diff --git a/gear/dumpstate/Dumpstate.cpp b/gear/dumpstate/Dumpstate.cpp
index 8abc237..1e4d982 100644
--- a/gear/dumpstate/Dumpstate.cpp
+++ b/gear/dumpstate/Dumpstate.cpp
@@ -154,11 +154,7 @@ ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFile
                                              int64_t in_timeoutMillis) {
     // Unused arguments.
     (void) in_timeoutMillis;
-
-    if (in_mode < IDumpstateDevice::DumpstateMode::FULL || in_mode > IDumpstateDevice::DumpstateMode::PROTO) {
-        ALOGE("Invalid mode: %d\n", in_mode);
-        return ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_ARGUMENT, "Invalid mode");
-    }
+    (void) in_mode;
 
     if (in_fds.size() < 1) {
         ALOGE("no FDs\n");
@@ -175,7 +171,6 @@ ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFile
 
     if (in_fds.size() < 2) {
           ALOGE("no FD for dumpstate_board binary\n");
-          dumpTextSection(fd, "");
     } else {
           int fd_bin = in_fds[1].get();
           dumpLogSection(fd, fd_bin);
diff --git a/gear/dumpstate/sepolicy/file.te b/gear/dumpstate/sepolicy/file.te
index 1777353..6c686a0 100644
--- a/gear/dumpstate/sepolicy/file.te
+++ b/gear/dumpstate/sepolicy/file.te
@@ -1,4 +1,3 @@
-# dumpstate packing directory
 type radio_vendor_data_file, file_type, data_file_type;
 userdebug_or_eng(`
   typeattribute radio_vendor_data_file mlstrustedobject;
diff --git a/gear/dumpstate/sepolicy/file_contexts b/gear/dumpstate/sepolicy/file_contexts
index 086b481..5c65e43 100644
--- a/gear/dumpstate/sepolicy/file_contexts
+++ b/gear/dumpstate/sepolicy/file_contexts
@@ -1,4 +1,3 @@
-# generic dumpstate for pixel
 /vendor/bin/hw/android\.hardware\.dumpstate-service        u:object_r:hal_dumpstate_default_exec:s0
 
 /data/vendor/radio(/.*)?                                   u:object_r:radio_vendor_data_file:s0
diff --git a/gear/dumpstate/sepolicy/hal_dumpstate_default.te b/gear/dumpstate/sepolicy/hal_dumpstate_default.te
index 06ebb75..3e4db45 100644
--- a/gear/dumpstate/sepolicy/hal_dumpstate_default.te
+++ b/gear/dumpstate/sepolicy/hal_dumpstate_default.te
@@ -1,7 +1,5 @@
-# required permission to use tar to pack dumpsate_board.bin
 allow hal_dumpstate_default vendor_toolbox_exec:file execute_no_trans;
 allow hal_dumpstate_default radio_vendor_data_file:dir create_dir_perms;
 allow hal_dumpstate_default radio_vendor_data_file:file create_file_perms;
 allow hal_dumpstate_default shell_data_file:file getattr;
-set_prop(hal_dumpstate_default, vendor_logger_prop)
 
diff --git a/gear/dumpstate/sepolicy/property.te b/gear/dumpstate/sepolicy/property.te
deleted file mode 100644
index c6f5a4f..0000000
--- a/gear/dumpstate/sepolicy/property.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# verbose property
-vendor_internal_prop(vendor_logger_prop)
-
diff --git a/gear/dumpstate/sepolicy/property_contexts b/gear/dumpstate/sepolicy/property_contexts
deleted file mode 100644
index 5ead16f..0000000
--- a/gear/dumpstate/sepolicy/property_contexts
+++ /dev/null
@@ -1,3 +0,0 @@
-# verbose property name
-persist.vendor.verbose_logging_enabled     u:object_r:vendor_logger_prop:s0
-