1 files changed, 3 insertions, 46 deletions

diff --git a/src/components/policy/policy_external/src/policy_helper.cc b/src/components/policy/policy_external/src/policy_helper.cc
index 4607c3ca5f..e6605aed3a 100644
--- a/src/components/policy/policy_external/src/policy_helper.cc
+++ b/src/components/policy/policy_external/src/policy_helper.cc
@@ -102,25 +102,6 @@ bool CompareGroupName::operator()(
   return !(strcasecmp(gn_.c_str(), gn_compare.c_str()));
 }
 
-bool operator!=(const policy_table::ApplicationParams& first,
-                const policy_table::ApplicationParams& second) {
-  if (first.groups.size() != second.groups.size()) {
-    return true;
-  }
-  StringsConstItr it_first = first.groups.begin();
-  StringsConstItr it_first_end = first.groups.end();
-  StringsConstItr it_second = second.groups.begin();
-  StringsConstItr it_second_end = second.groups.end();
-  for (; it_first != it_first_end; ++it_first) {
-    CompareGroupName gp(*it_first);
-    StringsConstItr it = std::find_if(it_second, it_second_end, gp);
-    if (it_second_end == it) {
-      return true;
-    }
-  }
-  return false;
-}
-
 CheckAppPolicy::CheckAppPolicy(
     PolicyManagerImpl* pm,
     const std::shared_ptr<policy_table::Table> update,
@@ -607,7 +588,6 @@ bool CheckAppPolicy::IsConsentRequired(const std::string& app_id,
     return false;
   }
 
-  bool is_preconsented = false;
   policy_table::Strings::value_type str(group_name);
   policy_table::Strings::iterator pre_begin =
       update_->policy_table.app_policies_section.apps[app_id]
@@ -618,7 +598,7 @@ bool CheckAppPolicy::IsConsentRequired(const std::string& app_id,
 
   policy_table::Strings::iterator it2 = std::find(pre_begin, pre_end, str);
 
-  is_preconsented = pre_end != it2;
+  bool is_preconsented = pre_end != it2;
 
   return it->second.user_consent_prompt.is_initialized() && !is_preconsented;
 }
@@ -768,7 +748,7 @@ bool CheckAppPolicy::IsEncryptionRequiredFlagChanged(
     return result;
   };
 
-  auto get_app_rpcs = [](const std::string group_name,
+  auto get_app_rpcs = [](const std::string& group_name,
                          const FunctionalGroupings& groups)
       -> rpc::Optional<policy_table::Rpcs> {
     auto it = groups.find(group_name);
@@ -953,8 +933,7 @@ void FillNotificationData::UpdateParameters(
 
   // If 'parameters' section is omitted
   if (!in_parameters.is_initialized()) {
-    if (!does_require_user_consent_ ||
-        (does_require_user_consent_ && kAllowedKey == current_key_)) {
+    if (!does_require_user_consent_ || kAllowedKey == current_key_) {
       out_parameter.any_parameter_allowed = true;
     }
   }
@@ -1251,28 +1230,6 @@ FunctionalGroupIDs Merge(const FunctionalGroupIDs& first,
   return merged;
 }
 
-FunctionalGroupIDs FindSame(const FunctionalGroupIDs& first,
-                            const FunctionalGroupIDs& second) {
-  SDL_LOG_INFO("Find same groups");
-  FunctionalGroupIDs first_copy(first);
-  FunctionalGroupIDs second_copy(second);
-
-  std::sort(first_copy.begin(), first_copy.end());
-  std::sort(second_copy.begin(), second_copy.end());
-
-  FunctionalGroupIDs same;
-  std::set_intersection(first_copy.begin(),
-                        first_copy.end(),
-                        second_copy.begin(),
-                        second_copy.end(),
-                        std::back_inserter(same));
-
-  same.resize(
-      std::distance(same.begin(), std::unique(same.begin(), same.end())));
-
-  return same;
-}
-
 bool UnwrapAppPolicies(policy_table::ApplicationPolicies& app_policies) {
   policy_table::ApplicationPolicies::iterator it_default =
       app_policies.find(kDefaultId);