diff --git a/libweave/src/device_manager.cc b/libweave/src/device_manager.cc
index 46d5de9..f5fecf5 100644
--- a/libweave/src/device_manager.cc
+++ b/libweave/src/device_manager.cc
@@ -42,8 +42,6 @@
   std::unique_ptr<Config> config{new Config{config_store}};
   config->Load();
 
-  // TODO(avakulenko): Figure out security implications of storing
-  // device info state data unencrypted.
   device_info_.reset(new DeviceRegistrationInfo(
       command_manager_, state_manager_, std::move(config), task_runner,
       http_client, network));