diff --git a/powerstats/service.cpp b/powerstats/service.cpp
index 133c9bd..2e43607 100644
--- a/powerstats/service.cpp
+++ b/powerstats/service.cpp
@@ -16,17 +16,14 @@
 
 #define LOG_TAG "android.hardware.power.stats@1.0-service.pixel"
 
-#include <android-base/properties.h>
 #include <android/log.h>
 #include <binder/IPCThreadState.h>
 #include <binder/IServiceManager.h>
-#include <binder/ProcessState.h>
 #include <hidl/HidlTransportSupport.h>
 
 #include <pixelpowerstats/AidlStateResidencyDataProvider.h>
 #include <pixelpowerstats/GenericStateResidencyDataProvider.h>
 #include <pixelpowerstats/PowerStats.h>
-#include <pixelpowerstats/WlanStateResidencyDataProvider.h>
 
 using android::OK;
 using android::sp;
@@ -48,13 +45,10 @@ using android::hardware::google::pixel::powerstats::AidlStateResidencyDataProvid
 using android::hardware::google::pixel::powerstats::GenericStateResidencyDataProvider;
 using android::hardware::google::pixel::powerstats::PowerEntityConfig;
 using android::hardware::google::pixel::powerstats::StateResidencyConfig;
-using android::hardware::google::pixel::powerstats::WlanStateResidencyDataProvider;
 
 int main(int /* argc */, char ** /* argv */) {
     ALOGE("power.stats service 1.0 is starting.");
 
-    bool isDebuggable = android::base::GetBoolProperty("ro.debuggable", false);
-
     PowerStats *service = new PowerStats();
 
     // Add power entities related to rpmh
@@ -113,14 +107,6 @@ int main(int /* argc */, char ** /* argv */) {
 
     service->addStateResidencyDataProvider(socSdp);
 
-    if (isDebuggable) {
-        // Add WLAN power entity
-        uint32_t wlanId = service->addPowerEntity("WLAN", PowerEntityType::SUBSYSTEM);
-        sp<WlanStateResidencyDataProvider> wlanSdp =
-            new WlanStateResidencyDataProvider(wlanId, "/d/wlan0/power_stats");
-        service->addStateResidencyDataProvider(wlanSdp);
-    }
-
     // Add Power Entities that require the Aidl data provider
     sp<AidlStateResidencyDataProvider> aidlSdp = new AidlStateResidencyDataProvider();
     uint32_t citadelId = service->addPowerEntity("Citadel", PowerEntityType::SUBSYSTEM);