Remove Deprecated Methods For SDL Core 8.0.0 (#3735)

* Remove deprecated methods

* Style

* Fix external policy build

66 files changed, 7 insertions, 577 deletions

diff --git a/src/components/application_manager/include/application_manager/app_launch/app_launch_data_json.h b/src/components/application_manager/include/application_manager/app_launch/app_launch_data_json.h
index 9e60183960..dba2579f8f 100644
--- a/src/components/application_manager/include/application_manager/app_launch/app_launch_data_json.h
+++ b/src/components/application_manager/include/application_manager/app_launch/app_launch_data_json.h
@@ -54,10 +54,6 @@ class AppLaunchDataJson : public AppLaunchDataImpl {
   AppLaunchDataJson(const AppLaunchSettings& settings,
                     resumption::LastStateWrapperPtr last_state_wrapper);
 
-  DEPRECATED
-  AppLaunchDataJson(const AppLaunchSettings& settings,
-                    resumption::LastState& last_state);
-
   /**
    * @brief allows to destroy AppLaunchDataJson object
    */
@@ -99,10 +95,6 @@ class AppLaunchDataJson : public AppLaunchDataImpl {
                                           int32_t& found_index,
                                           Json::Value& dictionary) const;
 
-  DEPRECATED
-  Json::Value& GetApplicationListAndIndex(const ApplicationData& app_data,
-                                          int32_t& founded_index) const;
-
  private:
   /**
    * @brief update time stamp
diff --git a/src/components/application_manager/include/application_manager/app_service_manager.h b/src/components/application_manager/include/application_manager/app_service_manager.h
index 94606909c6..e3a5f64602 100644
--- a/src/components/application_manager/include/application_manager/app_service_manager.h
+++ b/src/components/application_manager/include/application_manager/app_service_manager.h
@@ -65,9 +65,6 @@ class AppServiceManager {
   AppServiceManager(ApplicationManager& app_manager,
                     resumption::LastStateWrapperPtr last_state);
 
-  DEPRECATED AppServiceManager(ApplicationManager& app_manager,
-                               resumption::LastState& last_state);
-
   /**
    * @brief Class destructor
    */
diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h
index bc966cd00c..f25afeb2bc 100644
--- a/src/components/application_manager/include/application_manager/application.h
+++ b/src/components/application_manager/include/application_manager/application.h
@@ -372,12 +372,6 @@ class DynamicApplicationData {
   virtual smart_objects::SmartObject FindSubMenu(uint32_t menu_id) const = 0;
 
   /*
-   * @brief Returns true if sub menu with such name already exist
-   */
-  DEPRECATED virtual bool IsSubMenuNameAlreadyExist(
-      const std::string& name, const uint32_t parent_id) = 0;
-
-  /*
    * @brief Adds a interaction choice set to the application
    *
    * @param choice_set_id Unique ID used for this interaction choice set
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h
index 9191a06c6b..a8a41bc23a 100644
--- a/src/components/application_manager/include/application_manager/application_manager_impl.h
+++ b/src/components/application_manager/include/application_manager/application_manager_impl.h
@@ -159,10 +159,6 @@ class ApplicationManagerImpl
                          const policy::PolicySettings& policy_settings);
   ~ApplicationManagerImpl();
 
-  DEPRECATED
-  bool Init(resumption::LastState&,
-            media_manager::MediaManager* media_manager) OVERRIDE;
-
   /**
    * Inits application manager
    */
@@ -189,8 +185,6 @@ class ApplicationManagerImpl
       uint32_t hmi_app_id) const OVERRIDE;
   ApplicationSharedPtr application_by_policy_id(
       const std::string& policy_app_id) const OVERRIDE;
-  DEPRECATED ApplicationSharedPtr
-  application_by_name(const std::string& app_name) const OVERRIDE;
   ApplicationSharedPtr pending_application_by_policy_id(
       const std::string& policy_app_id) const OVERRIDE;
   ApplicationSharedPtr reregister_application_by_policy_id(
@@ -858,9 +852,6 @@ class ApplicationManagerImpl
    */
   void EndNaviServices(uint32_t app_id) OVERRIDE;
 
-  DEPRECATED
-  void ForbidStreaming(uint32_t app_id) OVERRIDE;
-
   void ForbidStreaming(uint32_t app_id,
                        protocol_handler::ServiceType service_type) OVERRIDE;
 
@@ -875,10 +866,6 @@ class ApplicationManagerImpl
                       protocol_handler::ServiceType service_type,
                       bool state) OVERRIDE;
 
-  void OnAppStreaming(uint32_t app_id,
-                      protocol_handler::ServiceType service_type,
-                      const Application::StreamingState new_state) OVERRIDE;
-
   mobile_api::HMILevel::eType GetDefaultHmiLevel(
       ApplicationConstSharedPtr application) const;
 
diff --git a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
index f646c66ca1..9a22b2a4aa 100644
--- a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
+++ b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
@@ -257,9 +257,6 @@ class HMICapabilitiesImpl : public HMICapabilities {
 
   void Init(resumption::LastStateWrapperPtr last_state_wrapper) OVERRIDE;
 
-  DEPRECATED
-  void Init(resumption::LastState* last_state) OVERRIDE;
-
   HMILanguageHandler& get_hmi_language_handler() OVERRIDE;
 
   void set_handle_response_for(
diff --git a/src/components/application_manager/include/application_manager/hmi_language_handler.h b/src/components/application_manager/include/application_manager/hmi_language_handler.h
index 2ef034450d..5db5a844da 100644
--- a/src/components/application_manager/include/application_manager/hmi_language_handler.h
+++ b/src/components/application_manager/include/application_manager/hmi_language_handler.h
@@ -96,9 +96,6 @@ class HMILanguageHandler : public event_engine::EventObserver {
                                           hmi_apis::Common_Language::eType vr,
                                           hmi_apis::Common_Language::eType tts);
 
-  DEPRECATED
-  void Init(resumption::LastState*);
-
   void Init(resumption::LastStateWrapperPtr value);
 
   /**
diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h
index 88f91d14fc..0c7538e809 100644
--- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h
+++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h
@@ -86,13 +86,6 @@ class RPCPlugin {
                     policy::PolicyHandlerInterface& policy_handler,
                     resumption::LastStateWrapperPtr last_state) = 0;
 
-  DEPRECATED
-  virtual bool Init(ApplicationManager& app_manager,
-                    rpc_service::RPCService& rpc_service,
-                    HMICapabilities& hmi_capabilities,
-                    policy::PolicyHandlerInterface& policy_handler,
-                    resumption::LastState& last_state) = 0;
-
   /**
    * @brief IsAbleToProcess check if plugin is able to process function
    * @param function_id RPC identifier
diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h
index 004d6418f5..a447034d86 100644
--- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h
+++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h
@@ -59,13 +59,6 @@ class RPCPluginManagerImpl : public RPCPluginManager {
                        policy::PolicyHandlerInterface& policy_handler,
                        resumption::LastStateWrapperPtr last_state);
 
-  DEPRECATED
-  RPCPluginManagerImpl(ApplicationManager& app_manager,
-                       rpc_service::RPCService& rpc_service,
-                       HMICapabilities& hmi_capabilities,
-                       policy::PolicyHandlerInterface& policy_handler,
-                       resumption::LastState& last_state);
-
   uint32_t LoadPlugins(const std::string& plugins_path) OVERRIDE;
 
   utils::Optional<RPCPlugin> FindPluginToProcess(
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index acf4ca7819..662e255871 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -86,8 +86,6 @@ class PolicyHandler : public PolicyHandlerInterface,
   bool InitPolicyTable() OVERRIDE;
   bool ResetPolicyTable() OVERRIDE;
   bool ClearUserConsent() OVERRIDE;
-  DEPRECATED bool SendMessageToSDK(const BinaryMessage& pt_string,
-                                   const std::string& url) OVERRIDE;
   bool ReceiveMessageFromSDK(const std::string& file,
                              const BinaryMessage& pt_string) OVERRIDE;
   bool UnloadPolicyLibrary() OVERRIDE;
diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h
index 456eccd29c..4cc42699bc 100644
--- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h
+++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h
@@ -276,9 +276,6 @@ class ResumeCtrl {
    */
   virtual void RemoveFromResumption(uint32_t app_id) = 0;
 
-  DEPRECATED
-  virtual bool Init(resumption::LastState& last_state) = 0;
-
   /**
    * @brief Initialization data for Resume controller
    * @return true if initialization is success otherwise
diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h
index 9c529b5f9a..b93b914a48 100644
--- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h
+++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h
@@ -256,8 +256,6 @@ class ResumeCtrlImpl : public ResumeCtrl {
    */
   void RemoveFromResumption(uint32_t app_id) OVERRIDE;
 
-  DEPRECATED bool Init(resumption::LastState& last_state) FINAL;
-
   /**
    * @brief Initialization data for Resume controller
    * @return true if initialization is success otherwise
diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h
index 2394fe00dc..f33ef83a9b 100644
--- a/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h
+++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h
@@ -52,11 +52,6 @@ class ResumptionDataJson : public ResumptionData {
       resumption::LastStateWrapperPtr last_state_wrapper,
       const application_manager::ApplicationManager& application_manager);
 
-  DEPRECATED
-  ResumptionDataJson(
-      LastState&,
-      const application_manager::ApplicationManager& application_manager);
-
   /**
    * @brief allows to destroy ResumptionDataJson object
    */
@@ -180,9 +175,6 @@ class ResumptionDataJson : public ResumptionData {
    */
   void Persist() OVERRIDE;
 
-  DEPRECATED
-  resumption::LastState& last_state() const;
-
  private:
   /**
    * @brief GetFromSavedOrAppend allows to get existed record about application
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_rpc_plugin.h b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_rpc_plugin.h
index 444636ed75..bae4738524 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_rpc_plugin.h
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_rpc_plugin.h
@@ -50,13 +50,6 @@ class AppServiceRpcPlugin : public plugins::RPCPlugin {
             policy::PolicyHandlerInterface& policy_handler,
             resumption::LastStateWrapperPtr last_state) OVERRIDE;
 
-  DEPRECATED
-  bool Init(app_mngr::ApplicationManager& application_manager,
-            app_mngr::rpc_service::RPCService& rpc_service,
-            app_mngr::HMICapabilities& hmi_capabilities,
-            policy::PolicyHandlerInterface& policy_handler,
-            resumption::LastState& last_state);
-
   bool IsAbleToProcess(
       const int32_t function_id,
       const app_mngr::commands::Command::CommandSource source) OVERRIDE;
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_rpc_plugin.cc
index e03973614d..0e805da46c 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_rpc_plugin.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_rpc_plugin.cc
@@ -58,18 +58,6 @@ bool AppServiceRpcPlugin::Init(
   return true;
 }
 
-bool AppServiceRpcPlugin::Init(app_mngr::ApplicationManager& app_manager,
-                               app_mngr::rpc_service::RPCService& rpc_service,
-                               app_mngr::HMICapabilities& hmi_capabilities,
-                               policy::PolicyHandlerInterface& policy_handler,
-                               resumption::LastState& last_state) {
-  UNUSED(last_state);
-  application_manager_ = &app_manager;
-  command_factory_.reset(new app_service_rpc_plugin::AppServiceCommandFactory(
-      app_manager, rpc_service, hmi_capabilities, policy_handler));
-  return true;
-}
-
 bool AppServiceRpcPlugin::IsAbleToProcess(
     const int32_t function_id, const commands::Command::CommandSource source) {
   return command_factory_->IsAbleToProcess(function_id, source);
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_consent_manager_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_consent_manager_impl.h
index 5cbc4b977e..fd8c40405e 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_consent_manager_impl.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_consent_manager_impl.h
@@ -50,12 +50,6 @@ class RCConsentManagerImpl : public RCConsentManager {
       application_manager::ApplicationManager& application_manager,
       const uint32_t period_of_consent_expired);
 
-  DEPRECATED
-  RCConsentManagerImpl(
-      resumption::LastState& last_state,
-      application_manager::ApplicationManager& application_manager,
-      const uint32_t period_of_consent_expired);
-
   void SaveModuleConsents(
       const std::string& policy_app_id,
       const std::string& mac_address,
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h
index 528e116403..c1f7339aa3 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h
@@ -65,12 +65,6 @@ class RCRPCPlugin : public plugins::RPCPlugin {
             policy::PolicyHandlerInterface& policy_handler,
             resumption::LastStateWrapperPtr last_state) OVERRIDE;
 
-  DEPRECATED
-  bool Init(app_mngr::ApplicationManager& app_manager,
-            app_mngr::rpc_service::RPCService& rpc_service,
-            app_mngr::HMICapabilities& hmi_capabilities,
-            policy::PolicyHandlerInterface& policy_handler,
-            resumption::LastState& last_state) OVERRIDE;
   /**
    * @param int32_t command id
    * @param CommandSource source
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc
index 87090405e7..8250437e78 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc
@@ -86,14 +86,6 @@ bool RCRPCPlugin::Init(
   return true;
 }
 
-bool RCRPCPlugin::Init(application_manager::ApplicationManager&,
-                       application_manager::rpc_service::RPCService&,
-                       application_manager::HMICapabilities&,
-                       policy::PolicyHandlerInterface&,
-                       resumption::LastState&) {
-  return false;
-}
-
 bool RCRPCPlugin::IsAbleToProcess(
     const int32_t function_id,
     const application_manager::commands::Command::CommandSource
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h
index b4ef7e6aed..ab74ed08fb 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h
@@ -54,13 +54,6 @@ class SDLRPCPlugin : public plugins::RPCPlugin {
             policy::PolicyHandlerInterface& policy_handler,
             resumption::LastStateWrapperPtr last_state) OVERRIDE;
 
-  DEPRECATED
-  bool Init(app_mngr::ApplicationManager& app_manager,
-            app_mngr::rpc_service::RPCService& rpc_service,
-            app_mngr::HMICapabilities& hmi_capabilities,
-            policy::PolicyHandlerInterface& policy_handler,
-            resumption::LastState& last_state) OVERRIDE;
-
   /**
    * @brief ProcessResumptionSubscription send appropriate subscribe requests
    * to HMI
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc
index c5bc79f09d..7cdfc73ed0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc
@@ -61,18 +61,6 @@ bool SDLRPCPlugin::Init(app_mngr::ApplicationManager& app_manager,
   return true;
 }
 
-bool SDLRPCPlugin::Init(
-    application_manager::ApplicationManager& app_manager,
-    application_manager::rpc_service::RPCService& rpc_service,
-    application_manager::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler,
-    resumption::LastState& last_state) {
-  UNUSED(last_state);
-  command_factory_.reset(new sdl_rpc_plugin::SDLCommandFactory(
-      app_manager, rpc_service, hmi_capabilities, policy_handler));
-  return true;
-}
-
 bool SDLRPCPlugin::IsAbleToProcess(
     const int32_t function_id,
     const app_mngr::commands::Command::CommandSource message_source) {
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
index 1910a9efdf..8c67bc1d10 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
@@ -55,13 +55,6 @@ class VehicleInfoPlugin : public plugins::RPCPlugin {
             policy::PolicyHandlerInterface& policy_handler,
             resumption::LastStateWrapperPtr last_state) OVERRIDE;
 
-  DEPRECATED
-  bool Init(app_mngr::ApplicationManager& application_manager,
-            app_mngr::rpc_service::RPCService& rpc_service,
-            app_mngr::HMICapabilities& hmi_capabilities,
-            policy::PolicyHandlerInterface& policy_handler,
-            resumption::LastState& last_state) OVERRIDE;
-
   bool IsAbleToProcess(
       const int32_t function_id,
       const app_mngr::commands::Command::CommandSource source) OVERRIDE;
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc
index 1a357a86ee..b20e52636c 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc
@@ -88,25 +88,6 @@ bool VehicleInfoPlugin::Init(
   return true;
 }
 
-bool VehicleInfoPlugin::Init(
-    application_manager::ApplicationManager& application_manager,
-    application_manager::rpc_service::RPCService& rpc_service,
-    application_manager::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler,
-    resumption::LastState& last_state) {
-  UNUSED(last_state);
-  application_manager_ = &application_manager;
-  custom_vehicle_data_manager_.reset(
-      new CustomVehicleDataManagerImpl(policy_handler, rpc_service));
-  command_factory_.reset(new vehicle_info_plugin::VehicleInfoCommandFactory(
-      application_manager,
-      rpc_service,
-      hmi_capabilities,
-      policy_handler,
-      *(custom_vehicle_data_manager_.get())));
-  return true;
-}
-
 bool VehicleInfoPlugin::IsAbleToProcess(
     const int32_t function_id, const commands::Command::CommandSource source) {
   return command_factory_->IsAbleToProcess(function_id, source);
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index d2104dbf1a..884b5df0ee 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -304,13 +304,6 @@ ApplicationSharedPtr ApplicationManagerImpl::pending_application_by_policy_id(
   return FindPendingApp(accessor, finder);
 }
 
-ApplicationSharedPtr ApplicationManagerImpl::application_by_name(
-    const std::string& app_name) const {
-  AppNamePredicate finder(app_name);
-  DataAccessor<ApplicationSet> accessor = applications();
-  return FindApp(accessor, finder);
-}
-
 ApplicationSharedPtr
 ApplicationManagerImpl::reregister_application_by_policy_id(
     const std::string& policy_app_id) const {
@@ -2502,11 +2495,6 @@ void ApplicationManagerImpl::RemoveHMIFakeParameters(
   (*message)[jhs::S_PARAMS][jhs::S_FUNCTION_ID] = mobile_function_id;
 }
 
-bool ApplicationManagerImpl::Init(resumption::LastState&,
-                                  media_manager::MediaManager*) {
-  return false;
-}
-
 bool ApplicationManagerImpl::Init(
     resumption::LastStateWrapperPtr last_state_wrapper,
     media_manager::MediaManager* media_manager) {
@@ -3515,53 +3503,6 @@ bool ApplicationManagerImpl::CanAppStream(
   return HMIStateAllowsStreaming(app_id, service_type) && is_allowed;
 }
 
-void ApplicationManagerImpl::ForbidStreaming(uint32_t app_id) {
-  using namespace mobile_apis::AppInterfaceUnregisteredReason;
-  using namespace mobile_apis::Result;
-
-  SDL_LOG_AUTO_TRACE();
-
-  ApplicationSharedPtr app = application(app_id);
-  if (!app || (!app->is_navi() && !app->mobile_projection_enabled())) {
-    SDL_LOG_DEBUG(
-        "There is no navi or projection application with id: " << app_id);
-    return;
-  }
-
-  {
-    sync_primitives::AutoLock lock(navi_app_to_stop_lock_);
-    if (navi_app_to_stop_.end() != std::find(navi_app_to_stop_.begin(),
-                                             navi_app_to_stop_.end(),
-                                             app_id) ||
-        navi_app_to_end_stream_.end() !=
-            std::find(navi_app_to_end_stream_.begin(),
-                      navi_app_to_end_stream_.end(),
-                      app_id)) {
-      return;
-    }
-  }
-
-  bool unregister = false;
-  {
-    sync_primitives::AutoLock lock(navi_service_status_lock_);
-
-    NaviServiceStatusMap::iterator it = navi_service_status_.find(app_id);
-    if (navi_service_status_.end() == it ||
-        (!it->second.first && !it->second.second)) {
-      unregister = true;
-    }
-  }
-  if (unregister) {
-    rpc_service_->ManageMobileCommand(
-        MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
-            app_id, PROTOCOL_VIOLATION),
-        commands::Command::SOURCE_SDL);
-    UnregisterApplication(app_id, ABORTED);
-    return;
-  }
-  EndNaviServices(app_id);
-}
-
 void ApplicationManagerImpl::ForbidStreaming(
     uint32_t app_id, protocol_handler::ServiceType service_type) {
   using namespace mobile_apis::AppInterfaceUnregisteredReason;
@@ -3645,48 +3586,6 @@ void ApplicationManagerImpl::OnAppStreaming(
   }
 }
 
-void ApplicationManagerImpl::OnAppStreaming(
-    uint32_t app_id,
-    protocol_handler::ServiceType service_type,
-    const Application::StreamingState new_state) {
-  SDL_LOG_AUTO_TRACE();
-
-  ApplicationSharedPtr app = application(app_id);
-  if (!app || (!app->is_navi() && !app->mobile_projection_enabled())) {
-    SDL_LOG_DEBUG(
-        " There is no navi or projection application with id: " << app_id);
-    return;
-  }
-  DCHECK_OR_RETURN_VOID(media_manager_);
-
-  SDL_LOG_DEBUG("New state for service " << static_cast<int32_t>(service_type)
-                                         << " is "
-                                         << static_cast<int32_t>(new_state));
-  switch (new_state) {
-    case Application::StreamingState::kStopped: {
-      // Stop activity in media_manager_ when service is stopped
-      // State controller has been already notified by kSuspended event
-      // received before
-      media_manager_->StopStreaming(app_id, service_type);
-      break;
-    }
-
-    case Application::StreamingState::kStarted: {
-      // Apply temporary streaming state and start activity in media_manager_
-      state_ctrl_.OnVideoStreamingStarted(app);
-      media_manager_->StartStreaming(app_id, service_type);
-      break;
-    }
-
-    case Application::StreamingState::kSuspended: {
-      // Don't stop activity in media_manager_ in that case
-      // Just cancel the temporary streaming state
-      state_ctrl_.OnVideoStreamingStopped(app);
-      break;
-    }
-  }
-}
-
 void ApplicationManagerImpl::EndNaviServices(uint32_t app_id) {
   using namespace protocol_handler;
   SDL_LOG_AUTO_TRACE();
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc
index f313e0c0a5..a8001eba91 100644
--- a/src/components/application_manager/src/hmi_capabilities_impl.cc
+++ b/src/components/application_manager/src/hmi_capabilities_impl.cc
@@ -431,8 +431,6 @@ void HMICapabilitiesImpl::Init(
       ui_language_, vr_language_, tts_language_);
 }
 
-void HMICapabilitiesImpl::Init(resumption::LastState*) {}
-
 bool HMICapabilitiesImpl::is_ui_cooperating() const {
   return is_ui_cooperating_;
 }
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index c0d61bdd4e..c8c2a25a6d 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -1237,12 +1237,6 @@ void PolicyHandler::OnPendingPermissionChange(
 }
 
 bool PolicyHandler::SendMessageToSDK(const BinaryMessage& pt_string,
-                                     const std::string& url) {
-  const uint32_t app_id = GetAppIdForSending();
-  return SendMessageToSDK(pt_string, url, app_id);
-}
-
-bool PolicyHandler::SendMessageToSDK(const BinaryMessage& pt_string,
                                      const std::string& url,
                                      const uint32_t app_id) {
   SDL_LOG_AUTO_TRACE();
diff --git a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
index bc373d48c9..96870c12c1 100644
--- a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
+++ b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
@@ -283,10 +283,6 @@ void ResumeCtrlImpl::RemoveFromResumption(uint32_t app_id) {
   queue_lock_.Release();
 }
 
-bool ResumeCtrlImpl::Init(LastState&) {
-  return false;
-}
-
 bool ResumeCtrlImpl::SetAppHMIState(
     ApplicationSharedPtr application,
     const mobile_apis::HMILevel::eType hmi_level,
diff --git a/src/components/application_manager/src/resumption/resumption_data_json.cc b/src/components/application_manager/src/resumption/resumption_data_json.cc
index 1f2d0f116f..5d6d008911 100644
--- a/src/components/application_manager/src/resumption/resumption_data_json.cc
+++ b/src/components/application_manager/src/resumption/resumption_data_json.cc
@@ -573,8 +573,4 @@ void ResumptionDataJson::Persist() {
   last_state_wrapper_->get_accessor().GetMutableData().SaveToFileSystem();
 }
 
-LastState& ResumptionDataJson::last_state() const {
-  return last_state_wrapper_->get_accessor().GetMutableData();
-}
-
 }  // namespace resumption
diff --git a/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h b/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
index e40197cc13..f0da952d18 100644
--- a/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
+++ b/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
@@ -205,9 +205,6 @@ class MockHMICapabilities : public ::application_manager::HMICapabilities {
       set_seat_location_capability,
       void(const smart_objects::SmartObject& seat_location_capability));
 
-  DEPRECATED
-  MOCK_METHOD1(Init, void(resumption::LastState* last_state));
-
   MOCK_METHOD1(Init, void(resumption::LastStateWrapperPtr last_state_wrapper));
 
   MOCK_CONST_METHOD0(ccpu_version, const std::string&());
diff --git a/src/components/application_manager/test/include/application_manager/mock_resume_ctrl.h b/src/components/application_manager/test/include/application_manager/mock_resume_ctrl.h
index c2c02a1d0c..ed7d08e850 100644
--- a/src/components/application_manager/test/include/application_manager/mock_resume_ctrl.h
+++ b/src/components/application_manager/test/include/application_manager/mock_resume_ctrl.h
@@ -86,8 +86,7 @@ class MockResumeCtrl : public resumption::ResumeCtrl {
   MOCK_METHOD1(OnAppActivated,
                void(app_mngr::ApplicationSharedPtr application));
   MOCK_METHOD1(RemoveFromResumption, void(uint32_t app_id));
-  DEPRECATED
-  MOCK_METHOD1(Init, bool(resumption::LastState& last_state));
+
   MOCK_METHOD1(Init, bool(resumption::LastStateWrapperPtr last_state));
   MOCK_METHOD2(OnAppRegistrationStart,
                void(const std::string& policy_app_id,
diff --git a/src/components/include/application_manager/application_manager.h b/src/components/include/application_manager/application_manager.h
index 54f7ab9f05..ef4da3e2d8 100644
--- a/src/components/include/application_manager/application_manager.h
+++ b/src/components/include/application_manager/application_manager.h
@@ -135,10 +135,6 @@ class ApplicationManager {
  public:
   virtual ~ApplicationManager() {}
 
-  DEPRECATED
-  virtual bool Init(resumption::LastState&,
-                    media_manager::MediaManager* media_manager) = 0;
-
   /**
    * Inits application manager
    */
@@ -210,9 +206,6 @@ class ApplicationManager {
   virtual ApplicationSharedPtr application_by_policy_id(
       const std::string& policy_app_id) const = 0;
 
-  DEPRECATED virtual ApplicationSharedPtr application_by_name(
-      const std::string& app_name) const = 0;
-
   virtual ApplicationSharedPtr pending_application_by_policy_id(
       const std::string& policy_app_id) const = 0;
 
@@ -867,11 +860,6 @@ class ApplicationManager {
                               protocol_handler::ServiceType service_type,
                               bool state) = 0;
 
-  DEPRECATED
-  virtual void OnAppStreaming(uint32_t app_id,
-                              protocol_handler::ServiceType service_type,
-                              const Application::StreamingState new_state) = 0;
-
   /**
    * @brief CreateRegularState create regular HMI state for application
    * @param app Application
@@ -899,9 +887,6 @@ class ApplicationManager {
   virtual bool CanAppStream(
       uint32_t app_id, protocol_handler::ServiceType service_type) const = 0;
 
-  DEPRECATED
-  virtual void ForbidStreaming(uint32_t app_id) = 0;
-
   /**
    * @brief ForbidStreaming forbid the stream over the certain application.
    * @param app_id the application's id which should stop streaming.
diff --git a/src/components/include/application_manager/hmi_capabilities.h b/src/components/include/application_manager/hmi_capabilities.h
index e7d7aa485b..93f3db76cb 100644
--- a/src/components/include/application_manager/hmi_capabilities.h
+++ b/src/components/include/application_manager/hmi_capabilities.h
@@ -519,9 +519,6 @@ class HMICapabilities {
   virtual const smart_objects::SmartObjectSPtr seat_location_capability()
       const = 0;
 
-  DEPRECATED
-  virtual void Init(resumption::LastState* last_state) = 0;
-
   virtual void Init(resumption::LastStateWrapperPtr last_state_wrapper) = 0;
 
   /**
diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h
index 7ada7884bf..d79c059b34 100644
--- a/src/components/include/application_manager/policies/policy_handler_interface.h
+++ b/src/components/include/application_manager/policies/policy_handler_interface.h
@@ -77,9 +77,7 @@ class PolicyHandlerInterface : public VehicleDataItemProvider {
   virtual bool InitPolicyTable() = 0;
   virtual bool ResetPolicyTable() = 0;
   virtual bool ClearUserConsent() = 0;
-  // Deprecated in favor of private variant
-  DEPRECATED virtual bool SendMessageToSDK(const BinaryMessage& pt_string,
-                                           const std::string& url) = 0;
+
   virtual bool ReceiveMessageFromSDK(const std::string& file,
                                      const BinaryMessage& pt_string) = 0;
   virtual bool UnloadPolicyLibrary() = 0;
diff --git a/src/components/include/media_manager/media_manager.h b/src/components/include/media_manager/media_manager.h
index 1ecdb12257..60c93843d1 100644
--- a/src/components/include/media_manager/media_manager.h
+++ b/src/components/include/media_manager/media_manager.h
@@ -42,13 +42,6 @@ namespace media_manager {
 
 class MediaManager {
  public:
-  DEPRECATED virtual void PlayA2DPSource(int32_t application_key) = 0;
-  DEPRECATED virtual void StopA2DPSource(int32_t application_key) = 0;
-
-  DEPRECATED virtual void StartMicrophoneRecording(
-      int32_t application_key,
-      const std::string& outputFileName,
-      int32_t duration) = 0;
   virtual void StartMicrophoneRecording(
       int32_t application_key,
       const std::string& outputFileName,
diff --git a/src/components/include/policy/policy_external/policy/policy_manager.h b/src/components/include/policy/policy_external/policy/policy_manager.h
index d9844c153b..5d57d5ca45 100644
--- a/src/components/include/policy/policy_external/policy/policy_manager.h
+++ b/src/components/include/policy/policy_external/policy/policy_manager.h
@@ -753,15 +753,6 @@ class PolicyManager : public usage_statistics::StatisticsManager,
   virtual const PolicySettings& get_settings() const = 0;
 
   /**
-   * @deprecated Unused in EXTERNAL_PROPRIETARY policies
-   * @brief Finds the next URL that must be sent on OnSystemRequest retry
-   * @param urls vector of vectors that contain urls for each application
-   * @return Pair of policy application id and application url id from the
-   * urls vector
-   */
-  DEPRECATED virtual AppIdURL GetNextUpdateUrl(const EndpointUrls& urls) = 0;
-
-  /**
    * @brief Assigns new HMI types for specified application
    * @param device_handle device identifier
    * @param application_id Unique application id
diff --git a/src/components/include/protocol_handler/protocol_handler.h b/src/components/include/protocol_handler/protocol_handler.h
index 011592da49..2cea958bae 100644
--- a/src/components/include/protocol_handler/protocol_handler.h
+++ b/src/components/include/protocol_handler/protocol_handler.h
@@ -137,22 +137,6 @@ class ProtocolHandler {
    * @param err_reason string with NACK reason. Only valid when
    * generated_session_id is 0.
    */
-  DEPRECATED
-  virtual void NotifySessionStarted(
-      const SessionContext& context,
-      std::vector<std::string>& rejected_params,
-      const std::string err_reason = std::string()) = 0;
-
-  /**
-   * @brief Called by connection handler to notify the context of
-   * OnSessionStartedCallback().
-   * @param context reference to structure with started session data
-   * @param rejected_params list of parameters name that are rejected.
-   * Only valid when generated_session_id is 0. Note, even if
-   * generated_session_id is 0, the list may be empty.
-   * @param err_reason string with NACK reason. Only valid when
-   * generated_session_id is 0.
-   */
   virtual void NotifySessionStarted(
       SessionContext& context,
       std::vector<std::string>& rejected_params,
diff --git a/src/components/include/resumption/last_state.h b/src/components/include/resumption/last_state.h
index b28e5611b7..1f54959ffc 100644
--- a/src/components/include/resumption/last_state.h
+++ b/src/components/include/resumption/last_state.h
@@ -46,12 +46,6 @@ class LastState {
   virtual ~LastState() {}
 
   /**
-   * @brief Saves dictionary to filesystem
-   */
-  DEPRECATED
-  virtual void SaveStateToFileSystem() = 0;
-
-  /**
    * @brief SaveToFileSystem
    * Saving dictionary to filesystem
    */
@@ -65,12 +59,6 @@ class LastState {
 
   /**
    * @brief dictionary Gets internal dictionary
-   * @return Reference to internal dictionary json value
-   */
-  virtual Json::Value& get_dictionary() = 0;
-
-  /**
-   * @brief dictionary Gets internal dictionary
    * @return Copy of internal dictionary json value
    */
   virtual Json::Value dictionary() const = 0;
diff --git a/src/components/include/test/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h
index fd7ddeac15..50fb168411 100644
--- a/src/components/include/test/application_manager/mock_application_manager.h
+++ b/src/components/include/test/application_manager/mock_application_manager.h
@@ -68,10 +68,6 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_METHOD2(Init,
                bool(resumption::LastStateWrapperPtr last_state,
                     media_manager::MediaManager* media_manager));
-  DEPRECATED
-  MOCK_METHOD2(Init,
-               bool(resumption::LastState& last_state,
-                    media_manager::MediaManager* media_manager));
   MOCK_METHOD0(Stop, bool());
   MOCK_METHOD1(set_hmi_message_handler,
                void(hmi_message_handler::HMIMessageHandler* handler));
@@ -117,9 +113,6 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_CONST_METHOD1(application_by_policy_id,
                      application_manager::ApplicationSharedPtr(
                          const std::string& policy_app_id));
-  MOCK_CONST_METHOD1(
-      application_by_name,
-      application_manager::ApplicationSharedPtr(const std::string& app_name));
   MOCK_CONST_METHOD1(pending_application_by_policy_id,
                      application_manager::ApplicationSharedPtr(
                          const std::string& policy_app_id));
@@ -319,12 +312,6 @@ class MockApplicationManager : public application_manager::ApplicationManager {
                void(uint32_t app_id,
                     protocol_handler::ServiceType service_type,
                     bool state));
-  DEPRECATED
-  MOCK_METHOD3(
-      OnAppStreaming,
-      void(uint32_t app_id,
-           protocol_handler::ServiceType service_type,
-           const application_manager::Application::StreamingState new_state));
   MOCK_CONST_METHOD6(CreateRegularState,
                      application_manager::HmiStatePtr(
                          application_manager::ApplicationSharedPtr app,
@@ -339,8 +326,6 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_CONST_METHOD2(CanAppStream,
                      bool(uint32_t app_id,
                           protocol_handler::ServiceType service_type));
-  DEPRECATED
-  MOCK_METHOD1(ForbidStreaming, void(uint32_t app_id));
   MOCK_METHOD2(ForbidStreaming,
                void(uint32_t app_id,
                     protocol_handler::ServiceType service_type));
diff --git a/src/components/include/test/application_manager/mock_rpc_plugin.h b/src/components/include/test/application_manager/mock_rpc_plugin.h
index 2633825428..2dba5367c6 100644
--- a/src/components/include/test/application_manager/mock_rpc_plugin.h
+++ b/src/components/include/test/application_manager/mock_rpc_plugin.h
@@ -16,13 +16,6 @@ class MockRPCPlugin : public RPCPlugin {
                     HMICapabilities& hmi_capabilities,
                     policy::PolicyHandlerInterface& policy_handler,
                     resumption::LastStateWrapperPtr last_state));
-  DEPRECATED
-  MOCK_METHOD5(Init,
-               bool(ApplicationManager& app_manager,
-                    rpc_service::RPCService& rpc_service,
-                    HMICapabilities& hmi_capabilities,
-                    policy::PolicyHandlerInterface& policy_handler,
-                    resumption::LastState& last_state));
   MOCK_METHOD2(IsAbleToProcess,
                bool(const int32_t function_id,
                     const commands::Command::CommandSource message_source));
diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
index af4019ce21..ca5d25ed4c 100644
--- a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
+++ b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
@@ -53,9 +53,6 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
   MOCK_METHOD0(InitPolicyTable, bool());
   MOCK_METHOD0(ResetPolicyTable, bool());
   MOCK_METHOD0(ClearUserConsent, bool());
-  MOCK_METHOD2(SendMessageToSDK,
-               bool(const policy::BinaryMessage& pt_string,
-                    const std::string& url));
   MOCK_METHOD2(ReceiveMessageFromSDK,
                bool(const std::string& file,
                     const policy::BinaryMessage& pt_string));
diff --git a/src/components/include/test/media_manager/mock_media_manager.h b/src/components/include/test/media_manager/mock_media_manager.h
index 364c495236..cfee287d12 100644
--- a/src/components/include/test/media_manager/mock_media_manager.h
+++ b/src/components/include/test/media_manager/mock_media_manager.h
@@ -41,12 +41,6 @@ namespace media_manager_test {
 
 class MockMediaManager : public media_manager::MediaManager {
  public:
-  MOCK_METHOD1(PlayA2DPSource, void(int32_t application_key));
-  MOCK_METHOD1(StopA2DPSource, void(int32_t application_key));
-  MOCK_METHOD3(StartMicrophoneRecording,
-               void(int32_t application_key,
-                    const std::string& outputFileName,
-                    int32_t duration));
   MOCK_METHOD6(StartMicrophoneRecording,
                void(int32_t application_key,
                     const std::string& outputFileName,
diff --git a/src/components/include/test/resumption/mock_last_state.h b/src/components/include/test/resumption/mock_last_state.h
index 99c3799a95..c646dcd286 100644
--- a/src/components/include/test/resumption/mock_last_state.h
+++ b/src/components/include/test/resumption/mock_last_state.h
@@ -43,10 +43,6 @@ namespace resumption_test {
 
 class MockLastState : public resumption::LastState {
  public:
-  DEPRECATED
-  MOCK_METHOD0(SaveStateToFileSystem, void());
-  DEPRECATED
-  MOCK_METHOD0(get_dictionary, Json::Value&());
   MOCK_METHOD0(SaveToFileSystem, void());
   MOCK_METHOD0(RemoveFromFileSystem, void());
   MOCK_CONST_METHOD0(dictionary, Json::Value());
diff --git a/src/components/include/test/transport_manager/mock_transport_manager.h b/src/components/include/test/transport_manager/mock_transport_manager.h
index 1920af18a3..7aa70b8061 100644
--- a/src/components/include/test/transport_manager/mock_transport_manager.h
+++ b/src/components/include/test/transport_manager/mock_transport_manager.h
@@ -57,8 +57,6 @@ class MockTransportManager : public ::transport_manager::TransportManager,
                                  transport_manager::TMTelemetryObserver> {
  public:
   MOCK_METHOD1(Init, int(resumption::LastStateWrapperPtr last_state));
-  DEPRECATED
-  MOCK_METHOD1(Init, int(resumption::LastState& last_state));
   MOCK_METHOD0(Reinit, int());
   MOCK_METHOD0(Deinit, void());
   MOCK_METHOD0(StopEventsProcessing, void());
diff --git a/src/components/include/transport_manager/transport_manager.h b/src/components/include/transport_manager/transport_manager.h
index 4697bf9982..45bb159aa2 100644
--- a/src/components/include/transport_manager/transport_manager.h
+++ b/src/components/include/transport_manager/transport_manager.h
@@ -53,9 +53,6 @@ class TransportManager {
    **/
   virtual ~TransportManager() {}
 
-  DEPRECATED
-  virtual int Init(resumption::LastState& last_state) = 0;
-
   /**
    * @brief Initialize transport manager.
    * @return Error code.
diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h
index 9e0a8b5123..5ecb1a6b4a 100644
--- a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h
+++ b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h
@@ -53,7 +53,6 @@ class FromMicRecorderAdapter : public MediaAdapterImpl {
   void StopActivity(int32_t application_key);
   bool is_app_performing_activity(int32_t application_key) const;
   void set_output_file(const std::string& output_file);
-  DEPRECATED void set_duration(int32_t duration);
   void set_config(mobile_apis::SamplingRate::eType sampling_rate,
                   mobile_apis::BitsPerSample::eType bits_per_sample,
                   mobile_apis::AudioType::eType audio_type,
diff --git a/src/components/media_manager/include/media_manager/media_manager_impl.h b/src/components/media_manager/include/media_manager/media_manager_impl.h
index f8e94cbbb2..faa51feec9 100644
--- a/src/components/media_manager/include/media_manager/media_manager_impl.h
+++ b/src/components/media_manager/include/media_manager/media_manager_impl.h
@@ -60,13 +60,6 @@ class MediaManagerImpl : public MediaManager,
                    const MediaManagerSettings& settings);
   virtual ~MediaManagerImpl();
 
-  DEPRECATED virtual void PlayA2DPSource(int32_t application_key);
-  DEPRECATED virtual void StopA2DPSource(int32_t application_key);
-
-  DEPRECATED virtual void StartMicrophoneRecording(
-      int32_t application_key,
-      const std::string& outputFileName,
-      int32_t duration);
   virtual void StartMicrophoneRecording(
       int32_t application_key,
       const std::string& outputFileName,
diff --git a/src/components/media_manager/src/media_manager_impl.cc b/src/components/media_manager/src/media_manager_impl.cc
index 4fc8b38d87..8a73101b47 100644
--- a/src/components/media_manager/src/media_manager_impl.cc
+++ b/src/components/media_manager/src/media_manager_impl.cc
@@ -184,39 +184,6 @@ void MediaManagerImpl::Init() {
   }
 }
 
-void MediaManagerImpl::PlayA2DPSource(int32_t application_key) {
-  SDL_LOG_AUTO_TRACE();
-
-#if defined(EXTENDED_MEDIA_MODE)
-  if (!a2dp_player_ && protocol_handler_) {
-    a2dp_player_ =
-        new A2DPSourcePlayerAdapter(protocol_handler_->get_session_observer());
-  }
-#endif
-
-  if (a2dp_player_) {
-    a2dp_player_->StartActivity(application_key);
-  }
-}
-
-void MediaManagerImpl::StopA2DPSource(int32_t application_key) {
-  SDL_LOG_AUTO_TRACE();
-  if (a2dp_player_) {
-    a2dp_player_->StopActivity(application_key);
-  }
-}
-
-void MediaManagerImpl::StartMicrophoneRecording(int32_t application_key,
-                                                const std::string& output_file,
-                                                int32_t duration) {
-  StartMicrophoneRecording(application_key,
-                           output_file,
-                           duration,
-                           mobile_apis::SamplingRate::INVALID_ENUM,
-                           mobile_apis::BitsPerSample::INVALID_ENUM,
-                           mobile_apis::AudioType::INVALID_ENUM);
-}
-
 void MediaManagerImpl::StartMicrophoneRecording(
     int32_t application_key,
     const std::string& output_file,
diff --git a/src/components/policy/policy_external/include/policy/policy_manager_impl.h b/src/components/policy/policy_external/include/policy/policy_manager_impl.h
index 813af17b3f..2be8183bfa 100644
--- a/src/components/policy/policy_external/include/policy/policy_manager_impl.h
+++ b/src/components/policy/policy_external/include/policy/policy_manager_impl.h
@@ -791,14 +791,6 @@ class PolicyManagerImpl : public PolicyManager {
   const PolicySettings& get_settings() const OVERRIDE;
 
   /**
-   * @brief Finds the next URL that must be sent on OnSystemRequest retry
-   * @param urls vector of vectors that contain urls for each application
-   * @return Pair of policy application id and application url id from the
-   * urls vector
-   */
-  DEPRECATED AppIdURL GetNextUpdateUrl(const EndpointUrls& urls) OVERRIDE;
-
-  /**
    * @brief Checks if there is existing URL in the EndpointUrls vector with
    * index saved in the policy manager and if not, it moves to the next
    * application index
diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc
index b1e1c85490..75920be58c 100644
--- a/src/components/policy/policy_external/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_external/src/policy_manager_impl.cc
@@ -2143,18 +2143,6 @@ void PolicyManagerImpl::SetDecryptedCertificate(
   cache_->SetDecryptedCertificate(certificate);
 }
 
-AppIdURL PolicyManagerImpl::GetNextUpdateUrl(const EndpointUrls& urls) {
-  SDL_LOG_AUTO_TRACE();
-
-  const AppIdURL next_app_url = RetrySequenceUrl(retry_sequence_url_, urls);
-
-  retry_sequence_url_.url_idx_ = next_app_url.second + 1;
-  retry_sequence_url_.app_idx_ = next_app_url.first;
-  retry_sequence_url_.policy_app_id_ = urls[next_app_url.first].app_id;
-
-  return next_app_url;
-}
-
 AppIdURL PolicyManagerImpl::RetrySequenceUrl(const struct RetrySequenceURL& rs,
                                              const EndpointUrls& urls) const {
   uint32_t url_idx = rs.url_idx_;
diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
index 02c96fc3c7..b036735216 100644
--- a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
+++ b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
@@ -462,11 +462,6 @@ class ProtocolHandlerImpl
    * Only valid when generated_session_id is 0. Note, even if
    * generated_session_id is 0, the list may be empty.
    */
-  DEPRECATED
-  void NotifySessionStarted(const SessionContext& context,
-                            std::vector<std::string>& rejected_params,
-                            const std::string err_reason) OVERRIDE;
-
   void NotifySessionStarted(SessionContext& context,
                             std::vector<std::string>& rejected_params,
                             const std::string err_reason) OVERRIDE;
diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc
index 2595b26886..7b5d9901ea 100644
--- a/src/components/protocol_handler/src/protocol_handler_impl.cc
+++ b/src/components/protocol_handler/src/protocol_handler_impl.cc
@@ -2128,14 +2128,6 @@ void ProtocolHandlerImpl::NotifySessionStarted(
   }
 }
 
-void ProtocolHandlerImpl::NotifySessionStarted(
-    const SessionContext& context,
-    std::vector<std::string>& rejected_params,
-    const std::string err_reason) {
-  SessionContext context_copy = context;
-  NotifySessionStarted(context_copy, rejected_params, err_reason);
-}
-
 RESULT_CODE ProtocolHandlerImpl::HandleControlMessageHeartBeat(
     const ProtocolPacket& packet) {
   const ConnectionID connection_id = packet.connection_id();
diff --git a/src/components/resumption/include/resumption/last_state_impl.h b/src/components/resumption/include/resumption/last_state_impl.h
index 5eb4050d2d..8495c39d04 100644
--- a/src/components/resumption/include/resumption/last_state_impl.h
+++ b/src/components/resumption/include/resumption/last_state_impl.h
@@ -57,9 +57,6 @@ class LastStateImpl : public LastState {
    */
   ~LastStateImpl();
 
-  DEPRECATED
-  void SaveStateToFileSystem();
-
   /**
    * @brief Saving dictionary to filesystem
    */
@@ -77,12 +74,6 @@ class LastStateImpl : public LastState {
   Json::Value dictionary() const OVERRIDE;
 
   /**
-   * @brief Get the dictionary
-   * @return Reference to the dictionary
-   */
-  DEPRECATED Json::Value& get_dictionary();
-
-  /**
    * @brief Resets internal dictionary
    * @param dictionary New dictionary json value to be set
    */
diff --git a/src/components/resumption/src/last_state_impl.cc b/src/components/resumption/src/last_state_impl.cc
index 2083369a8e..9920a1499b 100644
--- a/src/components/resumption/src/last_state_impl.cc
+++ b/src/components/resumption/src/last_state_impl.cc
@@ -52,28 +52,6 @@ LastStateImpl::~LastStateImpl() {
   SaveToFileSystem();
 }
 
-void LastStateImpl::SaveStateToFileSystem() {
-  SDL_LOG_AUTO_TRACE();
-
-  std::string styled_string;
-  {
-    sync_primitives::AutoLock lock(dictionary_lock_);
-    styled_string = dictionary_.toStyledString();
-  }
-
-  const std::string full_path =
-      !app_storage_folder_.empty()
-          ? app_storage_folder_ + "/" + app_info_storage_
-          : app_info_storage_;
-
-  const std::vector<uint8_t> char_vector_pdata(styled_string.begin(),
-                                               styled_string.end());
-  DCHECK(file_system::CreateDirectoryRecursively(app_storage_folder_));
-  SDL_LOG_INFO("LastState::SaveStateToFileSystem[DEPRECATED] "
-               << full_path << styled_string);
-  DCHECK(file_system::Write(full_path, char_vector_pdata));
-}
-
 void LastStateImpl::SaveToFileSystem() {
   SDL_LOG_AUTO_TRACE();
 
@@ -124,11 +102,6 @@ Json::Value LastStateImpl::dictionary() const {
   return dictionary_;
 }
 
-Json::Value& LastStateImpl::get_dictionary() {
-  sync_primitives::AutoLock lock(dictionary_lock_);
-  return dictionary_;
-}
-
 void LastStateImpl::set_dictionary(const Json::Value& dictionary) {
   DCHECK(dictionary.type() == Json::objectValue ||
          dictionary.type() == Json::nullValue);
diff --git a/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_transport_adapter.h b/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_transport_adapter.h
index 5429f50f7f..6e36877e2d 100644
--- a/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_transport_adapter.h
+++ b/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_transport_adapter.h
@@ -52,10 +52,6 @@ class BluetoothTransportAdapter : public TransportAdapterImpl {
   BluetoothTransportAdapter(resumption::LastStateWrapperPtr last_state_wrapper,
                             const TransportManagerSettings& settings);
 
-  DEPRECATED
-  BluetoothTransportAdapter(resumption::LastState&,
-                            const TransportManagerSettings& settings);
-
  protected:
   /**
    * @brief Return type of device.
diff --git a/src/components/transport_manager/include/transport_manager/iap2_emulation/iap2_transport_adapter.h b/src/components/transport_manager/include/transport_manager/iap2_emulation/iap2_transport_adapter.h
index 3dabfb39ca..4525f6b5d9 100644
--- a/src/components/transport_manager/include/transport_manager/iap2_emulation/iap2_transport_adapter.h
+++ b/src/components/transport_manager/include/transport_manager/iap2_emulation/iap2_transport_adapter.h
@@ -63,11 +63,6 @@ class IAP2BluetoothEmulationTransportAdapter : public TcpTransportAdapter {
       resumption::LastStateWrapperPtr last_state_wrapper,
       const TransportManagerSettings& settings);
 
-  DEPRECATED
-  IAP2BluetoothEmulationTransportAdapter(
-      const uint16_t port,
-      resumption::LastState& last_state_wrapper,
-      const TransportManagerSettings& settings);
   /**
    * @brief DeviceSwitched is called during switching from iAP2 Bluetooth to
    * iAP2 USB transport.
@@ -113,12 +108,6 @@ class IAP2USBEmulationTransportAdapter : public TcpTransportAdapter {
       resumption::LastStateWrapperPtr last_state_wrapper,
       const TransportManagerSettings& settings);
 
-  DEPRECATED
-  IAP2USBEmulationTransportAdapter(const uint16_t port,
-                                   resumption::LastState&,
-                                   const TransportManagerSettings& settings) =
-      delete;
-
   /**
    * Destructor
    */
diff --git a/src/components/transport_manager/include/transport_manager/tcp/tcp_transport_adapter.h b/src/components/transport_manager/include/transport_manager/tcp/tcp_transport_adapter.h
index c5948062c9..1cd5c1cb7b 100644
--- a/src/components/transport_manager/include/transport_manager/tcp/tcp_transport_adapter.h
+++ b/src/components/transport_manager/include/transport_manager/tcp/tcp_transport_adapter.h
@@ -53,11 +53,6 @@ class TcpTransportAdapter : public TransportAdapterImpl {
                       resumption::LastStateWrapperPtr last_state_wrapper,
                       const TransportManagerSettings& settings);
 
-  DEPRECATED
-  TcpTransportAdapter(uint16_t port,
-                      resumption::LastState&,
-                      const TransportManagerSettings& settings) = delete;
-
   /**
    * @brief Destructor.
    */
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
index cfc886cb15..58dd4b16db 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
@@ -85,13 +85,6 @@ class TransportAdapterImpl : public TransportAdapter,
                        resumption::LastStateWrapperPtr last_state_wrapper,
                        const TransportManagerSettings& settings);
 
-  DEPRECATED
-  TransportAdapterImpl(DeviceScanner* device_scanner,
-                       ServerConnectionFactory* server_connection_factory,
-                       ClientConnectionListener* client_connection_listener,
-                       resumption::LastState& last_state,
-                       const TransportManagerSettings& settings) = delete;
-
   /**
    * @brief Destructor.
    **/
@@ -677,10 +670,6 @@ class TransportAdapterImpl : public TransportAdapter,
   TMTelemetryObserver* metric_observer_;
 #endif  // TELEMETRY_MONITOR
 
-  resumption::LastState& last_state() const {
-    return last_state_wrapper_->get_accessor().GetMutableData();
-  }
-
   /**
    * @brief Pointer to the device scanner.
    */
diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_default.h b/src/components/transport_manager/include/transport_manager/transport_manager_default.h
index 81fc92dc38..d9407276b0 100644
--- a/src/components/transport_manager/include/transport_manager/transport_manager_default.h
+++ b/src/components/transport_manager/include/transport_manager/transport_manager_default.h
@@ -82,9 +82,6 @@ class TransportManagerDefault : public TransportManagerImpl {
    */
   int Init(resumption::LastStateWrapperPtr last_state_wrapper) OVERRIDE;
 
-  DEPRECATED
-  int Init(resumption::LastState& last_state) OVERRIDE;
-
   /**
    * @brief Destructor.
    */
diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
index 85d96bac55..b45d7cc379 100644
--- a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
@@ -126,9 +126,6 @@ class TransportManagerImpl
    */
   int Init(resumption::LastStateWrapperPtr last_state_wrapper) OVERRIDE;
 
-  DEPRECATED
-  int Init(resumption::LastState& last_state) OVERRIDE;
-
   /**
    * Reinitializes transport manager
    * @return Error code
diff --git a/src/components/transport_manager/include/transport_manager/usb/usb_aoa_adapter.h b/src/components/transport_manager/include/transport_manager/usb/usb_aoa_adapter.h
index 45c6d4c0e4..12516e769e 100644
--- a/src/components/transport_manager/include/transport_manager/usb/usb_aoa_adapter.h
+++ b/src/components/transport_manager/include/transport_manager/usb/usb_aoa_adapter.h
@@ -47,10 +47,6 @@ class UsbAoaAdapter : public TransportAdapterImpl {
   UsbAoaAdapter(resumption::LastStateWrapperPtr last_state_wrapper,
                 const TransportManagerSettings& settings);
 
-  DEPRECATED
-  UsbAoaAdapter(resumption::LastState&,
-                const TransportManagerSettings& settings) = delete;
-
   virtual ~UsbAoaAdapter();
 
  protected:
diff --git a/src/components/transport_manager/src/transport_manager_default.cc b/src/components/transport_manager/src/transport_manager_default.cc
index 45d0b04528..0ffb8432ea 100644
--- a/src/components/transport_manager/src/transport_manager_default.cc
+++ b/src/components/transport_manager/src/transport_manager_default.cc
@@ -190,10 +190,6 @@ int TransportManagerDefault::Init(
   return E_SUCCESS;
 }
 
-int TransportManagerDefault::Init(resumption::LastState&) {
-  return 1;
-}
-
 TransportManagerDefault::~TransportManagerDefault() {}
 
 }  //  namespace transport_manager
diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc
index bb6f3626e1..5f4ddc9d7e 100644
--- a/src/components/transport_manager/src/transport_manager_impl.cc
+++ b/src/components/transport_manager/src/transport_manager_impl.cc
@@ -582,15 +582,6 @@ int TransportManagerImpl::Init(
   return E_SUCCESS;
 }
 
-int TransportManagerImpl::Init(resumption::LastState& last_state) {
-  // Last state required to initialize Transport adapters
-  UNUSED(last_state);
-  SDL_LOG_TRACE("enter");
-  is_initialized_ = true;
-  SDL_LOG_TRACE("exit with E_SUCCESS");
-  return E_SUCCESS;
-}
-
 void TransportManagerImpl::Deinit() {
   SDL_LOG_AUTO_TRACE();
   DisconnectAllDevices();
diff --git a/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc b/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc
index 68f23a6326..18c6ad9be1 100644
--- a/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc
+++ b/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc
@@ -100,7 +100,9 @@ TransportAdapter::Error WebSocketServerTransportAdapter::Init() {
 void WebSocketServerTransportAdapter::Store() const {
   SDL_LOG_AUTO_TRACE();
   if (webengine_device_) {
-    Json::Value& dictionary = last_state().get_dictionary();
+    resumption::LastStateAccessor accessor =
+        last_state_wrapper_->get_accessor();
+    Json::Value dictionary = accessor.GetData().dictionary();
     if (dictionary["TransportManager"].isMember("WebsocketServerAdapter")) {
       SDL_LOG_DEBUG(
           "WebsocketServerAdapter already exists. Storing is skipped");
@@ -119,7 +121,8 @@ void WebSocketServerTransportAdapter::Store() const {
 
 bool WebSocketServerTransportAdapter::Restore() {
   SDL_LOG_AUTO_TRACE();
-  const Json::Value& dictionary = last_state().get_dictionary();
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
   const Json::Value ws_adapter_dictionary =
       dictionary["TransportManager"]["WebsocketServerAdapter"];
   webengine_device_id_ =
diff --git a/src/components/transport_manager/test/include/transport_manager/raw_message_matcher.h b/src/components/transport_manager/test/include/transport_manager/raw_message_matcher.h
index 5aedfd58aa..4f5cbf71eb 100644
--- a/src/components/transport_manager/test/include/transport_manager/raw_message_matcher.h
+++ b/src/components/transport_manager/test/include/transport_manager/raw_message_matcher.h
@@ -54,10 +54,6 @@ using namespace ::protocol_handler;
 class RawMessageMatcher : public MatcherInterface<RawMessagePtr> {
  public:
   explicit RawMessageMatcher(RawMessagePtr ptr);
-
-  DEPRECATED
-  virtual bool MatchAndExplain(const RawMessagePtr msg,
-                               MatchResultListener* listener) const;
   virtual void DescribeTo(std::ostream* os) const;
   virtual void DescribeNegationTo(std::ostream* os) const;
 
diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h
index 7b1d720ba2..4be51431d7 100644
--- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h
@@ -66,13 +66,6 @@ class MockTransportAdapterImpl : public TransportAdapterImpl {
                              last_state_wrapper,
                              settings) {}
 
-  DEPRECATED
-  MockTransportAdapterImpl(DeviceScanner*,
-                           ServerConnectionFactory*,
-                           ClientConnectionListener*,
-                           resumption::LastState&,
-                           const transport_manager::TransportManagerSettings&);
-
   ConnectionSPtr FindStatedConnection(const DeviceUID& device_handle,
                                       const ApplicationHandle& app_handle) {
     return this->FindEstablishedConnection(device_handle, app_handle);
diff --git a/src/components/transport_manager/test/transport_manager_default_test.cc b/src/components/transport_manager/test/transport_manager_default_test.cc
index 67b4a0a8ba..66cfa85ef9 100644
--- a/src/components/transport_manager/test/transport_manager_default_test.cc
+++ b/src/components/transport_manager/test/transport_manager_default_test.cc
@@ -210,8 +210,6 @@ void TestTransportManagerDefault::ExpectationsSettings_TM(
       .WillByDefault(ReturnRef(kWSServerCACertPath));
   ON_CALL(*mock_last_state_, dictionary())
       .WillByDefault(Return(custom_dictionary_));
-  ON_CALL(*mock_last_state_, get_dictionary())
-      .WillByDefault(ReturnRef(custom_dictionary_));
 
   EXPECT_CALL(transport_manager_settings_, use_last_state())
       .WillRepeatedly(Return(use_last_state));
diff --git a/src/components/utils/include/utils/file_system.h b/src/components/utils/include/utils/file_system.h
index 232d9583b1..382f38e520 100644
--- a/src/components/utils/include/utils/file_system.h
+++ b/src/components/utils/include/utils/file_system.h
@@ -257,9 +257,6 @@ bool ReadBinaryFile(const std::string& name,
 
 bool ReadFile(const std::string& name, std::string& result);
 
-DEPRECATED
-const std::string ConvertPathForURL(const std::string& path);
-
 /**
  * @brief Create empty file
  *
diff --git a/src/components/utils/src/file_system.cc b/src/components/utils/src/file_system.cc
index f0c838a7f9..b2c1f44c53 100644
--- a/src/components/utils/src/file_system.cc
+++ b/src/components/utils/src/file_system.cc
@@ -458,25 +458,6 @@ bool file_system::ReadFile(const std::string& name, std::string& result) {
   return true;
 }
 
-const std::string file_system::ConvertPathForURL(const std::string& path) {
-  SDL_LOG_AUTO_TRACE();
-  const std::string reserved_symbols = "!#$&'()*+,:;=?@[] ";
-  std::string converted_path;
-
-  for (const auto symbol : path) {
-    size_t pos = reserved_symbols.find_first_of(symbol);
-    if (pos != std::string::npos) {
-      const size_t size = 100;
-      char percent_value[size];
-      snprintf(percent_value, size, "%%%x", symbol);
-      converted_path += percent_value;
-    } else {
-      converted_path += symbol;
-    }
-  }
-  return converted_path;
-}
-
 bool file_system::CreateFile(const std::string& path) {
   SDL_LOG_AUTO_TRACE();