diff --git a/libprocessgroup/task_profiles.cpp b/libprocessgroup/task_profiles.cpp
index e1c5934..27060ae 100644
--- a/libprocessgroup/task_profiles.cpp
+++ b/libprocessgroup/task_profiles.cpp
@@ -806,7 +806,6 @@
 
 bool TaskProfiles::SetProcessProfiles(uid_t uid, pid_t pid,
                                       const std::vector<std::string>& profiles, bool use_fd_cache) {
-    bool success = true;
     for (const auto& name : profiles) {
         TaskProfile* profile = GetProfile(name);
         if (profile != nullptr) {
@@ -815,19 +814,16 @@
             }
             if (!profile->ExecuteForProcess(uid, pid)) {
                 PLOG(WARNING) << "Failed to apply " << name << " process profile";
-                success = false;
             }
         } else {
-            PLOG(WARNING) << "Failed to find " << name << " process profile";
-            success = false;
+            PLOG(WARNING) << "Failed to find " << name << "process profile";
         }
     }
-    return success;
+    return true;
 }
 
 bool TaskProfiles::SetTaskProfiles(int tid, const std::vector<std::string>& profiles,
                                    bool use_fd_cache) {
-    bool success = true;
     for (const auto& name : profiles) {
         TaskProfile* profile = GetProfile(name);
         if (profile != nullptr) {
@@ -836,12 +832,10 @@
             }
             if (!profile->ExecuteForTask(tid)) {
                 PLOG(WARNING) << "Failed to apply " << name << " task profile";
-                success = false;
             }
         } else {
-            PLOG(WARNING) << "Failed to find " << name << " task profile";
-            success = false;
+            PLOG(WARNING) << "Failed to find " << name << "task profile";
         }
     }
-    return success;
+    return true;
 }
