initial commit for API 3.0 (replaced all)

1490 files changed, 0 insertions, 168656 deletions

diff --git a/SDL_Core/src/components/JSONHandler/CMakeLists.txt b/SDL_Core/src/components/JSONHandler/CMakeLists.txt
deleted file mode 100644
index 4dd5bb15d..000000000
--- a/SDL_Core/src/components/JSONHandler/CMakeLists.txt
+++ /dev/null
@@ -1,672 +0,0 @@
-include_directories (
-  ./include/
-  ../TransportManager/include/
-  ../ProtocolHandler/include/
-  ../Utils/include/
-  ../../thirdPartyLibs/jsoncpp/include/
-  ../../thirdPartyLibs/MessageBroker/include
-  ../../thirdPartyLibs/logger/include
-  ../../thirdPartyLibs/logger/log4cplus-1.1.0/include
-  ${CMAKE_BINARY_DIR}/src/thirdPartyLibs/logger/log4cplus-1.1.0/include
-)
-
-set (GENERATED_SOURCES1
-
-)
-set (GENERATED_SOURCES2
-./src/SDLRPCObjectsImpl/V1/Result.cpp
-./src/SDLRPCObjectsImpl/V1/AddCommand_request.cpp
-./src/SDLRPCObjectsImpl/V1/AddCommand_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/AddCommand_response.cpp
-./src/SDLRPCObjectsImpl/V1/AddCommand_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/AddSubMenu_request.cpp
-./src/SDLRPCObjectsImpl/V1/AddSubMenu_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/AddSubMenu_response.cpp
-./src/SDLRPCObjectsImpl/V1/AddSubMenu_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/Alert_request.cpp
-./src/SDLRPCObjectsImpl/V1/Alert_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/Alert_response.cpp
-./src/SDLRPCObjectsImpl/V1/Alert_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/ButtonCapabilities.cpp
-./src/SDLRPCObjectsImpl/V1/ButtonCapabilitiesMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/Choice.cpp
-./src/SDLRPCObjectsImpl/V1/ChoiceMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_request.cpp
-./src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_response.cpp
-./src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/DeleteCommand_request.cpp
-./src/SDLRPCObjectsImpl/V1/DeleteCommand_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/DeleteCommand_response.cpp
-./src/SDLRPCObjectsImpl/V1/DeleteCommand_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_request.cpp
-./src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_response.cpp
-./src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/DeleteSubMenu_request.cpp
-./src/SDLRPCObjectsImpl/V1/DeleteSubMenu_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/DeleteSubMenu_response.cpp
-./src/SDLRPCObjectsImpl/V1/DeleteSubMenu_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/EncodedSyncPData_request.cpp
-./src/SDLRPCObjectsImpl/V1/EncodedSyncPData_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/EncodedSyncPData_response.cpp
-./src/SDLRPCObjectsImpl/V1/EncodedSyncPData_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/HMIApplication.cpp
-./src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/OnEncodedSyncPData.cpp
-./src/SDLRPCObjectsImpl/V1/OnEncodedSyncPDataMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/OnHMIStatus.cpp
-./src/SDLRPCObjectsImpl/V1/OnHMIStatusMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/PerformInteraction_request.cpp
-./src/SDLRPCObjectsImpl/V1/PerformInteraction_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/PerformInteraction_response.cpp
-./src/SDLRPCObjectsImpl/V1/PerformInteraction_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/RegisterAppInterface_request.cpp
-./src/SDLRPCObjectsImpl/V1/RegisterAppInterface_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/RegisterAppInterface_response.cpp
-./src/SDLRPCObjectsImpl/V1/RegisterAppInterface_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_request.cpp
-./src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_response.cpp
-./src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/ResultMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/SetGlobalProperties_request.cpp
-./src/SDLRPCObjectsImpl/V1/SetGlobalProperties_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/SetGlobalProperties_response.cpp
-./src/SDLRPCObjectsImpl/V1/SetGlobalProperties_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_request.cpp
-./src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_response.cpp
-./src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/Show_request.cpp
-./src/SDLRPCObjectsImpl/V1/Show_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/Show_response.cpp
-./src/SDLRPCObjectsImpl/V1/Show_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/Speak_request.cpp
-./src/SDLRPCObjectsImpl/V1/Speak_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/Speak_response.cpp
-./src/SDLRPCObjectsImpl/V1/Speak_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/StartTime.cpp
-./src/SDLRPCObjectsImpl/V1/StartTimeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/SubscribeButton_request.cpp
-./src/SDLRPCObjectsImpl/V1/SubscribeButton_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/SubscribeButton_response.cpp
-./src/SDLRPCObjectsImpl/V1/SubscribeButton_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/SyncMsgVersion.cpp
-./src/SDLRPCObjectsImpl/V1/SyncMsgVersionMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/TextField.cpp
-./src/SDLRPCObjectsImpl/V1/TextFieldMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/TTSChunk.cpp
-./src/SDLRPCObjectsImpl/V1/TTSChunkMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_request.cpp
-./src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_response.cpp
-./src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/UnsubscribeButton_request.cpp
-./src/SDLRPCObjectsImpl/V1/UnsubscribeButton_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/UnsubscribeButton_response.cpp
-./src/SDLRPCObjectsImpl/V1/UnsubscribeButton_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.cpp
-)
-set (GENERATED_SOURCES3
-)
-set (GENERATED_SOURCES6
-
-
-)
-set (GENERATED_SOURCES4
-./src/SDLRPCObjectsImpl/V2/Result.cpp
-./src/SDLRPCObjectsImpl/V2/AddCommand_request.cpp
-./src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/AddCommand_response.cpp
-./src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/AddSubMenu_request.cpp
-./src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/AddSubMenu_response.cpp
-./src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/AlertManeuver_request.cpp
-./src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/AlertManeuver_response.cpp
-./src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/Alert_request.cpp
-./src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/Alert_response.cpp
-./src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ButtonCapabilities.cpp
-./src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ChangeRegistration_request.cpp
-./src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ChangeRegistration_response.cpp
-./src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/Choice.cpp
-./src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_request.cpp
-./src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_response.cpp
-./src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteCommand_request.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteCommand_response.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteFile_request.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteFile_response.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_request.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_response.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteSubMenu_request.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteSubMenu_response.cpp
-./src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DialNumber_request.cpp
-./src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DialNumber_response.cpp
-./src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DimensionMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DTC.cpp
-./src/SDLRPCObjectsImpl/V2/DTCMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/EncodedSyncPData_request.cpp
-./src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/EncodedSyncPData_response.cpp
-./src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/EndAudioPassThru_request.cpp
-./src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/EndAudioPassThru_response.cpp
-./src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/GetDTCs_request.cpp
-./src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/GetDTCs_response.cpp
-./src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/GetVehicleData_request.cpp
-./src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/GetVehicleData_response.cpp
-./src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/GPSData.cpp
-./src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/HMIPermissions.cpp
-./src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/Image.cpp
-./src/SDLRPCObjectsImpl/V2/ImageMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ListFiles_request.cpp
-./src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ListFiles_response.cpp
-./src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/OnEncodedSyncPData.cpp
-./src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/OnHMIStatus.cpp
-./src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/OnPermissionsChange.cpp
-./src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ParameterPermissions.cpp
-./src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_request.cpp
-./src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_response.cpp
-./src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/PerformInteraction_request.cpp
-./src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/PerformInteraction_response.cpp
-./src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/PermissionItem.cpp
-./src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/PresetBankCapabilities.cpp
-./src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/PutFile_request.cpp
-./src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/PutFile_response.cpp
-./src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ReadDID_request.cpp
-./src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ReadDID_response.cpp
-./src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/RegisterAppInterface_request.cpp
-./src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/RegisterAppInterface_response.cpp
-./src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_request.cpp
-./src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_response.cpp
-./src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ResultMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ScrollableMessage_request.cpp
-./src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ScrollableMessage_response.cpp
-./src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SetAppIcon_request.cpp
-./src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SetAppIcon_response.cpp
-./src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SetDisplayLayout_request.cpp
-./src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SetDisplayLayout_response.cpp
-./src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SetGlobalProperties_request.cpp
-./src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SetGlobalProperties_response.cpp
-./src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_request.cpp
-./src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_response.cpp
-./src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ShowConstantTBT_request.cpp
-./src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/ShowConstantTBT_response.cpp
-./src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/Show_request.cpp
-./src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/Show_response.cpp
-./src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SingleTireStatus.cpp
-./src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/Slider_request.cpp
-./src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/Slider_response.cpp
-./src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SoftButtonCapabilities.cpp
-./src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SoftButton.cpp
-./src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/Speak_request.cpp
-./src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/Speak_response.cpp
-./src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/StartTime.cpp
-./src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SubscribeButton_request.cpp
-./src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SubscribeButton_response.cpp
-./src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_request.cpp
-./src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_response.cpp
-./src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SyncMsgVersion.cpp
-./src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/TextField.cpp
-./src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/TireStatus.cpp
-./src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/TTSChunk.cpp
-./src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/Turn.cpp
-./src/SDLRPCObjectsImpl/V2/TurnMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_request.cpp
-./src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_response.cpp
-./src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/UnsubscribeButton_request.cpp
-./src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/UnsubscribeButton_response.cpp
-./src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_request.cpp
-./src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_response.cpp
-./src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/UpdateTurnList_request.cpp
-./src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/UpdateTurnList_response.cpp
-./src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/VehicleDataResult.cpp
-./src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/VehicleType.cpp
-./src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/VrHelpItem.cpp
-./src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.cpp
-)
-set (GENERATED_SOURCES5
-)
-
-set (GENERATED_SOURCES7
-)
-
-set (GENERATED_RPC_SOURCES
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenu.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/Alert.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistration.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguages.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguages.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguages.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSet.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommand.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSet.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenu.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilities.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguage.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnCommand.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnCommandMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDeviceChosen.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDeviceChosenMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDriverDistraction.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDriverDistractionMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnLanguageChange.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnLanguageChangeMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnReady.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnReadyMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnSystemContext.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnSystemContextMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteraction.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalProperties.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessage.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIcon.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayout.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalProperties.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimer.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/Show.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/Slider.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistration.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThru.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThru.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilities.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguage.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/OnLanguageChange.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/OnLanguageChangeMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/Speak.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateApp.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivated.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppList.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceList.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppRegistered.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppRegisteredMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppUnregistered.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppUnregisteredMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnDeviceListUpdated.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnDeviceListUpdatedMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendData.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilities.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonEvent.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonEventMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonPress.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonPressMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommand.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistration.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommand.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilities.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguage.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnCommand.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnCommandMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnLanguageChange.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnLanguageChangeMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCs.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleData.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleType.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/OnVehicleData.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/OnVehicleDataMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDID.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumber.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuver.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnTBTClientState.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnTBTClientStateMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBT.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTResponseMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnList.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListResponseMarshaller.cpp
-)
-
-
-set (SOURCES
-    ./src/JSONHandler.cpp
-    ./src/JSONRPC2Handler.cpp
-    ./src/SDLRPCMessage.cpp
-    ./src/SDLRPCNotification.cpp
-    ./src/SDLRPCRequest.cpp
-    ./src/SDLRPCResponse.cpp
-    ./src/RPC2Command.cpp
-    ./src/RPC2Notification.cpp
-    ./src/RPC2Request.cpp
-    ./src/RPC2Response.cpp
-    ./src/RPC2Error.cpp
-    ./src/RPC2ErrorMarshaller.cpp
-)
-
-add_library("JSONHandler" ${SOURCES}
-        ${GENERATED_SOURCES2}
-        ${GENERATED_SOURCES4}
-        ${GENERATED_RPC_SOURCES}
-./src/SDLRPCObjectsImpl/V2/OnDriverDistraction.cpp
-./src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/OnCommand.cpp
-./src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/OnLanguageChange.cpp
-./src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/GenericResponse_response.cpp
-./src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/DisplayCapabilities.cpp
-./src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/LanguageMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/LanguageMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregistered.cpp
-./src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/MenuParams.cpp
-./src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/OnButtonEvent.cpp
-./src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/OnButtonPress.cpp
-./src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/OnAudioPassThru.cpp
-./src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/OnVehicleData.cpp
-./src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/OnAppInterfaceUnregistered.cpp
-./src/SDLRPCObjectsImpl/V1/OnAppInterfaceUnregisteredMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/MenuParams.cpp
-./src/SDLRPCObjectsImpl/V1/MenuParamsMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/GenericResponse_response.cpp
-./src/SDLRPCObjectsImpl/V1/GenericResponse_responseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/OnButtonEvent.cpp
-./src/SDLRPCObjectsImpl/V1/OnButtonEventMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/OnButtonPress.cpp
-./src/SDLRPCObjectsImpl/V1/OnButtonPressMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/OnCommand.cpp
-./src/SDLRPCObjectsImpl/V1/OnCommandMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/OnDriverDistraction.cpp
-./src/SDLRPCObjectsImpl/V1/OnDriverDistractionMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/DisplayCapabilities.cpp
-./src/SDLRPCObjectsImpl/V1/DisplayCapabilitiesMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommand.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/OnTBTClientState.cpp
-./src/SDLRPCObjectsImpl/V1/OnTBTClientStateMarshaller.cpp
-./src/SDLRPCObjectsImpl/V2/OnTBTClientState.cpp
-./src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandResponse.cpp
-./src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandResponseMarshaller.cpp
-./src/SDLRPCObjectsImpl/V1/Marshaller.cpp
-./src/SDLRPCObjectsImpl/V2/Marshaller.cpp
-./src/RPC2ObjectsImpl/Marshaller.cpp)
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/IJSONRPC2Handler.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/IJSONRPC2Handler.h
deleted file mode 100644
index f231edda9..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/IJSONRPC2Handler.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
-* \file IJSONRPC2Handler.h
-* \brief IJSONRPC2Handler class header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef IJSONRPC2HANDLER_INCLUDE
-#define IJSONRPC2HANDLER_INCLUDE
-
-#include "JSONHandler/IRPC2CommandsObserver.h"
-#include "JSONHandler/RPC2Notification.h"
-#include "JSONHandler/RPC2Response.h"
-#include "JSONHandler/RPC2Request.h"
-/**
- * \class IJSONRPC2Handler
- * \brief Interface for making a bridge between Application Manager
- * and RPCBus (HMI).
-*/
-class IJSONRPC2Handler
-{
-public:
-    /**
-     * \brief Destructor
-    */
-    virtual ~IJSONRPC2Handler() {}
-
-    /**
-     * \brief Notifies RPCBus of the will to receive specific notifications.
-     */
-    virtual void subscribeToNotifications( ) = 0;
-
-    /**
-     * \brief Sets pointer to instance of the class implementing RPC handling (App Manager).
-     * \param commandsObserver Pointer to implementation of IRPC2CommandsObserver.
-     * \sa IRPC2CommandsObserver.
-     */
-    virtual void setRPC2CommandsObserver( IRPC2CommandsObserver * commandsObserver ) = 0;
-
-    /**
-     * \brief Sends notification to RPCBus.
-     * \param command Json RPC2 notification to be sent to RPCBus.
-     */
-    virtual void sendNotification( const NsRPC2Communication::RPC2Notification * command ) = 0;
-
-    /**
-     * \brief Sends response to RPCBus.
-     * \param command Json RPC2 response to be sent to RPCBus.
-     */
-    virtual void sendResponse( const NsRPC2Communication::RPC2Response * command ) = 0;
-
-    /**
-     * \brief Sends request to RPCBus.
-     * \param command Json RPC2 request to be sent to RPCBus.
-     */
-    virtual void sendRequest( const NsRPC2Communication::RPC2Request * command ) = 0;
-};
-
-#endif // IJSONRPC2HANDLER_INCLUDE
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/IJsonHandler.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/IJsonHandler.h
deleted file mode 100644
index 8f249db32..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/IJsonHandler.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
-* \file IJsonHandler.h
-* \brief IJsonHandler class header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef IJSONHANDLER_INCLUDE
-#define IJSONHANDLER_INCLUDE
-
-#include "ProtocolHandler/ProtocolHandler.h"
-
-/**
- * \class IJsonHandler
- * \brief Interface for making a bridge between 
- * ProtocolHandler and Application Manager.
-*/
-class IJsonHandler
-{
-public:
-    /**
-     * \brief Destructor
-    */
-    virtual ~IJsonHandler() {}
-    /**
-     * \brief Sets pointer for Protocol layer handler for message exchange.
-     * \param protocolHandler Pointer to Protocol layer handler.
-     */
-    virtual void setProtocolHandler( NsProtocolHandler::ProtocolHandler * protocolHandler ) = 0;
-
-    /**
-     * \brief Sets pointer to instance of the class implementing RPC handling (Application Manager).
-     * \param messagesObserver Pointer to object of the class implementing IRPCMessagesObserver
-     * \sa IRPCMessagesObserver
-     */
-    virtual void setRPCMessagesObserver( IRPCMessagesObserver * messagesObserver ) = 0;
-
-    /**
-     * \brief Method for sending message to Mobile Application. 
-     * \param message Pointer to base class of SmartDeviceLink Json object
-     * to be serialized to Json message and sent to mobile App.
-     * \param sessionId ID of the session the message was received within.
-     */
-    virtual void sendRPCMessage( const NsSmartDeviceLinkRPC::SDLRPCMessage * message, int connectionKey ) = 0;
-    
-};
-
-#endif // IJSONHANDLER_INCLUDE
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/IRPC2CommandsObserver.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/IRPC2CommandsObserver.h
deleted file mode 100644
index 304b8c28a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/IRPC2CommandsObserver.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
-* \file IRPC2CommandsObserver.hpp
-* \brief Abstract class IRPC2CommandsObserver header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef IRPC2COMMANDS_OBSERVER_CLASS
-#define IRPC2COMMANDS_OBSERVER_CLASS
-
-#include "JSONHandler/RPC2Command.h"
-
-/**
- * \class IRPC2CommandsObserver
- * \brief Abstract class for communication with RPC2Bus.
- * Descendant class has to implement onCommandReceivedCallback
- * \sa onCommandReceivedCallback
-*/
-class IRPC2CommandsObserver
-{
-public:
-    /**
-     * \brief Callback function which is called by JSONRPC2Handler
-     *  when new RPC2Bus Json message is received from HMI.
-     * \param command RPC2Bus Json message
-     */
-    virtual void onCommandReceivedCallback( NsRPC2Communication::RPC2Command * command ) = 0;
-
-protected:
-    /**
-     * \brief Destructor
-    */
-    virtual ~IRPC2CommandsObserver(){};
-
-};
-
-#endif  //  IRPC2COMMANDS_OBSERVER_CLASS
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/IRPCMessagesObserver.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/IRPCMessagesObserver.h
deleted file mode 100644
index 54dc7f728..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/IRPCMessagesObserver.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
-* \file IRPCMessagesObserver.hpp
-* \brief Abstract class IRPCMessagesObserver header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef IRPCMESSAGES_OBSERVER_CLASS
-#define IRPCMESSAGES_OBSERVER_CLASS 
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-/**
- * \class IRPCMessagesObserver
- * \brief Abstract class for communication with Protocol layer. 
- * Descendant class has to implement onMessageReceivedCallback
- * \sa onMessageReceivedCallback
-*/
-class IRPCMessagesObserver
-{
-public:
-    /**
-     * \brief Callback function which is called by JSONHandler 
-     * when new SmartDeviceLink Json message is received from Mobile Application.
-     * \param message SmartDeviceLink Json message
-     */
-    virtual void onMessageReceivedCallback( NsSmartDeviceLinkRPC::SDLRPCMessage * message, int connectionKey ) = 0;
-
-protected:
-    /**
-     * \brief Destructor
-    */
-    virtual ~IRPCMessagesObserver() {};
-
-};
-
-#endif  //  IRPCMESSAGES_OBSERVER_CLASS
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/JSONHandler.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/JSONHandler.h
deleted file mode 100644
index cd7c71a1c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/JSONHandler.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
-* \file JSONHandler.hpp
-* \brief JSONHandler class header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef JSONHANDLER_CLASS
-#define JSONHANDLER_CLASS 
-
-#include "Logger.hpp"
-#include "JSONHandler/MessageQueue.h"
-#include "JSONHandler/SDLRPCMessage.h"
-#include "JSONHandler/IRPCMessagesObserver.h"
-#include "JSONHandler/IJsonHandler.h"
-#include "ProtocolHandler/SmartDeviceLinkRawMessage.h"
-#include "ProtocolHandler/IProtocolObserver.h"
-#include "ProtocolHandler/ProtocolHandler.h"
-
-const unsigned char RPC_REQUEST = 0x0;
-const unsigned char RPC_RESPONSE = 0x1;
-const unsigned char RPC_NOTIFICATION = 0x2;
-const unsigned char RPC_UNKNOWN = 0xF;
-
-/**
- * \class JSONHandler
- * \brief Class for handling message exchange between protocol layer and Application Manager.
- * Receives SmartDeviceLink Json message from Protocol layer, creates corresponding object and sends it to Application Manager.
- * Receives SmartDeviceLink message object from Application manager, serializes it into Json string and sends to Protocol Layer.
-*/
-class JSONHandler : public IJsonHandler, public NsProtocolHandler::IProtocolObserver
-{
-public:
-    /**
-     * \brief Constructor
-     * \param protocolHandler Pointer to Protocol Layer handler for message exchange.
-    */
-    JSONHandler( NsProtocolHandler::ProtocolHandler * protocolHandler = 0 );
-
-    /**
-     * \brief Destructor
-    */
-    virtual ~JSONHandler();
-
-    /*Methods from IProtocolObserver*/
-    /**
-     * \brief Sets pointer for Protocol layer handler for message exchange.
-     * \param protocolHandler Pointer to Protocol layer handler.
-     */
-    void setProtocolHandler( NsProtocolHandler::ProtocolHandler * protocolHandler );
-
-    /**
-     * \brief Callback for Protocol layer handler to notify of message received.
-     * \param message Object containing received data, size of it and connection key.
-     */
-    void onDataReceivedCallback( const NsProtocolHandler::SmartDeviceLinkRawMessage * message );
-    /*end of methods from IProtocolObserver*/
-
-    /*Methods for IRPCMessagesObserver*/
-    /**
-     * \brief Sets pointer to instance of the class implementing RPC handling (Application Manager).
-     * \param messagesObserver Pointer to object of the class implementing IRPCMessagesObserver
-     * \sa IRPCMessagesObserver
-     */
-    void setRPCMessagesObserver( IRPCMessagesObserver * messagesObserver );
-
-    /**
-     * \brief Method for sending message to Mobile Application. 
-     * \param message Pointer to base class of SmartDeviceLink Json object
-     * to be serialized to Json message and sent to mobile App.
-     * \param sessionId ID of the session the message was received within.
-     */
-    void sendRPCMessage( const NsSmartDeviceLinkRPC::SDLRPCMessage * message, int connectionKey );
-    /*End of methods for IRPCMessagesObserver*/
-       
-protected:
-    /**
-     * \brief Static method for handling messages from Mobile application.
-     * \param params Pointer to JSONHandler instance.
-     */
-    static void * waitForIncomingMessages( void * params );
-
-    /**
-     * \brief Static method for handling messages to Mobile application.
-     * \param params Pointer to JSONHandler instance.
-     */
-    static void * waitForOutgoingMessages( void * params );
-
-    /**
-     * \brief Helper method for clearing Json message from empty spaces
-     * in order for it to be parsed correctly by Json library.
-     * \param input Json string.
-     * \return Json string cleared from empty spaces.
-     */
-    std::string clearEmptySpaces( const std::string & input );
-
-    NsSmartDeviceLinkRPC::SDLRPCMessage * handleIncomingMessageProtocolV1(
-            const NsProtocolHandler::SmartDeviceLinkRawMessage * message );
-
-    NsSmartDeviceLinkRPC::SDLRPCMessage * handleIncomingMessageProtocolV2(
-            const NsProtocolHandler::SmartDeviceLinkRawMessage * message );
-
-    NsProtocolHandler::SmartDeviceLinkRawMessage * handleOutgoingMessageProtocolV1( 
-            int connectionKey, const NsSmartDeviceLinkRPC::SDLRPCMessage *  message );
-
-    NsProtocolHandler::SmartDeviceLinkRawMessage * handleOutgoingMessageProtocolV2( 
-            int connectionKey, const NsSmartDeviceLinkRPC::SDLRPCMessage *  message );
-    
-private:
-    /**
-      *\brief For logging.
-    */
-    static log4cplus::Logger                     mLogger;
-
-    /**
-      *\brief Points on instance of class implementing RPC handling (Application Manager).
-    */
-    IRPCMessagesObserver *             mMessagesObserver;
-
-    /* Data for IProtocolObserver */
-    /**
-      *\brief Points on instance of Protocol layer handler for message exchange.
-    */
-    NsProtocolHandler::ProtocolHandler *         mProtocolHandler;
-
-    /* End IProtocolObserver data */
-
-    /**
-      *\brief Queue of messages from Mobile Application.
-      *\sa MessageQueue
-    */
-    MessageQueue<const NsProtocolHandler::SmartDeviceLinkRawMessage*>          mIncomingMessages;
-
-    /**
-      *\brief Thread for handling messages from Mobile Application.
-    */
-    pthread_t             mWaitForIncomingMessagesThread;
-
-    /**
-      *\brief Queue of messages to Mobile Application.
-      *\sa MessageQueue
-    */
-    MessageQueue<std::pair<int,const NsSmartDeviceLinkRPC::SDLRPCMessage*>>    mOutgoingMessages;
-
-    /**
-      *\brief Thread for handling messages to Mobile Application.
-    */
-    pthread_t             mWaitForOutgoingMessagesThread;
-
-};
-
-#endif  //  JSONHANDLER_CLASS
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/JSONRPC2Handler.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/JSONRPC2Handler.h
deleted file mode 100644
index 6c452430d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/JSONRPC2Handler.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/**
-* \file JSONRPC2Handler.hpp
-* \brief JSONRPC2Handler class header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef JSONRPC2HANDLER_CLASS
-#define JSONRPC2HANDLER_CLASS
-
-
-#include <json/value.h>
-#include "mb_controller.hpp"
-#include "Logger.hpp"
-#include "JSONHandler/IJSONRPC2Handler.h"
-#include "JSONHandler/IRPC2CommandsObserver.h"
-#include "JSONHandler/RPC2Command.h"
-#include "JSONHandler/RPC2Notification.h"
-#include "JSONHandler/RPC2Response.h"
-#include "JSONHandler/RPC2Request.h"
-#include "JSONHandler/MessageQueue.h"
-
-/**
- * \class JSONRPC2Handler
- * \brief Class for handling message exchange between RPCBus and Application Manager.
- * Receives RPC2 Json message from RPCBus (HMI), creates corresponding object and sends it to Application Manager.
- * Receives RPC2 message object from Application manager, serializes it into Json object and sends to RPCBus (HMI). 
-*/
-class JSONRPC2Handler : public IJSONRPC2Handler, public NsMessageBroker::CMessageBrokerController
-{
-public:
-    /**
-     * \brief Constructor
-     * \param address Address of Message Broker (RPCBus) server.
-     * \param port Port of Message Broker (RPCBus) server.
-    */
-    JSONRPC2Handler( const std::string& address, uint16_t port );
-
-    /**
-     * \brief Destructor
-    */
-    virtual ~JSONRPC2Handler();
-
-    /*Methods from CMessageBrokerController*/
-    /**
-     * \brief Called on receiving response message from RPCBus.
-     * \param method Name of corresponding request method that was sent previously to RPCBus.
-     * \param root Received Json object.
-     */
-    void processResponse(std::string method, Json::Value& root);
-
-    /**
-     * \brief Called on receiving request message from RPCBus.
-     * \param root Received Json object.
-     */
-    void processRequest(Json::Value& root);
-
-    /**
-     * \brief Called on receiving notification message from RPCBus.
-     * \param root Received Json object.
-     */
-    void processNotification(Json::Value& root);
-
-    /**
-     * \brief Notifies RPCBus of the will to receive specific notifications.
-     */
-    void subscribeToNotifications( );
-    /*End of ethods from CMessageBrokerController*/
-
-    /*Methods for IRPC2CommandsObserver*/
-    /**
-     * \brief Sets pointer to instance of the class implementing RPC handling (App Manager).
-     * \param commandsObserver Pointer to implementation of IRPC2CommandsObserver.
-     * \sa IRPC2CommandsObserver.
-     */
-    void setRPC2CommandsObserver( IRPC2CommandsObserver * commandsObserver );
-
-    /**
-     * \brief Sends notification to RPCBus.
-     * \param command Json RPC2 notification to be sent to RPCBus.
-     */
-    void sendNotification( const NsRPC2Communication::RPC2Notification * command );
-
-    /**
-     * \brief Sends response to RPCBus.
-     * \param command Json RPC2 response to be sent to RPCBus.
-     */
-    void sendResponse( const NsRPC2Communication::RPC2Response * command );
-
-    /**
-     * \brief Sends request to RPCBus.
-     * \param command Json RPC2 request to be sent to RPCBus.
-     */
-    void sendRequest( const NsRPC2Communication::RPC2Request * command );
-    /*End of methods for IRPC2CommandsObserver*/
-
-private:
-    /**
-     * \brief Static method for handling requests & notifications from RPCBus.
-     * \param params Pointer to JSONRPC2Handler instance.
-     */
-    static void * waitForCommandsFromHMI( void * params );
-
-    /**
-     * \brief Static method for handling responses from RPCBus.
-     * \param params Pointer to JSONRPC2Handler instance.
-     */
-    static void * waitForResponsesFromHMI( void * params );
-
-    /**
-     * \brief Static method for handling responses to RPCBus.
-     * \param params Pointer to JSONRPC2Handler instance.
-     */
-    static void * waitForResponsesToHMI( void * params );
-
-    /**
-     * \brief Static method for handling requests to RPCBus.
-     * \param params Pointer to JSONRPC2Handler instance.
-     */
-    static void * waitForRequestsToHMI( void * params );
-
-    /**
-     * \brief Static method for handling notifications to RPCBus.
-     * \param params Pointer to JSONRPC2Handler instance.
-     */
-    static void * waitForNotificationsToHMI( void * params );
-
-private:
-    /**
-      *\brief For logging.
-    */
-    static log4cplus::Logger                              mLogger;
-
-    /**
-     * \struct ResponseContainer
-     * \brief Used for associating request method name to corresponding response.
-     * TODO - not needed with latest version of code generator?
-    */
-    struct ResponseContainer
-    {
-        /**
-          *\brief Request method name.
-        */
-        std::string methodName;
-
-        /**
-          *\brief Response.
-        */
-        Json::Value response;
-    };
-
-    /**
-      *\brief Points on instance of class implementing RPC handling (Application Manager). 
-    */
-    IRPC2CommandsObserver *                     mCommandsObserver;
-
-    /**
-      *\brief Queue of requests & notifications from RPCBus.
-      *\sa MessageQueue
-    */
-    MessageQueue<Json::Value>                    mCommandsFromHMI;
-
-    /**
-      *\brief Thread for handling requests & notifications from HMI.
-    */
-    pthread_t                             mWaitForCommandsFromHMI;
-
-    /**
-      *\brief Thread for handling responses from HMI.
-    */
-    pthread_t                            mWaitForResponsesFromHMI;
-
-    /**
-      *\brief Queue of responses from HMI.
-      * \sa MessageQueue
-    */
-    MessageQueue<ResponseContainer>             mResponsesFromHMI;
-
-    /**
-      *\brief Queue of requests to HMI.
-      * \sa MessageQueue
-    */
-    MessageQueue<const NsRPC2Communication::RPC2Request*> mRequestsToHMI;
-
-    /**
-      *\brief Queue of responses to HMI.
-      * \sa MessageQueue
-    */
-    MessageQueue<const NsRPC2Communication::RPC2Response*> mResponsesToHMI;
-
-    /**
-      *\brief Queue of notifications to HMI.
-      * \sa MessageQueue
-    */
-    MessageQueue<const NsRPC2Communication::RPC2Notification*> mNotificationsToHMI;
-
-    /**
-      *\brief Thread for handling requests to HMI.
-    */
-    pthread_t                               mWaitForRequestsToHMI;
-
-    /**
-      *\brief Thread for handling responses to HMI.
-    */
-    pthread_t                               mWaitForResponsesToHMI;
-
-    /**
-      *\brief Thread for handling notifications to HMI.
-    */
-    pthread_t                               mWaitForNotificationsToHMI;
-};
-
-#endif  //  JSONRPC2HANDLER_CLASS
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/MessageQueue.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/MessageQueue.h
deleted file mode 100644
index eeffc1097..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/MessageQueue.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
-* \file MessageQueue.hpp
-* \brief Template MessageQueue class header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef MESSAGE_QUEUE_CLASS
-#define MESSAGE_QUEUE_CLASS 
-
-
-#include <pthread.h>
-#include <queue>
-
-/**
- * \class MessageQueue
- * \brief Wrapper for multithreading queue.
-*/
-template <typename T> class MessageQueue
-{
-public:
-    /**
-     * \brief Default constructor
-    */
-    MessageQueue();
-
-    /**
-     * \brief Constructor
-     * \param queue Existing queue.
-    */
-    explicit MessageQueue( std::queue<T> queue );
-
-    /**
-     * \brief Destructor
-    */
-    ~MessageQueue();
-
-    /**
-     * \brief Returns size of the queue.
-     * \return Size of the queue.
-     */
-    int size() const;
-
-    /**
-     * \brief If queue is empty.
-     * \return Is queue empty.
-     */
-    bool empty() const;
-
-    /**
-     * \brief Adds element to the queue.
-     * \param element Element to be added to the queue.n
-     */
-    void push( const T & element );
-
-    /**
-     * \brief Removes element from the queue and returns it.
-     * \return To element of the queue.
-     */
-    T pop();
-
-    /**
-     * \brief Conditional wait.
-     */
-    void wait();
-
-private:
-    /**
-      *\brief Queue
-    */
-    std::queue<T> mQueue;
-    /**
-      *\brief Mutex for queue locking.
-    */
-    mutable pthread_mutex_t mMutex;
-    /**
-      *\brief Condition for waiting.
-    */
-    pthread_cond_t mCond;
-    /**
-      *\brief Bool condition for waiting.
-    */
-    bool mIsUp;
-};
-
-template <typename T> MessageQueue<T>::MessageQueue()
-:mMutex( PTHREAD_MUTEX_INITIALIZER )
-,mCond( PTHREAD_COND_INITIALIZER )
-,mIsUp( false )
-{
-    pthread_mutex_init( &mMutex, NULL );
-    pthread_cond_init( &mCond, NULL );
-}
-
-template <typename T> MessageQueue<T>::MessageQueue( std::queue<T> queue )
-{
-    pthread_mutex_init( &mMutex, NULL );
-    pthread_cond_init( &mCond, NULL );
-    pthread_mutex_lock( &mMutex );
-    mQueue = std::queue<T>( queue );
-    pthread_mutex_unlock( &mMutex );
-}
-
-template <typename T> MessageQueue<T>::~MessageQueue()
-{
-    pthread_cond_destroy( &mCond );
-    pthread_mutex_destroy( &mMutex );
-}
-
-template<typename T> void MessageQueue<T>::wait()
-{
-    pthread_mutex_lock( &mMutex );
-    while ( !mIsUp ) 
-    {
-        pthread_cond_wait( &mCond, &mMutex );
-    }
-    mIsUp = false;
-    pthread_mutex_unlock( &mMutex );
-}
-
-template <typename T> int MessageQueue<T>::size() const
-{
-    int result = 0;
-    pthread_mutex_lock( &mMutex );
-    result = mQueue.size();
-    pthread_mutex_unlock( &mMutex );
-    return result;
-}
-    
-template <typename T> bool MessageQueue<T>::empty() const
-{
-    bool result = true;
-    pthread_mutex_lock( &mMutex );
-    result = mQueue.empty();
-    pthread_mutex_unlock( &mMutex );
-    return result;
-}
-
-template <typename T> void MessageQueue<T>::push( const T & element )
-{
-    pthread_mutex_lock( &mMutex );
-    mQueue.push( element );
-
-    pthread_cond_signal( &mCond );
-    mIsUp = true;
-
-    pthread_mutex_unlock( &mMutex );
-}
-
-template <typename T> T MessageQueue<T>::pop( )
-{
-    pthread_mutex_lock( &mMutex );
-    if ( mQueue.empty() )
-    {
-        //error, TRACE
-    }
-    
-    T result = mQueue.front();
-    mQueue.pop();
-       
-    pthread_mutex_unlock( &mMutex );
-    return result; 
-}
-
-#endif  //  MESSAGE_QUEUE_CLASS
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Command.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Command.h
deleted file mode 100644
index aa2f7cabf..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Command.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
-* \file RPC2Command.hpp
-* \brief RPC2Command class header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef RPC2COMMAND_CLASS
-#define RPC2COMMAND_CLASS
-
-/**
-  *\namespace NsRPC2Communication
-  *\brief Namespace for communication with HMI.
-*/
-namespace NsRPC2Communication
-{
-    /**
-     * \class RPC2Command
-     * \brief Base class for objects generated from Json RPC2
-    */
-    class RPC2Command
-    {
-    public:
-        /**
-         * \enum CommandType
-         * \brief RPC2 message types.
-        */
-        enum CommandType { REQUEST = 0x0, RESPONSE = 0x1, NOTIFICATION = 0x2, ERROR = 0x3, UNDEFINED };
-    public:
-        /**
-         * \brief Constructor
-        */
-        RPC2Command( );
-
-        /**
-         * \brief Constructor
-         * \param type RPC2 type
-         * \sa CommandType
-        */
-        RPC2Command( CommandType type );
-
-        /**
-         * \brief Constructor
-         * \param type RPC2 type
-         * \sa CommandType
-         * \param method ID of the method.
-        */
-        RPC2Command( CommandType type, int method );
-
-        /**
-         * \brief Destructor
-        */
-        virtual ~RPC2Command();
-
-        /**
-         * \brief Getter for message type.
-         * \return Type of Json RPC2 message.
-         * \sa CommandType.
-         */
-        virtual CommandType getCommandType( ) const;
-
-        /**
-         * \brief Setter for message type.
-         * \param commandType Type of Json RPC2 message.
-         */
-        virtual void setCommandType( CommandType commandType );
-
-        /**
-         * \brief Getter for method id
-         * \return Id of the method in message.
-         */
-        virtual int getMethod() const;
-
-        /**
-         * \brief Setter for method id.
-         * \param method Id of method in message.
-         */
-        virtual void setMethod( int method );
-
-    protected:
-        /**
-          *\brief Type of Json RPC2 message.
-        */
-        CommandType mCommandType;
-
-        /**
-          *\brief Id of method in message.
-        */
-        int mMethod;
-    };
-
-}
-
-#endif  //  RPC2COMMAND_CLASS
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Error.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Error.h
deleted file mode 100644
index 0bd2fdcb3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Error.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
-* \file RPC2Error.hpp
-* \brief RPC2Error class header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef RPC2COMMUNICATION_RPC2ERROR
-#define RPC2COMMUNICATION_RPC2ERROR
-
-#include <string>
-#include "RPC2Command.h"
-
-/**
-  *\namespace NsRPC2Communication
-  *\brief Namespace for communication with HMI.
-*/
-namespace NsRPC2Communication
-{
-    /**
-     * \class RPC2Error
-     * \brief Base class for erros in Json RPC2
-    */
-    class RPC2Error : public RPC2Command
-    {
-    public:
-        /**
-         * \enum Codes
-         * \brief Error codes.
-        */   
-    	enum Codes
-    	{
-              INVALID_REQUEST=-32600,
-              METHOD_NOT_FOUND=-32601,
-              INVALID_PARAMS=-32602,
-              INTERNAL_ERROR=-32603
-    	};
-
-        /**
-         * \brief Constructor
-        */
-        RPC2Error(void);
-
-        /**
-         * \brief Copy Constructor
-         * \param err RPC2Error instance.
-        */
-        RPC2Error(const RPC2Error& err);
-
-        /**
-         * \brief Constructor
-         * \param code Error code from 
-         * \sa Codes
-         * \param message Error message
-         * \param id Method id.
-        */
-        RPC2Error(int code, const std::string& message,int id);
-
-        /**
-         * \brief Constructor
-         * \param code Error code from 
-         * \sa Codes
-         * \param message Error message.
-        */
-        RPC2Error(int code, const std::string& message);
-
-        /**
-         * \brief Destructor
-        */
-        virtual ~RPC2Error();
-
-        /**
-         * \brief Getter of id of the message.
-         * \return Id of the message.
-         */
-        int getId() const;
-
-        /**
-         * \brief Setter of id of the message.
-         * \param id Id of the message.
-         * \return type description
-         */
-        void setId(const int id);
-
-        /**
-         * \brief Resets id of the message.
-         * TODO why do we need this?
-         */
-        void resetId(void);
-
-        /**
-         * \brief Getter for error code.
-         * \return Error code
-         * \sa Cods
-         */
-        int getErrorCode(void) const;
-
-        /**
-         * \brief Setter of error code.
-         * \param code Error code
-         * \sa Cods.
-         */
-        void setErrorCode(int code);
-
-        /**
-         * \brief Getter of error string
-         * \return Error string
-         */
-        const std::string& getErrorString(void) const;
-
-        /**
-         * \brief Setter of error string
-         * \param message Error string.
-         */
-        void setErrorString(const std::string& message);
-
-    private:
-    /**
-      *\brief Id of message
-      * //! setting mId to 0 will be result of "resetting", in such packets id passed as null (error only)
-    */
-	int mId;
-
-        /**
-          *\brief Error code
-        */
-        int mCode;
-
-        /**
-          *\brief Error string
-        */
-        std::string mMessage;
-        
-        friend class RPC2ErrorMarshaller;
-    };
-}
-
-#endif  //  RPC2COMMUNICATION_RPC2ERROR
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2ErrorMarshaller.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2ErrorMarshaller.h
deleted file mode 100644
index b16a863c5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2ErrorMarshaller.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
-* \file RPC2ErrorMarshaller.hpp
-* \brief RPC2ErrorMarshaller class header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef RPC2ERRORMARSHALLER_INCLUDE
-#define RPC2ERRORMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-#include "RPC2Error.h"
-
-/**
-  *\namespace NsRPC2Communication
-  *\brief Namespace for communication with HMI.
-*/
-namespace NsRPC2Communication
-{
-    /**
-     * \class RPC2ErrorMarshaller
-     * \brief For serializing/deserializing of error messages.
-    */
-  struct RPC2ErrorMarshaller
-  {
-    /**
-     * \brief Deserialized object form string.
-     * \param s Json string
-     * \param e Output: deserialized object.
-     * \return Whether deserialization was successful.
-     */
-    static bool fromString(const std::string& s,RPC2Error& e);
-
-    /**
-     * \brief Serializes object to string.
-     * \param e Error object to be serialized.
-     * \return Json string.
-     */
-    static const std::string toString(const RPC2Error& e);
-
-    /**
-     * \brief Deserialized object from Json
-     * \param s Json string
-     * \param e Output: deserialized object.
-     * \return Whether deserialization was successful.
-     */
-    static bool fromJSON(const Json::Value& s,RPC2Error& e);
-
-    /**
-     * \brief Serializes object to Json.
-     * \param e Error object to be serialized.
-     * \return Json value.
-     */
-    static Json::Value toJSON(const RPC2Error& e);
-  };
-}
-
-
-#endif //  RPC2ERRORMARSHALLER_INCLUDE
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Notification.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Notification.h
deleted file mode 100644
index ba286cd2e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Notification.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
-* \file RPC2Notification.hpp
-* \brief RPC2Notification class header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef RPCS2_NOTIFICATION_CLASS
-#define RPCS2_NOTIFICATION_CLASS
-
-#include "RPC2Command.h"
-
-/**
-  *\namespace NsRPC2Communication
-  *\brief Namespace for communication with HMI.
-*/
-namespace NsRPC2Communication
-{
-    /**
-     * \class RPC2Notification
-     * \brief Base class for notifications generated from Json RPC2
-    */
-    class RPC2Notification : public RPC2Command
-    {
-    public:
-        /**
-         * \brief Default Constructor
-        */
-        RPC2Notification( );
-
-        /**
-         * \brief Constructor
-         * \param method Method Id.
-        */
-        RPC2Notification( int method );
-
-        /**
-         * \brief Destructor
-        */
-        ~RPC2Notification();
-    };
-}
-
-#endif  //  RPCS2_NOTIFICATION_CLASS
-
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/Marshaller.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/Marshaller.h
deleted file mode 100644
index 24db51feb..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/Marshaller.h
+++ /dev/null
@@ -1,1645 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef MARSHALLER_INCLUDE
-#define MARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "JSONHandler/RPC2Error.h"
-#include "JSONHandler/RPC2Notification.h"
-#include "JSONHandler/RPC2Request.h"
-#include "JSONHandler/RPC2Response.h"
-
-#include "JSONHandler/RPC2ErrorMarshaller.h"
-
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/ActivateAppMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/ActivateAppResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/GetAppListMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/GetAppListResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/GetDeviceListMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/GetDeviceListResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/OnAppDeactivatedMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/OnAppRegisteredMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/OnAppUnregisteredMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/OnDeviceListUpdatedMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/SendDataMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/SendDataResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/Buttons/GetCapabilitiesMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/Buttons/GetCapabilitiesResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/Buttons/OnButtonEventMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/Buttons/OnButtonPressMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/ChangeRegistrationMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/ChangeRegistrationResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/GetCapabilitiesMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/GetCapabilitiesResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/GetLanguageMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/GetLanguageResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/GetSupportedLanguagesMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/GetSupportedLanguagesResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/OnLanguageChangeMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/SpeakMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/SpeakResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AddCommandMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AddCommandResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AddSubMenuMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AddSubMenuResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AlertMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AlertResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AlertManeuverMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AlertManeuverResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ChangeRegistrationMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ChangeRegistrationResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/CreateInteractionChoiceSetMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/CreateInteractionChoiceSetResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DeleteCommandMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DeleteCommandResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DeleteInteractionChoiceSetMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DeleteInteractionChoiceSetResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DeleteSubMenuMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DeleteSubMenuResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DialNumberMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DialNumberResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/EndAudioPassThruMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/EndAudioPassThruResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/GetCapabilitiesMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/GetCapabilitiesResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/GetLanguageMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/GetLanguageResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/GetSupportedLanguagesMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/GetSupportedLanguagesResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnCommandMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnDeviceChosenMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnDriverDistractionMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnLanguageChangeMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnReadyMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnSystemContextMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnTBTClientStateMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/PerformAudioPassThruMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/PerformAudioPassThruResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/PerformInteractionMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/PerformInteractionResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ResetGlobalPropertiesMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ResetGlobalPropertiesResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ScrollableMessageMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ScrollableMessageResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetAppIconMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetAppIconResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetDisplayLayoutMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetDisplayLayoutResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetGlobalPropertiesMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetGlobalPropertiesResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetMediaClockTimerMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetMediaClockTimerResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ShowMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ShowResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ShowConstantTBTMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ShowConstantTBTResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SliderMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SliderResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/UpdateTurnListMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/UpdateTurnListResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/AddCommandMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/AddCommandResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/ChangeRegistrationMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/ChangeRegistrationResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/DeleteCommandMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/DeleteCommandResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/GetCapabilitiesMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/GetCapabilitiesResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/GetLanguageMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/GetLanguageResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/GetSupportedLanguagesMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/GetSupportedLanguagesResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/OnCommandMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/OnLanguageChangeMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/GetDTCsMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/GetDTCsResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/GetVehicleDataMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/GetVehicleDataResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/GetVehicleTypeMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/GetVehicleTypeResponseMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/OnVehicleDataMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/ReadDIDMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/ReadDIDResponseMarshaller.h"
-
-/*
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-namespace NsRPC2Communication
-{
-
-class Marshaller
-{
-public:
-
-  enum Methods
-  {
-    METHOD_INVALID=-1,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ACTIVATEAPP,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ACTIVATEAPPRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETAPPLIST,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETAPPLISTRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETDEVICELIST,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETDEVICELISTRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPDEACTIVATED,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPDEACTIVATEDRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPREGISTERED,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPUNREGISTERED,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONDEVICELISTUPDATED,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__SENDDATA,
-    METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__SENDDATARESPONSE,
-    METHOD_NSRPC2COMMUNICATION_BUTTONS__GETCAPABILITIES,
-    METHOD_NSRPC2COMMUNICATION_BUTTONS__GETCAPABILITIESRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_BUTTONS__ONBUTTONEVENT,
-    METHOD_NSRPC2COMMUNICATION_BUTTONS__ONBUTTONPRESS,
-    METHOD_NSRPC2COMMUNICATION_TTS__CHANGEREGISTRATION,
-    METHOD_NSRPC2COMMUNICATION_TTS__CHANGEREGISTRATIONRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_TTS__GETCAPABILITIES,
-    METHOD_NSRPC2COMMUNICATION_TTS__GETCAPABILITIESRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_TTS__GETLANGUAGE,
-    METHOD_NSRPC2COMMUNICATION_TTS__GETLANGUAGERESPONSE,
-    METHOD_NSRPC2COMMUNICATION_TTS__GETSUPPORTEDLANGUAGES,
-    METHOD_NSRPC2COMMUNICATION_TTS__GETSUPPORTEDLANGUAGESRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_TTS__ONLANGUAGECHANGE,
-    METHOD_NSRPC2COMMUNICATION_TTS__SPEAK,
-    METHOD_NSRPC2COMMUNICATION_TTS__SPEAKRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__ADDCOMMAND,
-    METHOD_NSRPC2COMMUNICATION_UI__ADDCOMMANDRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__ADDSUBMENU,
-    METHOD_NSRPC2COMMUNICATION_UI__ADDSUBMENURESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__ALERT,
-    METHOD_NSRPC2COMMUNICATION_UI__ALERTRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__ALERTMANEUVER,
-    METHOD_NSRPC2COMMUNICATION_UI__ALERTMANEUVERRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__CHANGEREGISTRATION,
-    METHOD_NSRPC2COMMUNICATION_UI__CHANGEREGISTRATIONRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__CREATEINTERACTIONCHOICESET,
-    METHOD_NSRPC2COMMUNICATION_UI__CREATEINTERACTIONCHOICESETRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__DELETECOMMAND,
-    METHOD_NSRPC2COMMUNICATION_UI__DELETECOMMANDRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__DELETEINTERACTIONCHOICESET,
-    METHOD_NSRPC2COMMUNICATION_UI__DELETEINTERACTIONCHOICESETRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__DELETESUBMENU,
-    METHOD_NSRPC2COMMUNICATION_UI__DELETESUBMENURESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__DIALNUMBER,
-    METHOD_NSRPC2COMMUNICATION_UI__DIALNUMBERRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__ENDAUDIOPASSTHRU,
-    METHOD_NSRPC2COMMUNICATION_UI__ENDAUDIOPASSTHRURESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__GETCAPABILITIES,
-    METHOD_NSRPC2COMMUNICATION_UI__GETCAPABILITIESRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__GETLANGUAGE,
-    METHOD_NSRPC2COMMUNICATION_UI__GETLANGUAGERESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__GETSUPPORTEDLANGUAGES,
-    METHOD_NSRPC2COMMUNICATION_UI__GETSUPPORTEDLANGUAGESRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__ONCOMMAND,
-    METHOD_NSRPC2COMMUNICATION_UI__ONDEVICECHOSEN,
-    METHOD_NSRPC2COMMUNICATION_UI__ONDRIVERDISTRACTION,
-    METHOD_NSRPC2COMMUNICATION_UI__ONLANGUAGECHANGE,
-    METHOD_NSRPC2COMMUNICATION_UI__ONREADY,
-    METHOD_NSRPC2COMMUNICATION_UI__ONSYSTEMCONTEXT,
-    METHOD_NSRPC2COMMUNICATION_UI__ONTBTCLIENTSTATE,
-    METHOD_NSRPC2COMMUNICATION_UI__PERFORMAUDIOPASSTHRU,
-    METHOD_NSRPC2COMMUNICATION_UI__PERFORMAUDIOPASSTHRURESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__PERFORMINTERACTION,
-    METHOD_NSRPC2COMMUNICATION_UI__PERFORMINTERACTIONRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__RESETGLOBALPROPERTIES,
-    METHOD_NSRPC2COMMUNICATION_UI__RESETGLOBALPROPERTIESRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__SCROLLABLEMESSAGE,
-    METHOD_NSRPC2COMMUNICATION_UI__SCROLLABLEMESSAGERESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__SETAPPICON,
-    METHOD_NSRPC2COMMUNICATION_UI__SETAPPICONRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__SETDISPLAYLAYOUT,
-    METHOD_NSRPC2COMMUNICATION_UI__SETDISPLAYLAYOUTRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__SETGLOBALPROPERTIES,
-    METHOD_NSRPC2COMMUNICATION_UI__SETGLOBALPROPERTIESRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__SETMEDIACLOCKTIMER,
-    METHOD_NSRPC2COMMUNICATION_UI__SETMEDIACLOCKTIMERRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__SHOW,
-    METHOD_NSRPC2COMMUNICATION_UI__SHOWRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__SHOWCONSTANTTBT,
-    METHOD_NSRPC2COMMUNICATION_UI__SHOWCONSTANTTBTRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__SLIDER,
-    METHOD_NSRPC2COMMUNICATION_UI__SLIDERRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_UI__UPDATETURNLIST,
-    METHOD_NSRPC2COMMUNICATION_UI__UPDATETURNLISTRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_VR__ADDCOMMAND,
-    METHOD_NSRPC2COMMUNICATION_VR__ADDCOMMANDRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_VR__CHANGEREGISTRATION,
-    METHOD_NSRPC2COMMUNICATION_VR__CHANGEREGISTRATIONRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_VR__DELETECOMMAND,
-    METHOD_NSRPC2COMMUNICATION_VR__DELETECOMMANDRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_VR__GETCAPABILITIES,
-    METHOD_NSRPC2COMMUNICATION_VR__GETCAPABILITIESRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_VR__GETLANGUAGE,
-    METHOD_NSRPC2COMMUNICATION_VR__GETLANGUAGERESPONSE,
-    METHOD_NSRPC2COMMUNICATION_VR__GETSUPPORTEDLANGUAGES,
-    METHOD_NSRPC2COMMUNICATION_VR__GETSUPPORTEDLANGUAGESRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_VR__ONCOMMAND,
-    METHOD_NSRPC2COMMUNICATION_VR__ONLANGUAGECHANGE,
-    METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETDTCS,
-    METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETDTCSRESPONSE,
-    METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLEDATA,
-    METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLEDATARESPONSE,
-    METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLETYPE,
-    METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLETYPERESPONSE,
-    METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__ONVEHICLEDATA,
-    METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__READDID,
-    METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__READDIDRESPONSE
-  };
-
-
-  Marshaller()			{}
-  ~Marshaller()			{}
-
-  static ::NsRPC2Communication::RPC2Command* fromString(const std::string&);
-  static std::string toString(const ::NsRPC2Communication::RPC2Command* msg);
-
-  static ::NsRPC2Communication::RPC2Command* fromJSON(const Json::Value&);
-  static Json::Value toJSON(const ::NsRPC2Communication::RPC2Command* msg);
-
-protected:
-
-// NsRPC2Communication::BasicCommunication::ActivateApp
-  static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::ActivateApp& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__ActivateApp.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::ActivateApp& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__ActivateApp.toString(res);
-  }
-
-// NsRPC2Communication::BasicCommunication::ActivateAppResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::ActivateAppResponse& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__ActivateAppResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::ActivateAppResponse& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__ActivateAppResponse.toString(res);
-  }
-
-// NsRPC2Communication::BasicCommunication::GetAppList
-  static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::GetAppList& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__GetAppList.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::GetAppList& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__GetAppList.toString(res);
-  }
-
-// NsRPC2Communication::BasicCommunication::GetAppListResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::GetAppListResponse& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__GetAppListResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::GetAppListResponse& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__GetAppListResponse.toString(res);
-  }
-
-// NsRPC2Communication::BasicCommunication::GetDeviceList
-  static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::GetDeviceList& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__GetDeviceList.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::GetDeviceList& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__GetDeviceList.toString(res);
-  }
-
-// NsRPC2Communication::BasicCommunication::GetDeviceListResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::GetDeviceListResponse& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__GetDeviceListResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::GetDeviceListResponse& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__GetDeviceListResponse.toString(res);
-  }
-
-// NsRPC2Communication::BasicCommunication::OnAppDeactivated
-  static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::OnAppDeactivated& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__OnAppDeactivated.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::OnAppDeactivated& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__OnAppDeactivated.toString(res);
-  }
-
-// NsRPC2Communication::BasicCommunication::OnAppDeactivatedResponse
-  /*static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::OnAppDeactivatedResponse& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__OnAppDeactivatedResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::OnAppDeactivatedResponse& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__OnAppDeactivatedResponse.toString(res);
-  }*/
-
-// NsRPC2Communication::BasicCommunication::OnAppRegistered
-  static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::OnAppRegistered& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__OnAppRegistered.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::OnAppRegistered& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__OnAppRegistered.toString(res);
-  }
-
-// NsRPC2Communication::BasicCommunication::OnAppUnregistered
-  static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::OnAppUnregistered& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__OnAppUnregistered.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::OnAppUnregistered& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__OnAppUnregistered.toString(res);
-  }
-
-// NsRPC2Communication::BasicCommunication::OnDeviceListUpdated
-  static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::OnDeviceListUpdated& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__OnDeviceListUpdated.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::OnDeviceListUpdated& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__OnDeviceListUpdated.toString(res);
-  }
-
-// NsRPC2Communication::BasicCommunication::SendData
-  static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::SendData& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__SendData.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::SendData& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__SendData.toString(res);
-  }
-
-// NsRPC2Communication::BasicCommunication::SendDataResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::BasicCommunication::SendDataResponse& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__SendDataResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::BasicCommunication::SendDataResponse& res)
-  {
-    return mNsRPC2Communication_BasicCommunication__SendDataResponse.toString(res);
-  }
-
-// NsRPC2Communication::Buttons::GetCapabilities
-  static bool fromString(const std::string& str, NsRPC2Communication::Buttons::GetCapabilities& res)
-  {
-    return mNsRPC2Communication_Buttons__GetCapabilities.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::Buttons::GetCapabilities& res)
-  {
-    return mNsRPC2Communication_Buttons__GetCapabilities.toString(res);
-  }
-
-// NsRPC2Communication::Buttons::GetCapabilitiesResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::Buttons::GetCapabilitiesResponse& res)
-  {
-    return mNsRPC2Communication_Buttons__GetCapabilitiesResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::Buttons::GetCapabilitiesResponse& res)
-  {
-    return mNsRPC2Communication_Buttons__GetCapabilitiesResponse.toString(res);
-  }
-
-// NsRPC2Communication::Buttons::OnButtonEvent
-  static bool fromString(const std::string& str, NsRPC2Communication::Buttons::OnButtonEvent& res)
-  {
-    return mNsRPC2Communication_Buttons__OnButtonEvent.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::Buttons::OnButtonEvent& res)
-  {
-    return mNsRPC2Communication_Buttons__OnButtonEvent.toString(res);
-  }
-
-// NsRPC2Communication::Buttons::OnButtonPress
-  static bool fromString(const std::string& str, NsRPC2Communication::Buttons::OnButtonPress& res)
-  {
-    return mNsRPC2Communication_Buttons__OnButtonPress.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::Buttons::OnButtonPress& res)
-  {
-    return mNsRPC2Communication_Buttons__OnButtonPress.toString(res);
-  }
-
-// NsRPC2Communication::TTS::ChangeRegistration
-  static bool fromString(const std::string& str, NsRPC2Communication::TTS::ChangeRegistration& res)
-  {
-    return mNsRPC2Communication_TTS__ChangeRegistration.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::TTS::ChangeRegistration& res)
-  {
-    return mNsRPC2Communication_TTS__ChangeRegistration.toString(res);
-  }
-
-// NsRPC2Communication::TTS::ChangeRegistrationResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::TTS::ChangeRegistrationResponse& res)
-  {
-    return mNsRPC2Communication_TTS__ChangeRegistrationResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::TTS::ChangeRegistrationResponse& res)
-  {
-    return mNsRPC2Communication_TTS__ChangeRegistrationResponse.toString(res);
-  }
-
-// NsRPC2Communication::TTS::GetCapabilities
-  static bool fromString(const std::string& str, NsRPC2Communication::TTS::GetCapabilities& res)
-  {
-    return mNsRPC2Communication_TTS__GetCapabilities.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::TTS::GetCapabilities& res)
-  {
-    return mNsRPC2Communication_TTS__GetCapabilities.toString(res);
-  }
-
-// NsRPC2Communication::TTS::GetCapabilitiesResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::TTS::GetCapabilitiesResponse& res)
-  {
-    return mNsRPC2Communication_TTS__GetCapabilitiesResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::TTS::GetCapabilitiesResponse& res)
-  {
-    return mNsRPC2Communication_TTS__GetCapabilitiesResponse.toString(res);
-  }
-
-// NsRPC2Communication::TTS::GetLanguage
-  static bool fromString(const std::string& str, NsRPC2Communication::TTS::GetLanguage& res)
-  {
-    return mNsRPC2Communication_TTS__GetLanguage.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::TTS::GetLanguage& res)
-  {
-    return mNsRPC2Communication_TTS__GetLanguage.toString(res);
-  }
-
-// NsRPC2Communication::TTS::GetLanguageResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::TTS::GetLanguageResponse& res)
-  {
-    return mNsRPC2Communication_TTS__GetLanguageResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::TTS::GetLanguageResponse& res)
-  {
-    return mNsRPC2Communication_TTS__GetLanguageResponse.toString(res);
-  }
-
-// NsRPC2Communication::TTS::GetSupportedLanguages
-  static bool fromString(const std::string& str, NsRPC2Communication::TTS::GetSupportedLanguages& res)
-  {
-    return mNsRPC2Communication_TTS__GetSupportedLanguages.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::TTS::GetSupportedLanguages& res)
-  {
-    return mNsRPC2Communication_TTS__GetSupportedLanguages.toString(res);
-  }
-
-// NsRPC2Communication::TTS::GetSupportedLanguagesResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::TTS::GetSupportedLanguagesResponse& res)
-  {
-    return mNsRPC2Communication_TTS__GetSupportedLanguagesResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::TTS::GetSupportedLanguagesResponse& res)
-  {
-    return mNsRPC2Communication_TTS__GetSupportedLanguagesResponse.toString(res);
-  }
-
-// NsRPC2Communication::TTS::OnLanguageChange
-  static bool fromString(const std::string& str, NsRPC2Communication::TTS::OnLanguageChange& res)
-  {
-    return mNsRPC2Communication_TTS__OnLanguageChange.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::TTS::OnLanguageChange& res)
-  {
-    return mNsRPC2Communication_TTS__OnLanguageChange.toString(res);
-  }
-
-// NsRPC2Communication::TTS::Speak
-  static bool fromString(const std::string& str, NsRPC2Communication::TTS::Speak& res)
-  {
-    return mNsRPC2Communication_TTS__Speak.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::TTS::Speak& res)
-  {
-    return mNsRPC2Communication_TTS__Speak.toString(res);
-  }
-
-// NsRPC2Communication::TTS::SpeakResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::TTS::SpeakResponse& res)
-  {
-    return mNsRPC2Communication_TTS__SpeakResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::TTS::SpeakResponse& res)
-  {
-    return mNsRPC2Communication_TTS__SpeakResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::AddCommand
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::AddCommand& res)
-  {
-    return mNsRPC2Communication_UI__AddCommand.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::AddCommand& res)
-  {
-    return mNsRPC2Communication_UI__AddCommand.toString(res);
-  }
-
-// NsRPC2Communication::UI::AddCommandResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::AddCommandResponse& res)
-  {
-    return mNsRPC2Communication_UI__AddCommandResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::AddCommandResponse& res)
-  {
-    return mNsRPC2Communication_UI__AddCommandResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::AddSubMenu
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::AddSubMenu& res)
-  {
-    return mNsRPC2Communication_UI__AddSubMenu.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::AddSubMenu& res)
-  {
-    return mNsRPC2Communication_UI__AddSubMenu.toString(res);
-  }
-
-// NsRPC2Communication::UI::AddSubMenuResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::AddSubMenuResponse& res)
-  {
-    return mNsRPC2Communication_UI__AddSubMenuResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::AddSubMenuResponse& res)
-  {
-    return mNsRPC2Communication_UI__AddSubMenuResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::Alert
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::Alert& res)
-  {
-    return mNsRPC2Communication_UI__Alert.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::Alert& res)
-  {
-    return mNsRPC2Communication_UI__Alert.toString(res);
-  }
-
-// NsRPC2Communication::UI::AlertResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::AlertResponse& res)
-  {
-    return mNsRPC2Communication_UI__AlertResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::AlertResponse& res)
-  {
-    return mNsRPC2Communication_UI__AlertResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::AlertManeuver
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::AlertManeuver& res)
-  {
-    return mNsRPC2Communication_UI__AlertManeuver.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::AlertManeuver& res)
-  {
-    return mNsRPC2Communication_UI__AlertManeuver.toString(res);
-  }
-
-// NsRPC2Communication::UI::AlertManeuverResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::AlertManeuverResponse& res)
-  {
-    return mNsRPC2Communication_UI__AlertManeuverResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::AlertManeuverResponse& res)
-  {
-    return mNsRPC2Communication_UI__AlertManeuverResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::ChangeRegistration
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::ChangeRegistration& res)
-  {
-    return mNsRPC2Communication_UI__ChangeRegistration.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::ChangeRegistration& res)
-  {
-    return mNsRPC2Communication_UI__ChangeRegistration.toString(res);
-  }
-
-// NsRPC2Communication::UI::ChangeRegistrationResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::ChangeRegistrationResponse& res)
-  {
-    return mNsRPC2Communication_UI__ChangeRegistrationResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::ChangeRegistrationResponse& res)
-  {
-    return mNsRPC2Communication_UI__ChangeRegistrationResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::CreateInteractionChoiceSet
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::CreateInteractionChoiceSet& res)
-  {
-    return mNsRPC2Communication_UI__CreateInteractionChoiceSet.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::CreateInteractionChoiceSet& res)
-  {
-    return mNsRPC2Communication_UI__CreateInteractionChoiceSet.toString(res);
-  }
-
-// NsRPC2Communication::UI::CreateInteractionChoiceSetResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::CreateInteractionChoiceSetResponse& res)
-  {
-    return mNsRPC2Communication_UI__CreateInteractionChoiceSetResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::CreateInteractionChoiceSetResponse& res)
-  {
-    return mNsRPC2Communication_UI__CreateInteractionChoiceSetResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::DeleteCommand
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::DeleteCommand& res)
-  {
-    return mNsRPC2Communication_UI__DeleteCommand.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::DeleteCommand& res)
-  {
-    return mNsRPC2Communication_UI__DeleteCommand.toString(res);
-  }
-
-// NsRPC2Communication::UI::DeleteCommandResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::DeleteCommandResponse& res)
-  {
-    return mNsRPC2Communication_UI__DeleteCommandResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::DeleteCommandResponse& res)
-  {
-    return mNsRPC2Communication_UI__DeleteCommandResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::DeleteInteractionChoiceSet
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::DeleteInteractionChoiceSet& res)
-  {
-    return mNsRPC2Communication_UI__DeleteInteractionChoiceSet.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::DeleteInteractionChoiceSet& res)
-  {
-    return mNsRPC2Communication_UI__DeleteInteractionChoiceSet.toString(res);
-  }
-
-// NsRPC2Communication::UI::DeleteInteractionChoiceSetResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::DeleteInteractionChoiceSetResponse& res)
-  {
-    return mNsRPC2Communication_UI__DeleteInteractionChoiceSetResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::DeleteInteractionChoiceSetResponse& res)
-  {
-    return mNsRPC2Communication_UI__DeleteInteractionChoiceSetResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::DeleteSubMenu
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::DeleteSubMenu& res)
-  {
-    return mNsRPC2Communication_UI__DeleteSubMenu.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::DeleteSubMenu& res)
-  {
-    return mNsRPC2Communication_UI__DeleteSubMenu.toString(res);
-  }
-
-// NsRPC2Communication::UI::DeleteSubMenuResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::DeleteSubMenuResponse& res)
-  {
-    return mNsRPC2Communication_UI__DeleteSubMenuResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::DeleteSubMenuResponse& res)
-  {
-    return mNsRPC2Communication_UI__DeleteSubMenuResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::DialNumber
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::DialNumber& res)
-  {
-    return mNsRPC2Communication_UI__DialNumber.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::DialNumber& res)
-  {
-    return mNsRPC2Communication_UI__DialNumber.toString(res);
-  }
-
-// NsRPC2Communication::UI::DialNumberResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::DialNumberResponse& res)
-  {
-    return mNsRPC2Communication_UI__DialNumberResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::DialNumberResponse& res)
-  {
-    return mNsRPC2Communication_UI__DialNumberResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::EndAudioPassThru
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::EndAudioPassThru& res)
-  {
-    return mNsRPC2Communication_UI__EndAudioPassThru.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::EndAudioPassThru& res)
-  {
-    return mNsRPC2Communication_UI__EndAudioPassThru.toString(res);
-  }
-
-// NsRPC2Communication::UI::EndAudioPassThruResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::EndAudioPassThruResponse& res)
-  {
-    return mNsRPC2Communication_UI__EndAudioPassThruResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::EndAudioPassThruResponse& res)
-  {
-    return mNsRPC2Communication_UI__EndAudioPassThruResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::GetCapabilities
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::GetCapabilities& res)
-  {
-    return mNsRPC2Communication_UI__GetCapabilities.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::GetCapabilities& res)
-  {
-    return mNsRPC2Communication_UI__GetCapabilities.toString(res);
-  }
-
-// NsRPC2Communication::UI::GetCapabilitiesResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::GetCapabilitiesResponse& res)
-  {
-    return mNsRPC2Communication_UI__GetCapabilitiesResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::GetCapabilitiesResponse& res)
-  {
-    return mNsRPC2Communication_UI__GetCapabilitiesResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::GetLanguage
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::GetLanguage& res)
-  {
-    return mNsRPC2Communication_UI__GetLanguage.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::GetLanguage& res)
-  {
-    return mNsRPC2Communication_UI__GetLanguage.toString(res);
-  }
-
-// NsRPC2Communication::UI::GetLanguageResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::GetLanguageResponse& res)
-  {
-    return mNsRPC2Communication_UI__GetLanguageResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::GetLanguageResponse& res)
-  {
-    return mNsRPC2Communication_UI__GetLanguageResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::GetSupportedLanguages
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::GetSupportedLanguages& res)
-  {
-    return mNsRPC2Communication_UI__GetSupportedLanguages.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::GetSupportedLanguages& res)
-  {
-    return mNsRPC2Communication_UI__GetSupportedLanguages.toString(res);
-  }
-
-// NsRPC2Communication::UI::GetSupportedLanguagesResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::GetSupportedLanguagesResponse& res)
-  {
-    return mNsRPC2Communication_UI__GetSupportedLanguagesResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::GetSupportedLanguagesResponse& res)
-  {
-    return mNsRPC2Communication_UI__GetSupportedLanguagesResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::OnCommand
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::OnCommand& res)
-  {
-    return mNsRPC2Communication_UI__OnCommand.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::OnCommand& res)
-  {
-    return mNsRPC2Communication_UI__OnCommand.toString(res);
-  }
-
-// NsRPC2Communication::UI::OnDeviceChosen
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::OnDeviceChosen& res)
-  {
-    return mNsRPC2Communication_UI__OnDeviceChosen.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::OnDeviceChosen& res)
-  {
-    return mNsRPC2Communication_UI__OnDeviceChosen.toString(res);
-  }
-
-// NsRPC2Communication::UI::OnDriverDistraction
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::OnDriverDistraction& res)
-  {
-    return mNsRPC2Communication_UI__OnDriverDistraction.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::OnDriverDistraction& res)
-  {
-    return mNsRPC2Communication_UI__OnDriverDistraction.toString(res);
-  }
-
-// NsRPC2Communication::UI::OnLanguageChange
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::OnLanguageChange& res)
-  {
-    return mNsRPC2Communication_UI__OnLanguageChange.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::OnLanguageChange& res)
-  {
-    return mNsRPC2Communication_UI__OnLanguageChange.toString(res);
-  }
-
-// NsRPC2Communication::UI::OnReady
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::OnReady& res)
-  {
-    return mNsRPC2Communication_UI__OnReady.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::OnReady& res)
-  {
-    return mNsRPC2Communication_UI__OnReady.toString(res);
-  }
-
-// NsRPC2Communication::UI::OnSystemContext
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::OnSystemContext& res)
-  {
-    return mNsRPC2Communication_UI__OnSystemContext.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::OnSystemContext& res)
-  {
-    return mNsRPC2Communication_UI__OnSystemContext.toString(res);
-  }
-
-// NsRPC2Communication::UI::OnTBTClientState
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::OnTBTClientState& res)
-  {
-    return mNsRPC2Communication_UI__OnTBTClientState.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::OnTBTClientState& res)
-  {
-    return mNsRPC2Communication_UI__OnTBTClientState.toString(res);
-  }
-
-// NsRPC2Communication::UI::PerformAudioPassThru
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::PerformAudioPassThru& res)
-  {
-    return mNsRPC2Communication_UI__PerformAudioPassThru.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::PerformAudioPassThru& res)
-  {
-    return mNsRPC2Communication_UI__PerformAudioPassThru.toString(res);
-  }
-
-// NsRPC2Communication::UI::PerformAudioPassThruResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::PerformAudioPassThruResponse& res)
-  {
-    return mNsRPC2Communication_UI__PerformAudioPassThruResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::PerformAudioPassThruResponse& res)
-  {
-    return mNsRPC2Communication_UI__PerformAudioPassThruResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::PerformInteraction
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::PerformInteraction& res)
-  {
-    return mNsRPC2Communication_UI__PerformInteraction.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::PerformInteraction& res)
-  {
-    return mNsRPC2Communication_UI__PerformInteraction.toString(res);
-  }
-
-// NsRPC2Communication::UI::PerformInteractionResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::PerformInteractionResponse& res)
-  {
-    return mNsRPC2Communication_UI__PerformInteractionResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::PerformInteractionResponse& res)
-  {
-    return mNsRPC2Communication_UI__PerformInteractionResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::ResetGlobalProperties
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::ResetGlobalProperties& res)
-  {
-    return mNsRPC2Communication_UI__ResetGlobalProperties.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::ResetGlobalProperties& res)
-  {
-    return mNsRPC2Communication_UI__ResetGlobalProperties.toString(res);
-  }
-
-// NsRPC2Communication::UI::ResetGlobalPropertiesResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::ResetGlobalPropertiesResponse& res)
-  {
-    return mNsRPC2Communication_UI__ResetGlobalPropertiesResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::ResetGlobalPropertiesResponse& res)
-  {
-    return mNsRPC2Communication_UI__ResetGlobalPropertiesResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::ScrollableMessage
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::ScrollableMessage& res)
-  {
-    return mNsRPC2Communication_UI__ScrollableMessage.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::ScrollableMessage& res)
-  {
-    return mNsRPC2Communication_UI__ScrollableMessage.toString(res);
-  }
-
-// NsRPC2Communication::UI::ScrollableMessageResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::ScrollableMessageResponse& res)
-  {
-    return mNsRPC2Communication_UI__ScrollableMessageResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::ScrollableMessageResponse& res)
-  {
-    return mNsRPC2Communication_UI__ScrollableMessageResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::SetAppIcon
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::SetAppIcon& res)
-  {
-    return mNsRPC2Communication_UI__SetAppIcon.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::SetAppIcon& res)
-  {
-    return mNsRPC2Communication_UI__SetAppIcon.toString(res);
-  }
-
-// NsRPC2Communication::UI::SetAppIconResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::SetAppIconResponse& res)
-  {
-    return mNsRPC2Communication_UI__SetAppIconResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::SetAppIconResponse& res)
-  {
-    return mNsRPC2Communication_UI__SetAppIconResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::SetDisplayLayout
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::SetDisplayLayout& res)
-  {
-    return mNsRPC2Communication_UI__SetDisplayLayout.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::SetDisplayLayout& res)
-  {
-    return mNsRPC2Communication_UI__SetDisplayLayout.toString(res);
-  }
-
-// NsRPC2Communication::UI::SetDisplayLayoutResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::SetDisplayLayoutResponse& res)
-  {
-    return mNsRPC2Communication_UI__SetDisplayLayoutResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::SetDisplayLayoutResponse& res)
-  {
-    return mNsRPC2Communication_UI__SetDisplayLayoutResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::SetGlobalProperties
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::SetGlobalProperties& res)
-  {
-    return mNsRPC2Communication_UI__SetGlobalProperties.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::SetGlobalProperties& res)
-  {
-    return mNsRPC2Communication_UI__SetGlobalProperties.toString(res);
-  }
-
-// NsRPC2Communication::UI::SetGlobalPropertiesResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::SetGlobalPropertiesResponse& res)
-  {
-    return mNsRPC2Communication_UI__SetGlobalPropertiesResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::SetGlobalPropertiesResponse& res)
-  {
-    return mNsRPC2Communication_UI__SetGlobalPropertiesResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::SetMediaClockTimer
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::SetMediaClockTimer& res)
-  {
-    return mNsRPC2Communication_UI__SetMediaClockTimer.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::SetMediaClockTimer& res)
-  {
-    return mNsRPC2Communication_UI__SetMediaClockTimer.toString(res);
-  }
-
-// NsRPC2Communication::UI::SetMediaClockTimerResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::SetMediaClockTimerResponse& res)
-  {
-    return mNsRPC2Communication_UI__SetMediaClockTimerResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::SetMediaClockTimerResponse& res)
-  {
-    return mNsRPC2Communication_UI__SetMediaClockTimerResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::Show
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::Show& res)
-  {
-    return mNsRPC2Communication_UI__Show.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::Show& res)
-  {
-    return mNsRPC2Communication_UI__Show.toString(res);
-  }
-
-// NsRPC2Communication::UI::ShowResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::ShowResponse& res)
-  {
-    return mNsRPC2Communication_UI__ShowResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::ShowResponse& res)
-  {
-    return mNsRPC2Communication_UI__ShowResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::ShowConstantTBT
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::ShowConstantTBT& res)
-  {
-    return mNsRPC2Communication_UI__ShowConstantTBT.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::ShowConstantTBT& res)
-  {
-    return mNsRPC2Communication_UI__ShowConstantTBT.toString(res);
-  }
-
-// NsRPC2Communication::UI::ShowConstantTBTResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::ShowConstantTBTResponse& res)
-  {
-    return mNsRPC2Communication_UI__ShowConstantTBTResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::ShowConstantTBTResponse& res)
-  {
-    return mNsRPC2Communication_UI__ShowConstantTBTResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::Slider
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::Slider& res)
-  {
-    return mNsRPC2Communication_UI__Slider.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::Slider& res)
-  {
-    return mNsRPC2Communication_UI__Slider.toString(res);
-  }
-
-// NsRPC2Communication::UI::SliderResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::SliderResponse& res)
-  {
-    return mNsRPC2Communication_UI__SliderResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::SliderResponse& res)
-  {
-    return mNsRPC2Communication_UI__SliderResponse.toString(res);
-  }
-
-// NsRPC2Communication::UI::UpdateTurnList
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::UpdateTurnList& res)
-  {
-    return mNsRPC2Communication_UI__UpdateTurnList.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::UpdateTurnList& res)
-  {
-    return mNsRPC2Communication_UI__UpdateTurnList.toString(res);
-  }
-
-// NsRPC2Communication::UI::UpdateTurnListResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::UI::UpdateTurnListResponse& res)
-  {
-    return mNsRPC2Communication_UI__UpdateTurnListResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::UI::UpdateTurnListResponse& res)
-  {
-    return mNsRPC2Communication_UI__UpdateTurnListResponse.toString(res);
-  }
-
-// NsRPC2Communication::VR::AddCommand
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::AddCommand& res)
-  {
-    return mNsRPC2Communication_VR__AddCommand.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::AddCommand& res)
-  {
-    return mNsRPC2Communication_VR__AddCommand.toString(res);
-  }
-
-// NsRPC2Communication::VR::AddCommandResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::AddCommandResponse& res)
-  {
-    return mNsRPC2Communication_VR__AddCommandResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::AddCommandResponse& res)
-  {
-    return mNsRPC2Communication_VR__AddCommandResponse.toString(res);
-  }
-
-// NsRPC2Communication::VR::ChangeRegistration
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::ChangeRegistration& res)
-  {
-    return mNsRPC2Communication_VR__ChangeRegistration.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::ChangeRegistration& res)
-  {
-    return mNsRPC2Communication_VR__ChangeRegistration.toString(res);
-  }
-
-// NsRPC2Communication::VR::ChangeRegistrationResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::ChangeRegistrationResponse& res)
-  {
-    return mNsRPC2Communication_VR__ChangeRegistrationResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::ChangeRegistrationResponse& res)
-  {
-    return mNsRPC2Communication_VR__ChangeRegistrationResponse.toString(res);
-  }
-
-// NsRPC2Communication::VR::DeleteCommand
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::DeleteCommand& res)
-  {
-    return mNsRPC2Communication_VR__DeleteCommand.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::DeleteCommand& res)
-  {
-    return mNsRPC2Communication_VR__DeleteCommand.toString(res);
-  }
-
-// NsRPC2Communication::VR::DeleteCommandResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::DeleteCommandResponse& res)
-  {
-    return mNsRPC2Communication_VR__DeleteCommandResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::DeleteCommandResponse& res)
-  {
-    return mNsRPC2Communication_VR__DeleteCommandResponse.toString(res);
-  }
-
-// NsRPC2Communication::VR::GetCapabilities
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::GetCapabilities& res)
-  {
-    return mNsRPC2Communication_VR__GetCapabilities.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::GetCapabilities& res)
-  {
-    return mNsRPC2Communication_VR__GetCapabilities.toString(res);
-  }
-
-// NsRPC2Communication::VR::GetCapabilitiesResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::GetCapabilitiesResponse& res)
-  {
-    return mNsRPC2Communication_VR__GetCapabilitiesResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::GetCapabilitiesResponse& res)
-  {
-    return mNsRPC2Communication_VR__GetCapabilitiesResponse.toString(res);
-  }
-
-// NsRPC2Communication::VR::GetLanguage
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::GetLanguage& res)
-  {
-    return mNsRPC2Communication_VR__GetLanguage.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::GetLanguage& res)
-  {
-    return mNsRPC2Communication_VR__GetLanguage.toString(res);
-  }
-
-// NsRPC2Communication::VR::GetLanguageResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::GetLanguageResponse& res)
-  {
-    return mNsRPC2Communication_VR__GetLanguageResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::GetLanguageResponse& res)
-  {
-    return mNsRPC2Communication_VR__GetLanguageResponse.toString(res);
-  }
-
-// NsRPC2Communication::VR::GetSupportedLanguages
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::GetSupportedLanguages& res)
-  {
-    return mNsRPC2Communication_VR__GetSupportedLanguages.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::GetSupportedLanguages& res)
-  {
-    return mNsRPC2Communication_VR__GetSupportedLanguages.toString(res);
-  }
-
-// NsRPC2Communication::VR::GetSupportedLanguagesResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::GetSupportedLanguagesResponse& res)
-  {
-    return mNsRPC2Communication_VR__GetSupportedLanguagesResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::GetSupportedLanguagesResponse& res)
-  {
-    return mNsRPC2Communication_VR__GetSupportedLanguagesResponse.toString(res);
-  }
-
-// NsRPC2Communication::VR::OnCommand
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::OnCommand& res)
-  {
-    return mNsRPC2Communication_VR__OnCommand.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::OnCommand& res)
-  {
-    return mNsRPC2Communication_VR__OnCommand.toString(res);
-  }
-
-// NsRPC2Communication::VR::OnLanguageChange
-  static bool fromString(const std::string& str, NsRPC2Communication::VR::OnLanguageChange& res)
-  {
-    return mNsRPC2Communication_VR__OnLanguageChange.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VR::OnLanguageChange& res)
-  {
-    return mNsRPC2Communication_VR__OnLanguageChange.toString(res);
-  }
-
-// NsRPC2Communication::VehicleInfo::GetDTCs
-  static bool fromString(const std::string& str, NsRPC2Communication::VehicleInfo::GetDTCs& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__GetDTCs.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VehicleInfo::GetDTCs& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__GetDTCs.toString(res);
-  }
-
-// NsRPC2Communication::VehicleInfo::GetDTCsResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::VehicleInfo::GetDTCsResponse& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__GetDTCsResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VehicleInfo::GetDTCsResponse& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__GetDTCsResponse.toString(res);
-  }
-
-// NsRPC2Communication::VehicleInfo::GetVehicleData
-  static bool fromString(const std::string& str, NsRPC2Communication::VehicleInfo::GetVehicleData& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__GetVehicleData.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VehicleInfo::GetVehicleData& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__GetVehicleData.toString(res);
-  }
-
-// NsRPC2Communication::VehicleInfo::GetVehicleDataResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::VehicleInfo::GetVehicleDataResponse& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__GetVehicleDataResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VehicleInfo::GetVehicleDataResponse& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__GetVehicleDataResponse.toString(res);
-  }
-
-// NsRPC2Communication::VehicleInfo::GetVehicleType
-  static bool fromString(const std::string& str, NsRPC2Communication::VehicleInfo::GetVehicleType& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__GetVehicleType.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VehicleInfo::GetVehicleType& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__GetVehicleType.toString(res);
-  }
-
-// NsRPC2Communication::VehicleInfo::GetVehicleTypeResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::VehicleInfo::GetVehicleTypeResponse& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__GetVehicleTypeResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VehicleInfo::GetVehicleTypeResponse& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__GetVehicleTypeResponse.toString(res);
-  }
-
-// NsRPC2Communication::VehicleInfo::OnVehicleData
-  static bool fromString(const std::string& str, NsRPC2Communication::VehicleInfo::OnVehicleData& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__OnVehicleData.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VehicleInfo::OnVehicleData& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__OnVehicleData.toString(res);
-  }
-
-// NsRPC2Communication::VehicleInfo::ReadDID
-  static bool fromString(const std::string& str, NsRPC2Communication::VehicleInfo::ReadDID& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__ReadDID.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VehicleInfo::ReadDID& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__ReadDID.toString(res);
-  }
-
-// NsRPC2Communication::VehicleInfo::ReadDIDResponse
-  static bool fromString(const std::string& str, NsRPC2Communication::VehicleInfo::ReadDIDResponse& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__ReadDIDResponse.fromString(str, res);
-  }
-
-  static std::string toString(const NsRPC2Communication::VehicleInfo::ReadDIDResponse& res)
-  {
-    return mNsRPC2Communication_VehicleInfo__ReadDIDResponse.toString(res);
-  }
-
-
-  struct localHash
-  {
-    const char *name;
-    unsigned int idx;
-    void* marshaller;					// Bingo!!!  old good plain C with direct casting!!!
-  };
-
-private:
-
-  static Json::Value Request2JSON(const ::NsRPC2Communication::RPC2Request* msg);
-  static Json::Value Response2JSON(const ::NsRPC2Communication::RPC2Response* msg);
-  static Json::Value Notification2JSON(const ::NsRPC2Communication::RPC2Notification* msg);
-
-  static const char* getName(Methods e)
-  {
-    return (e>=0 && e<110) ? mHashTable[e].name : NULL;
-  }
-
-  static const Methods getIndex(const char* s);
-
-  static const localHash mHashTable[110];
-  friend class Marshaller_intHash;
-
-  static ::NsRPC2Communication::RPC2ErrorMarshaller mRPC2ErrorInternal;
-
-  static NsRPC2Communication::BasicCommunication::ActivateAppMarshaller mNsRPC2Communication_BasicCommunication__ActivateApp;
-  static NsRPC2Communication::BasicCommunication::ActivateAppResponseMarshaller mNsRPC2Communication_BasicCommunication__ActivateAppResponse;
-  static NsRPC2Communication::BasicCommunication::GetAppListMarshaller mNsRPC2Communication_BasicCommunication__GetAppList;
-  static NsRPC2Communication::BasicCommunication::GetAppListResponseMarshaller mNsRPC2Communication_BasicCommunication__GetAppListResponse;
-  static NsRPC2Communication::BasicCommunication::GetDeviceListMarshaller mNsRPC2Communication_BasicCommunication__GetDeviceList;
-  static NsRPC2Communication::BasicCommunication::GetDeviceListResponseMarshaller mNsRPC2Communication_BasicCommunication__GetDeviceListResponse;
-  static NsRPC2Communication::BasicCommunication::OnAppDeactivatedMarshaller mNsRPC2Communication_BasicCommunication__OnAppDeactivated;
-  //static NsRPC2Communication::BasicCommunication::OnAppDeactivatedResponseMarshaller mNsRPC2Communication_BasicCommunication__OnAppDeactivatedResponse;
-  static NsRPC2Communication::BasicCommunication::OnAppRegisteredMarshaller mNsRPC2Communication_BasicCommunication__OnAppRegistered;
-  static NsRPC2Communication::BasicCommunication::OnAppUnregisteredMarshaller mNsRPC2Communication_BasicCommunication__OnAppUnregistered;
-  static NsRPC2Communication::BasicCommunication::OnDeviceListUpdatedMarshaller mNsRPC2Communication_BasicCommunication__OnDeviceListUpdated;
-  static NsRPC2Communication::BasicCommunication::SendDataMarshaller mNsRPC2Communication_BasicCommunication__SendData;
-  static NsRPC2Communication::BasicCommunication::SendDataResponseMarshaller mNsRPC2Communication_BasicCommunication__SendDataResponse;
-  static NsRPC2Communication::Buttons::GetCapabilitiesMarshaller mNsRPC2Communication_Buttons__GetCapabilities;
-  static NsRPC2Communication::Buttons::GetCapabilitiesResponseMarshaller mNsRPC2Communication_Buttons__GetCapabilitiesResponse;
-  static NsRPC2Communication::Buttons::OnButtonEventMarshaller mNsRPC2Communication_Buttons__OnButtonEvent;
-  static NsRPC2Communication::Buttons::OnButtonPressMarshaller mNsRPC2Communication_Buttons__OnButtonPress;
-  static NsRPC2Communication::TTS::ChangeRegistrationMarshaller mNsRPC2Communication_TTS__ChangeRegistration;
-  static NsRPC2Communication::TTS::ChangeRegistrationResponseMarshaller mNsRPC2Communication_TTS__ChangeRegistrationResponse;
-  static NsRPC2Communication::TTS::GetCapabilitiesMarshaller mNsRPC2Communication_TTS__GetCapabilities;
-  static NsRPC2Communication::TTS::GetCapabilitiesResponseMarshaller mNsRPC2Communication_TTS__GetCapabilitiesResponse;
-  static NsRPC2Communication::TTS::GetLanguageMarshaller mNsRPC2Communication_TTS__GetLanguage;
-  static NsRPC2Communication::TTS::GetLanguageResponseMarshaller mNsRPC2Communication_TTS__GetLanguageResponse;
-  static NsRPC2Communication::TTS::GetSupportedLanguagesMarshaller mNsRPC2Communication_TTS__GetSupportedLanguages;
-  static NsRPC2Communication::TTS::GetSupportedLanguagesResponseMarshaller mNsRPC2Communication_TTS__GetSupportedLanguagesResponse;
-  static NsRPC2Communication::TTS::OnLanguageChangeMarshaller mNsRPC2Communication_TTS__OnLanguageChange;
-  static NsRPC2Communication::TTS::SpeakMarshaller mNsRPC2Communication_TTS__Speak;
-  static NsRPC2Communication::TTS::SpeakResponseMarshaller mNsRPC2Communication_TTS__SpeakResponse;
-  static NsRPC2Communication::UI::AddCommandMarshaller mNsRPC2Communication_UI__AddCommand;
-  static NsRPC2Communication::UI::AddCommandResponseMarshaller mNsRPC2Communication_UI__AddCommandResponse;
-  static NsRPC2Communication::UI::AddSubMenuMarshaller mNsRPC2Communication_UI__AddSubMenu;
-  static NsRPC2Communication::UI::AddSubMenuResponseMarshaller mNsRPC2Communication_UI__AddSubMenuResponse;
-  static NsRPC2Communication::UI::AlertMarshaller mNsRPC2Communication_UI__Alert;
-  static NsRPC2Communication::UI::AlertResponseMarshaller mNsRPC2Communication_UI__AlertResponse;
-  static NsRPC2Communication::UI::AlertManeuverMarshaller mNsRPC2Communication_UI__AlertManeuver;
-  static NsRPC2Communication::UI::AlertManeuverResponseMarshaller mNsRPC2Communication_UI__AlertManeuverResponse;
-  static NsRPC2Communication::UI::ChangeRegistrationMarshaller mNsRPC2Communication_UI__ChangeRegistration;
-  static NsRPC2Communication::UI::ChangeRegistrationResponseMarshaller mNsRPC2Communication_UI__ChangeRegistrationResponse;
-  static NsRPC2Communication::UI::CreateInteractionChoiceSetMarshaller mNsRPC2Communication_UI__CreateInteractionChoiceSet;
-  static NsRPC2Communication::UI::CreateInteractionChoiceSetResponseMarshaller mNsRPC2Communication_UI__CreateInteractionChoiceSetResponse;
-  static NsRPC2Communication::UI::DeleteCommandMarshaller mNsRPC2Communication_UI__DeleteCommand;
-  static NsRPC2Communication::UI::DeleteCommandResponseMarshaller mNsRPC2Communication_UI__DeleteCommandResponse;
-  static NsRPC2Communication::UI::DeleteInteractionChoiceSetMarshaller mNsRPC2Communication_UI__DeleteInteractionChoiceSet;
-  static NsRPC2Communication::UI::DeleteInteractionChoiceSetResponseMarshaller mNsRPC2Communication_UI__DeleteInteractionChoiceSetResponse;
-  static NsRPC2Communication::UI::DeleteSubMenuMarshaller mNsRPC2Communication_UI__DeleteSubMenu;
-  static NsRPC2Communication::UI::DeleteSubMenuResponseMarshaller mNsRPC2Communication_UI__DeleteSubMenuResponse;
-  static NsRPC2Communication::UI::DialNumberMarshaller mNsRPC2Communication_UI__DialNumber;
-  static NsRPC2Communication::UI::DialNumberResponseMarshaller mNsRPC2Communication_UI__DialNumberResponse;
-  static NsRPC2Communication::UI::EndAudioPassThruMarshaller mNsRPC2Communication_UI__EndAudioPassThru;
-  static NsRPC2Communication::UI::EndAudioPassThruResponseMarshaller mNsRPC2Communication_UI__EndAudioPassThruResponse;
-  static NsRPC2Communication::UI::GetCapabilitiesMarshaller mNsRPC2Communication_UI__GetCapabilities;
-  static NsRPC2Communication::UI::GetCapabilitiesResponseMarshaller mNsRPC2Communication_UI__GetCapabilitiesResponse;
-  static NsRPC2Communication::UI::GetLanguageMarshaller mNsRPC2Communication_UI__GetLanguage;
-  static NsRPC2Communication::UI::GetLanguageResponseMarshaller mNsRPC2Communication_UI__GetLanguageResponse;
-  static NsRPC2Communication::UI::GetSupportedLanguagesMarshaller mNsRPC2Communication_UI__GetSupportedLanguages;
-  static NsRPC2Communication::UI::GetSupportedLanguagesResponseMarshaller mNsRPC2Communication_UI__GetSupportedLanguagesResponse;
-  static NsRPC2Communication::UI::OnCommandMarshaller mNsRPC2Communication_UI__OnCommand;
-  static NsRPC2Communication::UI::OnDeviceChosenMarshaller mNsRPC2Communication_UI__OnDeviceChosen;
-  static NsRPC2Communication::UI::OnDriverDistractionMarshaller mNsRPC2Communication_UI__OnDriverDistraction;
-  static NsRPC2Communication::UI::OnLanguageChangeMarshaller mNsRPC2Communication_UI__OnLanguageChange;
-  static NsRPC2Communication::UI::OnReadyMarshaller mNsRPC2Communication_UI__OnReady;
-  static NsRPC2Communication::UI::OnSystemContextMarshaller mNsRPC2Communication_UI__OnSystemContext;
-  static NsRPC2Communication::UI::OnTBTClientStateMarshaller mNsRPC2Communication_UI__OnTBTClientState;
-  static NsRPC2Communication::UI::PerformAudioPassThruMarshaller mNsRPC2Communication_UI__PerformAudioPassThru;
-  static NsRPC2Communication::UI::PerformAudioPassThruResponseMarshaller mNsRPC2Communication_UI__PerformAudioPassThruResponse;
-  static NsRPC2Communication::UI::PerformInteractionMarshaller mNsRPC2Communication_UI__PerformInteraction;
-  static NsRPC2Communication::UI::PerformInteractionResponseMarshaller mNsRPC2Communication_UI__PerformInteractionResponse;
-  static NsRPC2Communication::UI::ResetGlobalPropertiesMarshaller mNsRPC2Communication_UI__ResetGlobalProperties;
-  static NsRPC2Communication::UI::ResetGlobalPropertiesResponseMarshaller mNsRPC2Communication_UI__ResetGlobalPropertiesResponse;
-  static NsRPC2Communication::UI::ScrollableMessageMarshaller mNsRPC2Communication_UI__ScrollableMessage;
-  static NsRPC2Communication::UI::ScrollableMessageResponseMarshaller mNsRPC2Communication_UI__ScrollableMessageResponse;
-  static NsRPC2Communication::UI::SetAppIconMarshaller mNsRPC2Communication_UI__SetAppIcon;
-  static NsRPC2Communication::UI::SetAppIconResponseMarshaller mNsRPC2Communication_UI__SetAppIconResponse;
-  static NsRPC2Communication::UI::SetDisplayLayoutMarshaller mNsRPC2Communication_UI__SetDisplayLayout;
-  static NsRPC2Communication::UI::SetDisplayLayoutResponseMarshaller mNsRPC2Communication_UI__SetDisplayLayoutResponse;
-  static NsRPC2Communication::UI::SetGlobalPropertiesMarshaller mNsRPC2Communication_UI__SetGlobalProperties;
-  static NsRPC2Communication::UI::SetGlobalPropertiesResponseMarshaller mNsRPC2Communication_UI__SetGlobalPropertiesResponse;
-  static NsRPC2Communication::UI::SetMediaClockTimerMarshaller mNsRPC2Communication_UI__SetMediaClockTimer;
-  static NsRPC2Communication::UI::SetMediaClockTimerResponseMarshaller mNsRPC2Communication_UI__SetMediaClockTimerResponse;
-  static NsRPC2Communication::UI::ShowMarshaller mNsRPC2Communication_UI__Show;
-  static NsRPC2Communication::UI::ShowResponseMarshaller mNsRPC2Communication_UI__ShowResponse;
-  static NsRPC2Communication::UI::ShowConstantTBTMarshaller mNsRPC2Communication_UI__ShowConstantTBT;
-  static NsRPC2Communication::UI::ShowConstantTBTResponseMarshaller mNsRPC2Communication_UI__ShowConstantTBTResponse;
-  static NsRPC2Communication::UI::SliderMarshaller mNsRPC2Communication_UI__Slider;
-  static NsRPC2Communication::UI::SliderResponseMarshaller mNsRPC2Communication_UI__SliderResponse;
-  static NsRPC2Communication::UI::UpdateTurnListMarshaller mNsRPC2Communication_UI__UpdateTurnList;
-  static NsRPC2Communication::UI::UpdateTurnListResponseMarshaller mNsRPC2Communication_UI__UpdateTurnListResponse;
-  static NsRPC2Communication::VR::AddCommandMarshaller mNsRPC2Communication_VR__AddCommand;
-  static NsRPC2Communication::VR::AddCommandResponseMarshaller mNsRPC2Communication_VR__AddCommandResponse;
-  static NsRPC2Communication::VR::ChangeRegistrationMarshaller mNsRPC2Communication_VR__ChangeRegistration;
-  static NsRPC2Communication::VR::ChangeRegistrationResponseMarshaller mNsRPC2Communication_VR__ChangeRegistrationResponse;
-  static NsRPC2Communication::VR::DeleteCommandMarshaller mNsRPC2Communication_VR__DeleteCommand;
-  static NsRPC2Communication::VR::DeleteCommandResponseMarshaller mNsRPC2Communication_VR__DeleteCommandResponse;
-  static NsRPC2Communication::VR::GetCapabilitiesMarshaller mNsRPC2Communication_VR__GetCapabilities;
-  static NsRPC2Communication::VR::GetCapabilitiesResponseMarshaller mNsRPC2Communication_VR__GetCapabilitiesResponse;
-  static NsRPC2Communication::VR::GetLanguageMarshaller mNsRPC2Communication_VR__GetLanguage;
-  static NsRPC2Communication::VR::GetLanguageResponseMarshaller mNsRPC2Communication_VR__GetLanguageResponse;
-  static NsRPC2Communication::VR::GetSupportedLanguagesMarshaller mNsRPC2Communication_VR__GetSupportedLanguages;
-  static NsRPC2Communication::VR::GetSupportedLanguagesResponseMarshaller mNsRPC2Communication_VR__GetSupportedLanguagesResponse;
-  static NsRPC2Communication::VR::OnCommandMarshaller mNsRPC2Communication_VR__OnCommand;
-  static NsRPC2Communication::VR::OnLanguageChangeMarshaller mNsRPC2Communication_VR__OnLanguageChange;
-  static NsRPC2Communication::VehicleInfo::GetDTCsMarshaller mNsRPC2Communication_VehicleInfo__GetDTCs;
-  static NsRPC2Communication::VehicleInfo::GetDTCsResponseMarshaller mNsRPC2Communication_VehicleInfo__GetDTCsResponse;
-  static NsRPC2Communication::VehicleInfo::GetVehicleDataMarshaller mNsRPC2Communication_VehicleInfo__GetVehicleData;
-  static NsRPC2Communication::VehicleInfo::GetVehicleDataResponseMarshaller mNsRPC2Communication_VehicleInfo__GetVehicleDataResponse;
-  static NsRPC2Communication::VehicleInfo::GetVehicleTypeMarshaller mNsRPC2Communication_VehicleInfo__GetVehicleType;
-  static NsRPC2Communication::VehicleInfo::GetVehicleTypeResponseMarshaller mNsRPC2Communication_VehicleInfo__GetVehicleTypeResponse;
-  static NsRPC2Communication::VehicleInfo::OnVehicleDataMarshaller mNsRPC2Communication_VehicleInfo__OnVehicleData;
-  static NsRPC2Communication::VehicleInfo::ReadDIDMarshaller mNsRPC2Communication_VehicleInfo__ReadDID;
-  static NsRPC2Communication::VehicleInfo::ReadDIDResponseMarshaller mNsRPC2Communication_VehicleInfo__ReadDIDResponse;
-
-};
-}
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/ActivateApp.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/ActivateApp.h
deleted file mode 100644
index d109d08b1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/ActivateApp.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ACTIVATEAPP_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ACTIVATEAPP_INCLUDE
-
-#include <string>
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class ActivateApp : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      ActivateApp(const ActivateApp& c);
-      ActivateApp(void);
-    
-      ActivateApp& operator =(const ActivateApp&);
-    
-      virtual ~ActivateApp(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::string& get_appName(void);
-
-      int get_appId(void);
-
-
-// setters
-/// appName <= 100
-      bool set_appName(const std::string& appName);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class ActivateAppMarshaller;
-
-      std::string appName;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/ActivateAppResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/ActivateAppResponse.h
deleted file mode 100644
index 6114e9beb..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/ActivateAppResponse.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ACTIVATEAPPRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ACTIVATEAPPRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class ActivateAppResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      ActivateAppResponse(const ActivateAppResponse& c);
-      ActivateAppResponse(void);
-    
-      ActivateAppResponse& operator =(const ActivateAppResponse&);
-    
-      virtual ~ActivateAppResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class ActivateAppResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetAppList.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetAppList.h
deleted file mode 100644
index 6072f4d4d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetAppList.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETAPPLIST_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETAPPLIST_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class GetAppList : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetAppList(const GetAppList& c);
-      GetAppList(void);
-    
-      GetAppList& operator =(const GetAppList&);
-    
-      virtual ~GetAppList(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetAppListMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetAppListResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetAppListResponse.h
deleted file mode 100644
index a6295ae54..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetAppListResponse.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETAPPLISTRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETAPPLISTRESPONSE_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h"
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class GetAppListResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetAppListResponse(const GetAppListResponse& c);
-      GetAppListResponse(void);
-    
-      GetAppListResponse& operator =(const GetAppListResponse&);
-    
-      virtual ~GetAppListResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::HMIApplication>& get_appList(void);
-
-
-// setters
-      bool set_appList(const std::vector< NsSmartDeviceLinkRPCV2::HMIApplication>& appList);
-
-
-    private:
-
-      friend class GetAppListResponseMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::HMIApplication> appList;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetDeviceList.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetDeviceList.h
deleted file mode 100644
index 32e02d0a7..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetDeviceList.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETDEVICELIST_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETDEVICELIST_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class GetDeviceList : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetDeviceList(const GetDeviceList& c);
-      GetDeviceList(void);
-    
-      GetDeviceList& operator =(const GetDeviceList&);
-    
-      virtual ~GetDeviceList(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetDeviceListMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetDeviceListResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetDeviceListResponse.h
deleted file mode 100644
index dcca95313..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetDeviceListResponse.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETDEVICELISTRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETDEVICELISTRESPONSE_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class GetDeviceListResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetDeviceListResponse(const GetDeviceListResponse& c);
-      GetDeviceListResponse(void);
-    
-      GetDeviceListResponse& operator =(const GetDeviceListResponse&);
-    
-      virtual ~GetDeviceListResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< std::string>* get_deviceList(void);
-
-// setters
-/// 1 <= size <= 100
-      bool set_deviceList(const std::vector< std::string>& deviceList);
-
-      void reset_deviceList(void);
-
-
-    private:
-
-      friend class GetDeviceListResponseMarshaller;
-
-      std::vector< std::string>* deviceList;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppDeactivated.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppDeactivated.h
deleted file mode 100644
index ee6ef2566..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppDeactivated.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPDEACTIVATED_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPDEACTIVATED_INCLUDE
-
-#include <string>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeactivateReason.h"
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class OnAppDeactivated : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      OnAppDeactivated(const OnAppDeactivated& c);
-      OnAppDeactivated(void);
-    
-      OnAppDeactivated& operator =(const OnAppDeactivated&);
-    
-      virtual ~OnAppDeactivated(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::string& get_appName(void);
-
-      const NsSmartDeviceLinkRPCV2::DeactivateReason& get_reason(void);
-
-      int get_appId(void);
-
-
-// setters
-/// appName <= 100
-      bool set_appName(const std::string& appName);
-
-      bool set_reason(const NsSmartDeviceLinkRPCV2::DeactivateReason& reason);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class OnAppDeactivatedMarshaller;
-
-      std::string appName;
-      NsSmartDeviceLinkRPCV2::DeactivateReason reason;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponse.h
deleted file mode 100644
index c09ccbc02..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponse.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPDEACTIVATEDRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPDEACTIVATEDRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class OnAppDeactivatedResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      OnAppDeactivatedResponse(const OnAppDeactivatedResponse& c);
-      OnAppDeactivatedResponse(void);
-    
-      OnAppDeactivatedResponse& operator =(const OnAppDeactivatedResponse&);
-    
-      virtual ~OnAppDeactivatedResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class OnAppDeactivatedResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppRegistered.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppRegistered.h
deleted file mode 100644
index 9829ae87c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppRegistered.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPREGISTERED_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPREGISTERED_INCLUDE
-
-#include "JSONHandler/RPC2Notification.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h"
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class OnAppRegistered : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnAppRegistered(const OnAppRegistered& c);
-      OnAppRegistered(void);
-    
-      OnAppRegistered& operator =(const OnAppRegistered&);
-    
-      virtual ~OnAppRegistered(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::HMIApplication& get_application(void);
-
-
-// setters
-      bool set_application(const NsSmartDeviceLinkRPCV2::HMIApplication& application);
-
-
-    private:
-
-      friend class OnAppRegisteredMarshaller;
-
-      NsSmartDeviceLinkRPCV2::HMIApplication application;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppUnregistered.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppUnregistered.h
deleted file mode 100644
index 2ffc0d767..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppUnregistered.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPUNREGISTERED_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPUNREGISTERED_INCLUDE
-
-#include <string>
-#include "JSONHandler/RPC2Notification.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AppInterfaceUnregisteredReason.h"
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class OnAppUnregistered : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnAppUnregistered(const OnAppUnregistered& c);
-      OnAppUnregistered(void);
-    
-      OnAppUnregistered& operator =(const OnAppUnregistered&);
-    
-      virtual ~OnAppUnregistered(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::string& get_appName(void);
-
-      const NsSmartDeviceLinkRPCV2::AppInterfaceUnregisteredReason* get_reason(void);
-      int get_appId(void);
-
-
-// setters
-/// appName <= 100
-      bool set_appName(const std::string& appName);
-
-      bool set_reason(const NsSmartDeviceLinkRPCV2::AppInterfaceUnregisteredReason& reason);
-
-      void reset_reason(void);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class OnAppUnregisteredMarshaller;
-
-      std::string appName;
-      NsSmartDeviceLinkRPCV2::AppInterfaceUnregisteredReason* reason;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnDeviceListUpdated.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnDeviceListUpdated.h
deleted file mode 100644
index 2b6161800..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnDeviceListUpdated.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONDEVICELISTUPDATED_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONDEVICELISTUPDATED_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Notification.h"
-
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class OnDeviceListUpdated : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnDeviceListUpdated(const OnDeviceListUpdated& c);
-      OnDeviceListUpdated(void);
-    
-      OnDeviceListUpdated& operator =(const OnDeviceListUpdated&);
-    
-      virtual ~OnDeviceListUpdated(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< std::string>* get_deviceList(void);
-
-// setters
-/// 1 <= size <= 100
-      bool set_deviceList(const std::vector< std::string>& deviceList);
-
-      void reset_deviceList(void);
-
-
-    private:
-
-      friend class OnDeviceListUpdatedMarshaller;
-
-      std::vector< std::string>* deviceList;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/RPC2.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/RPC2.h
deleted file mode 100644
index d120fed0d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/RPC2.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_RPC2_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_RPC2_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/ActivateApp.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/ActivateAppResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/GetAppList.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/GetAppListResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/GetDeviceList.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/GetDeviceListResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/OnAppDeactivated.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/OnAppRegistered.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/OnAppUnregistered.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/OnDeviceListUpdated.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/SendData.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/SendDataResponse.h"
-
-#include "../src/../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/SendData.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/SendData.h
deleted file mode 100644
index 34173190b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/SendData.h
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_SENDDATA_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_SENDDATA_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class SendData : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      SendData(const SendData& c);
-      SendData(void);
-    
-      SendData& operator =(const SendData&);
-    
-      virtual ~SendData(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< std::string>& get_data(void);
-
-      const std::string* get_url(void);
-      const int* get_timeout(void);
-
-// setters
-/// 1 <= size <= 100
-      bool set_data(const std::vector< std::string>& data);
-
-/// url <= 1000
-      bool set_url(const std::string& url);
-
-      void reset_url(void);
-
-/// -2000000000 <= timeout <= 2000000000
-      bool set_timeout(const int& timeout);
-
-      void reset_timeout(void);
-
-
-    private:
-
-      friend class SendDataMarshaller;
-
-      std::vector< std::string> data;
-      std::string* url;
-      int* timeout;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/SendDataResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/SendDataResponse.h
deleted file mode 100644
index 40dbe89e3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/SendDataResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_SENDDATARESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_SENDDATARESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    class SendDataResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-
-      SendDataResponse(const SendDataResponse& c);
-      SendDataResponse(void);
-
-      SendDataResponse& operator =(const SendDataResponse&);
-
-      virtual ~SendDataResponse(void);
-
-      bool checkIntegrity(void);
-
-
-    private:
-
-      friend class SendDataResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/GetCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/GetCapabilities.h
deleted file mode 100644
index d70fd8a59..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/GetCapabilities.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_BUTTONS_GETCAPABILITIES_INCLUDE
-#define NSRPC2COMMUNICATION_BUTTONS_GETCAPABILITIES_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace Buttons
-  {
-
-    class GetCapabilities : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetCapabilities(const GetCapabilities& c);
-      GetCapabilities(void);
-    
-      GetCapabilities& operator =(const GetCapabilities&);
-    
-      virtual ~GetCapabilities(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetCapabilitiesMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/GetCapabilitiesResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/GetCapabilitiesResponse.h
deleted file mode 100644
index 36f708386..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/GetCapabilitiesResponse.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_BUTTONS_GETCAPABILITIESRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_BUTTONS_GETCAPABILITIESRESPONSE_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h"
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace Buttons
-  {
-
-    class GetCapabilitiesResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetCapabilitiesResponse(const GetCapabilitiesResponse& c);
-      GetCapabilitiesResponse(void);
-    
-      GetCapabilitiesResponse& operator =(const GetCapabilitiesResponse&);
-    
-      virtual ~GetCapabilitiesResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::ButtonCapabilities>& get_capabilities(void);
-
-      const NsSmartDeviceLinkRPCV2::PresetBankCapabilities* get_presetBankCapabilities(void);
-
-// setters
-/// 1 <= size <= 100
-      bool set_capabilities(const std::vector< NsSmartDeviceLinkRPCV2::ButtonCapabilities>& capabilities);
-
-      bool set_presetBankCapabilities(const NsSmartDeviceLinkRPCV2::PresetBankCapabilities& presetBankCapabilities);
-
-      void reset_presetBankCapabilities(void);
-
-
-    private:
-
-      friend class GetCapabilitiesResponseMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::ButtonCapabilities> capabilities;
-      NsSmartDeviceLinkRPCV2::PresetBankCapabilities* presetBankCapabilities;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/OnButtonEvent.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/OnButtonEvent.h
deleted file mode 100644
index 0961d6e87..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/OnButtonEvent.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_BUTTONS_ONBUTTONEVENT_INCLUDE
-#define NSRPC2COMMUNICATION_BUTTONS_ONBUTTONEVENT_INCLUDE
-
-#include "JSONHandler/RPC2Notification.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonName.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonEventMode.h"
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace Buttons
-  {
-
-    class OnButtonEvent : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnButtonEvent(const OnButtonEvent& c);
-      OnButtonEvent(void);
-    
-      OnButtonEvent& operator =(const OnButtonEvent&);
-    
-      virtual ~OnButtonEvent(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::ButtonName& get_name(void);
-
-      const NsSmartDeviceLinkRPCV2::ButtonEventMode& get_mode(void);
-
-      const unsigned int* get_customButtonID(void);
-
-// setters
-      bool set_name(const NsSmartDeviceLinkRPCV2::ButtonName& name);
-
-      bool set_mode(const NsSmartDeviceLinkRPCV2::ButtonEventMode& mode);
-
-/// customButtonID <= 65536
-      bool set_customButtonID(const unsigned int& customButtonID);
-
-      void reset_customButtonID(void);
-
-
-    private:
-
-      friend class OnButtonEventMarshaller;
-
-      NsSmartDeviceLinkRPCV2::ButtonName name;
-      NsSmartDeviceLinkRPCV2::ButtonEventMode mode;
-      unsigned int* customButtonID;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/OnButtonPress.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/OnButtonPress.h
deleted file mode 100644
index 92d315a41..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/OnButtonPress.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_BUTTONS_ONBUTTONPRESS_INCLUDE
-#define NSRPC2COMMUNICATION_BUTTONS_ONBUTTONPRESS_INCLUDE
-
-#include "JSONHandler/RPC2Notification.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonName.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonPressMode.h"
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace Buttons
-  {
-
-    class OnButtonPress : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnButtonPress(const OnButtonPress& c);
-      OnButtonPress(void);
-    
-      OnButtonPress& operator =(const OnButtonPress&);
-    
-      virtual ~OnButtonPress(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::ButtonName& get_name(void);
-
-      const NsSmartDeviceLinkRPCV2::ButtonPressMode& get_mode(void);
-
-      const unsigned int* get_customButtonID(void);
-
-// setters
-      bool set_name(const NsSmartDeviceLinkRPCV2::ButtonName& name);
-
-      bool set_mode(const NsSmartDeviceLinkRPCV2::ButtonPressMode& mode);
-
-/// customButtonID <= 65536
-      bool set_customButtonID(const unsigned int& customButtonID);
-
-      void reset_customButtonID(void);
-
-
-    private:
-
-      friend class OnButtonPressMarshaller;
-
-      NsSmartDeviceLinkRPCV2::ButtonName name;
-      NsSmartDeviceLinkRPCV2::ButtonPressMode mode;
-      unsigned int* customButtonID;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/RPC2.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/RPC2.h
deleted file mode 100644
index cb7eea258..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/RPC2.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_BUTTONS_RPC2_INCLUDE
-#define NSRPC2COMMUNICATION_BUTTONS_RPC2_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/Buttons/GetCapabilities.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/Buttons/GetCapabilitiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/Buttons/OnButtonEvent.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/Buttons/OnButtonPress.h"
-
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/ChangeRegistration.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/ChangeRegistration.h
deleted file mode 100644
index e37587be4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/ChangeRegistration.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_CHANGEREGISTRATION_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_CHANGEREGISTRATION_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    class ChangeRegistration : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      ChangeRegistration(const ChangeRegistration& c);
-      ChangeRegistration(void);
-    
-      ChangeRegistration& operator =(const ChangeRegistration&);
-    
-      virtual ~ChangeRegistration(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::Language& get_language(void);
-
-      int get_appId(void);
-
-
-// setters
-      bool set_language(const NsSmartDeviceLinkRPCV2::Language& language);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class ChangeRegistrationMarshaller;
-
-      NsSmartDeviceLinkRPCV2::Language language;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/ChangeRegistrationResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/ChangeRegistrationResponse.h
deleted file mode 100644
index c2afcebb3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/ChangeRegistrationResponse.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_CHANGEREGISTRATIONRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_CHANGEREGISTRATIONRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    class ChangeRegistrationResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      ChangeRegistrationResponse(const ChangeRegistrationResponse& c);
-      ChangeRegistrationResponse(void);
-    
-      ChangeRegistrationResponse& operator =(const ChangeRegistrationResponse&);
-    
-      virtual ~ChangeRegistrationResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class ChangeRegistrationResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetCapabilities.h
deleted file mode 100644
index 1dd3d363e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetCapabilities.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_GETCAPABILITIES_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_GETCAPABILITIES_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    class GetCapabilities : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetCapabilities(const GetCapabilities& c);
-      GetCapabilities(void);
-    
-      GetCapabilities& operator =(const GetCapabilities&);
-    
-      virtual ~GetCapabilities(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetCapabilitiesMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetCapabilitiesResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetCapabilitiesResponse.h
deleted file mode 100644
index 69c9d1469..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetCapabilitiesResponse.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_GETCAPABILITIESRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_GETCAPABILITIESRESPONSE_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SpeechCapabilities.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    class GetCapabilitiesResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetCapabilitiesResponse(const GetCapabilitiesResponse& c);
-      GetCapabilitiesResponse(void);
-    
-      GetCapabilitiesResponse& operator =(const GetCapabilitiesResponse&);
-    
-      virtual ~GetCapabilitiesResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::SpeechCapabilities>& get_capabilities(void);
-
-
-// setters
-/// 1 <= size <= 100
-      bool set_capabilities(const std::vector< NsSmartDeviceLinkRPCV2::SpeechCapabilities>& capabilities);
-
-
-    private:
-
-      friend class GetCapabilitiesResponseMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::SpeechCapabilities> capabilities;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetLanguage.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetLanguage.h
deleted file mode 100644
index 49a650d77..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetLanguage.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_GETLANGUAGE_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_GETLANGUAGE_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    class GetLanguage : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetLanguage(const GetLanguage& c);
-      GetLanguage(void);
-    
-      GetLanguage& operator =(const GetLanguage&);
-    
-      virtual ~GetLanguage(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetLanguageMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetLanguageResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetLanguageResponse.h
deleted file mode 100644
index 00e579168..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetLanguageResponse.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_GETLANGUAGERESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_GETLANGUAGERESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    class GetLanguageResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetLanguageResponse(const GetLanguageResponse& c);
-      GetLanguageResponse(void);
-    
-      GetLanguageResponse& operator =(const GetLanguageResponse&);
-    
-      virtual ~GetLanguageResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::Language& get_language(void);
-
-
-// setters
-      bool set_language(const NsSmartDeviceLinkRPCV2::Language& language);
-
-
-    private:
-
-      friend class GetLanguageResponseMarshaller;
-
-      NsSmartDeviceLinkRPCV2::Language language;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetSupportedLanguages.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetSupportedLanguages.h
deleted file mode 100644
index 70e7051d1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetSupportedLanguages.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_GETSUPPORTEDLANGUAGES_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_GETSUPPORTEDLANGUAGES_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    class GetSupportedLanguages : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetSupportedLanguages(const GetSupportedLanguages& c);
-      GetSupportedLanguages(void);
-    
-      GetSupportedLanguages& operator =(const GetSupportedLanguages&);
-    
-      virtual ~GetSupportedLanguages(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetSupportedLanguagesMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetSupportedLanguagesResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetSupportedLanguagesResponse.h
deleted file mode 100644
index 96beb4d03..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetSupportedLanguagesResponse.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_GETSUPPORTEDLANGUAGESRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_GETSUPPORTEDLANGUAGESRESPONSE_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    class GetSupportedLanguagesResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetSupportedLanguagesResponse(const GetSupportedLanguagesResponse& c);
-      GetSupportedLanguagesResponse(void);
-    
-      GetSupportedLanguagesResponse& operator =(const GetSupportedLanguagesResponse&);
-    
-      virtual ~GetSupportedLanguagesResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::Language>& get_languages(void);
-
-
-// setters
-/// 1 <= size <= 100
-      bool set_languages(const std::vector< NsSmartDeviceLinkRPCV2::Language>& languages);
-
-
-    private:
-
-      friend class GetSupportedLanguagesResponseMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::Language> languages;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/OnLanguageChange.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/OnLanguageChange.h
deleted file mode 100644
index 7c2e15c24..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/OnLanguageChange.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_ONLANGUAGECHANGE_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_ONLANGUAGECHANGE_INCLUDE
-
-#include "JSONHandler/RPC2Notification.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    class OnLanguageChange : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnLanguageChange(const OnLanguageChange& c);
-      OnLanguageChange(void);
-    
-      OnLanguageChange& operator =(const OnLanguageChange&);
-    
-      virtual ~OnLanguageChange(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::Language& get_language(void);
-
-
-// setters
-      bool set_language(const NsSmartDeviceLinkRPCV2::Language& language);
-
-
-    private:
-
-      friend class OnLanguageChangeMarshaller;
-
-      NsSmartDeviceLinkRPCV2::Language language;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/RPC2.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/RPC2.h
deleted file mode 100644
index 836b5e776..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/RPC2.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_RPC2_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_RPC2_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/ChangeRegistration.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/ChangeRegistrationResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/GetCapabilities.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/GetCapabilitiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/GetLanguage.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/GetLanguageResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/GetSupportedLanguages.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/GetSupportedLanguagesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/OnLanguageChange.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/Speak.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/SpeakResponse.h"
-
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/Speak.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/Speak.h
deleted file mode 100644
index 3e9b6297d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/Speak.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_SPEAK_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_SPEAK_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    class Speak : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      Speak(const Speak& c);
-      Speak(void);
-    
-      Speak& operator =(const Speak&);
-    
-      virtual ~Speak(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& get_ttsChunks(void);
-
-      int get_appId(void);
-
-
-// setters
-/// 1 <= size <= 100
-      bool set_ttsChunks(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& ttsChunks);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class SpeakMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::TTSChunk> ttsChunks;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/SpeakResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/SpeakResponse.h
deleted file mode 100644
index 2e616bb57..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/SpeakResponse.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_SPEAKRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_SPEAKRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    class SpeakResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      SpeakResponse(const SpeakResponse& c);
-      SpeakResponse(void);
-    
-      SpeakResponse& operator =(const SpeakResponse&);
-    
-      virtual ~SpeakResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class SpeakResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddCommand.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddCommand.h
deleted file mode 100644
index 53d1d6b4e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddCommand.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ADDCOMMAND_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ADDCOMMAND_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/MenuParams.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Image.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class AddCommand : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      AddCommand(const AddCommand& c);
-      AddCommand(void);
-    
-      AddCommand& operator =(const AddCommand&);
-    
-      virtual ~AddCommand(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_cmdId(void);
-
-      const NsSmartDeviceLinkRPCV2::MenuParams& get_menuParams(void);
-
-      const NsSmartDeviceLinkRPCV2::Image* get_cmdIcon(void);
-      int get_appId(void);
-
-
-// setters
-/// cmdId <= 2000000000
-      bool set_cmdId(unsigned int cmdId);
-
-      bool set_menuParams(const NsSmartDeviceLinkRPCV2::MenuParams& menuParams);
-
-      bool set_cmdIcon(const NsSmartDeviceLinkRPCV2::Image& cmdIcon);
-
-      void reset_cmdIcon(void);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class AddCommandMarshaller;
-
-      unsigned int cmdId;
-      NsSmartDeviceLinkRPCV2::MenuParams menuParams;
-      NsSmartDeviceLinkRPCV2::Image* cmdIcon;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddCommandResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddCommandResponse.h
deleted file mode 100644
index 89af58f84..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddCommandResponse.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ADDCOMMANDRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ADDCOMMANDRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class AddCommandResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      AddCommandResponse(const AddCommandResponse& c);
-      AddCommandResponse(void);
-    
-      AddCommandResponse& operator =(const AddCommandResponse&);
-    
-      virtual ~AddCommandResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class AddCommandResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddSubMenu.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddSubMenu.h
deleted file mode 100644
index 5cc437cd0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddSubMenu.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ADDSUBMENU_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ADDSUBMENU_INCLUDE
-
-#include <string>
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class AddSubMenu : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      AddSubMenu(const AddSubMenu& c);
-      AddSubMenu(void);
-    
-      AddSubMenu& operator =(const AddSubMenu&);
-    
-      virtual ~AddSubMenu(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_menuId(void);
-
-      const unsigned int* get_position(void);
-      const std::string& get_menuName(void);
-
-      int get_appId(void);
-
-
-// setters
-/// menuId <= 2000000000
-      bool set_menuId(unsigned int menuId);
-
-/// position <= 1000
-      bool set_position(const unsigned int& position);
-
-      void reset_position(void);
-
-/// menuName <= 500
-      bool set_menuName(const std::string& menuName);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class AddSubMenuMarshaller;
-
-      unsigned int menuId;
-      unsigned int* position;
-      std::string menuName;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddSubMenuResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddSubMenuResponse.h
deleted file mode 100644
index cf9ff2752..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddSubMenuResponse.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ADDSUBMENURESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ADDSUBMENURESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class AddSubMenuResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      AddSubMenuResponse(const AddSubMenuResponse& c);
-      AddSubMenuResponse(void);
-    
-      AddSubMenuResponse& operator =(const AddSubMenuResponse&);
-    
-      virtual ~AddSubMenuResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class AddSubMenuResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Alert.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Alert.h
deleted file mode 100644
index 67c3de943..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Alert.h
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ALERT_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ALERT_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButton.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class Alert : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      Alert(const Alert& c);
-      Alert(void);
-    
-      Alert& operator =(const Alert&);
-    
-      virtual ~Alert(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::string* get_AlertText1(void);
-      const std::string* get_AlertText2(void);
-      const std::string* get_AlertText3(void);
-      const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* get_ttsChunks(void);
-      const unsigned int* get_duration(void);
-      const bool* get_playTone(void);
-      const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>* get_softButtons(void);
-      int get_appId(void);
-
-
-// setters
-/// AlertText1 <= 500
-      bool set_AlertText1(const std::string& AlertText1);
-
-      void reset_AlertText1(void);
-
-/// AlertText2 <= 500
-      bool set_AlertText2(const std::string& AlertText2);
-
-      void reset_AlertText2(void);
-
-/// AlertText3 <= 500
-      bool set_AlertText3(const std::string& AlertText3);
-
-      void reset_AlertText3(void);
-
-/// 1 <= size <= 100
-      bool set_ttsChunks(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& ttsChunks);
-
-      void reset_ttsChunks(void);
-
-/// 3000 <= duration <= 10000
-      bool set_duration(const unsigned int& duration);
-
-      void reset_duration(void);
-
-      bool set_playTone(const bool& playTone);
-
-      void reset_playTone(void);
-
-/// 0 <= size <= 4
-      bool set_softButtons(const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& softButtons);
-
-      void reset_softButtons(void);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class AlertMarshaller;
-
-      std::string* AlertText1;
-      std::string* AlertText2;
-      std::string* AlertText3;
-      std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* ttsChunks;
-      unsigned int* duration;
-      bool* playTone;
-      std::vector< NsSmartDeviceLinkRPCV2::SoftButton>* softButtons;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertManeuver.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertManeuver.h
deleted file mode 100644
index 7cd19df2c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertManeuver.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ALERTMANEUVER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ALERTMANEUVER_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButton.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class AlertManeuver : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-
-      AlertManeuver(const AlertManeuver& c);
-      AlertManeuver(void);
-
-      AlertManeuver& operator =(const AlertManeuver&);
-
-      virtual ~AlertManeuver(void);
-
-      bool checkIntegrity(void);
-
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& get_ttsChunks(void);
-
-      const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& get_softButtons(void);
-
-      int get_appId(void);
-
-
-// setters
-/// 1 <= size <= 100
-      bool set_ttsChunks(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& ttsChunks);
-
-/// 0 <= size <= 3
-      bool set_softButtons(const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& softButtons);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class AlertManeuverMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::TTSChunk> ttsChunks;
-      std::vector< NsSmartDeviceLinkRPCV2::SoftButton> softButtons;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertManeuverResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertManeuverResponse.h
deleted file mode 100644
index e116ac580..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertManeuverResponse.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ALERTMANEUVERRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ALERTMANEUVERRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class AlertManeuverResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      AlertManeuverResponse(const AlertManeuverResponse& c);
-      AlertManeuverResponse(void);
-    
-      AlertManeuverResponse& operator =(const AlertManeuverResponse&);
-    
-      virtual ~AlertManeuverResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class AlertManeuverResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertResponse.h
deleted file mode 100644
index 55d8bfa1f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertResponse.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ALERTRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ALERTRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class AlertResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      AlertResponse(const AlertResponse& c);
-      AlertResponse(void);
-    
-      AlertResponse& operator =(const AlertResponse&);
-    
-      virtual ~AlertResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const unsigned int* get_tryAgainTime(void);
-
-// setters
-/// tryAgainTime <= 2000000000
-      bool set_tryAgainTime(const unsigned int& tryAgainTime);
-
-      void reset_tryAgainTime(void);
-
-
-    private:
-
-      friend class AlertResponseMarshaller;
-
-      unsigned int* tryAgainTime;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ChangeRegistration.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ChangeRegistration.h
deleted file mode 100644
index 304f12a95..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ChangeRegistration.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_CHANGEREGISTRATION_INCLUDE
-#define NSRPC2COMMUNICATION_UI_CHANGEREGISTRATION_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class ChangeRegistration : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      ChangeRegistration(const ChangeRegistration& c);
-      ChangeRegistration(void);
-    
-      ChangeRegistration& operator =(const ChangeRegistration&);
-    
-      virtual ~ChangeRegistration(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::Language& get_hmiDisplayLanguage(void);
-
-      int get_appId(void);
-
-
-// setters
-      bool set_hmiDisplayLanguage(const NsSmartDeviceLinkRPCV2::Language& hmiDisplayLanguage);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class ChangeRegistrationMarshaller;
-
-      NsSmartDeviceLinkRPCV2::Language hmiDisplayLanguage;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ChangeRegistrationResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ChangeRegistrationResponse.h
deleted file mode 100644
index 87565dfcd..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ChangeRegistrationResponse.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_CHANGEREGISTRATIONRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_CHANGEREGISTRATIONRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class ChangeRegistrationResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      ChangeRegistrationResponse(const ChangeRegistrationResponse& c);
-      ChangeRegistrationResponse(void);
-    
-      ChangeRegistrationResponse& operator =(const ChangeRegistrationResponse&);
-    
-      virtual ~ChangeRegistrationResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class ChangeRegistrationResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/CreateInteractionChoiceSet.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/CreateInteractionChoiceSet.h
deleted file mode 100644
index 1eb4aacad..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/CreateInteractionChoiceSet.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_CREATEINTERACTIONCHOICESET_INCLUDE
-#define NSRPC2COMMUNICATION_UI_CREATEINTERACTIONCHOICESET_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Choice.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class CreateInteractionChoiceSet : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      CreateInteractionChoiceSet(const CreateInteractionChoiceSet& c);
-      CreateInteractionChoiceSet(void);
-    
-      CreateInteractionChoiceSet& operator =(const CreateInteractionChoiceSet&);
-    
-      virtual ~CreateInteractionChoiceSet(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_interactionChoiceSetID(void);
-
-      const std::vector< NsSmartDeviceLinkRPCV2::Choice>& get_choiceSet(void);
-
-      int get_appId(void);
-
-
-// setters
-/// interactionChoiceSetID <= 2000000000
-      bool set_interactionChoiceSetID(unsigned int interactionChoiceSetID);
-
-/// 1 <= size <= 100
-      bool set_choiceSet(const std::vector< NsSmartDeviceLinkRPCV2::Choice>& choiceSet);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class CreateInteractionChoiceSetMarshaller;
-
-      unsigned int interactionChoiceSetID;
-      std::vector< NsSmartDeviceLinkRPCV2::Choice> choiceSet;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/CreateInteractionChoiceSetResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/CreateInteractionChoiceSetResponse.h
deleted file mode 100644
index 406ba5e0c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/CreateInteractionChoiceSetResponse.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_CREATEINTERACTIONCHOICESETRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_CREATEINTERACTIONCHOICESETRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class CreateInteractionChoiceSetResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      CreateInteractionChoiceSetResponse(const CreateInteractionChoiceSetResponse& c);
-      CreateInteractionChoiceSetResponse(void);
-    
-      CreateInteractionChoiceSetResponse& operator =(const CreateInteractionChoiceSetResponse&);
-    
-      virtual ~CreateInteractionChoiceSetResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class CreateInteractionChoiceSetResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteCommand.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteCommand.h
deleted file mode 100644
index f71d6f4d3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteCommand.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DELETECOMMAND_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DELETECOMMAND_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class DeleteCommand : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      DeleteCommand(const DeleteCommand& c);
-      DeleteCommand(void);
-    
-      DeleteCommand& operator =(const DeleteCommand&);
-    
-      virtual ~DeleteCommand(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_cmdId(void);
-
-      int get_appId(void);
-
-
-// setters
-/// cmdId <= 2000000000
-      bool set_cmdId(unsigned int cmdId);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class DeleteCommandMarshaller;
-
-      unsigned int cmdId;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteCommandResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteCommandResponse.h
deleted file mode 100644
index b5cf749c8..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteCommandResponse.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DELETECOMMANDRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DELETECOMMANDRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class DeleteCommandResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      DeleteCommandResponse(const DeleteCommandResponse& c);
-      DeleteCommandResponse(void);
-    
-      DeleteCommandResponse& operator =(const DeleteCommandResponse&);
-    
-      virtual ~DeleteCommandResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class DeleteCommandResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteInteractionChoiceSet.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteInteractionChoiceSet.h
deleted file mode 100644
index d1cde5163..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteInteractionChoiceSet.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DELETEINTERACTIONCHOICESET_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DELETEINTERACTIONCHOICESET_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class DeleteInteractionChoiceSet : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      DeleteInteractionChoiceSet(const DeleteInteractionChoiceSet& c);
-      DeleteInteractionChoiceSet(void);
-    
-      DeleteInteractionChoiceSet& operator =(const DeleteInteractionChoiceSet&);
-    
-      virtual ~DeleteInteractionChoiceSet(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_interactionChoiceSetID(void);
-
-      int get_appId(void);
-
-
-// setters
-/// interactionChoiceSetID <= 2000000000
-      bool set_interactionChoiceSetID(unsigned int interactionChoiceSetID);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class DeleteInteractionChoiceSetMarshaller;
-
-      unsigned int interactionChoiceSetID;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponse.h
deleted file mode 100644
index fbc5ee0b2..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DELETEINTERACTIONCHOICESETRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DELETEINTERACTIONCHOICESETRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class DeleteInteractionChoiceSetResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      DeleteInteractionChoiceSetResponse(const DeleteInteractionChoiceSetResponse& c);
-      DeleteInteractionChoiceSetResponse(void);
-    
-      DeleteInteractionChoiceSetResponse& operator =(const DeleteInteractionChoiceSetResponse&);
-    
-      virtual ~DeleteInteractionChoiceSetResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class DeleteInteractionChoiceSetResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteSubMenu.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteSubMenu.h
deleted file mode 100644
index ef258893c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteSubMenu.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DELETESUBMENU_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DELETESUBMENU_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class DeleteSubMenu : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      DeleteSubMenu(const DeleteSubMenu& c);
-      DeleteSubMenu(void);
-    
-      DeleteSubMenu& operator =(const DeleteSubMenu&);
-    
-      virtual ~DeleteSubMenu(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_menuId(void);
-
-      int get_appId(void);
-
-
-// setters
-/// menuId <= 2000000000
-      bool set_menuId(unsigned int menuId);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class DeleteSubMenuMarshaller;
-
-      unsigned int menuId;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteSubMenuResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteSubMenuResponse.h
deleted file mode 100644
index 670d52db4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteSubMenuResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DELETESUBMENURESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DELETESUBMENURESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class DeleteSubMenuResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      DeleteSubMenuResponse(const DeleteSubMenuResponse& c);
-      DeleteSubMenuResponse(void);
-    
-      DeleteSubMenuResponse& operator =(const DeleteSubMenuResponse&);
-    
-      virtual ~DeleteSubMenuResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class DeleteSubMenuResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DialNumber.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DialNumber.h
deleted file mode 100644
index 04ee84c0f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DialNumber.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DIALNUMBER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DIALNUMBER_INCLUDE
-
-#include <string>
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class DialNumber : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      DialNumber(const DialNumber& c);
-      DialNumber(void);
-    
-      DialNumber& operator =(const DialNumber&);
-    
-      virtual ~DialNumber(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::string& get_number(void);
-
-      int get_appId(void);
-
-
-// setters
-/// number <= 500
-      bool set_number(const std::string& number);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class DialNumberMarshaller;
-
-      std::string number;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DialNumberResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DialNumberResponse.h
deleted file mode 100644
index 6dc53db5b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DialNumberResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DIALNUMBERRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DIALNUMBERRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class DialNumberResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      DialNumberResponse(const DialNumberResponse& c);
-      DialNumberResponse(void);
-    
-      DialNumberResponse& operator =(const DialNumberResponse&);
-    
-      virtual ~DialNumberResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class DialNumberResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/EndAudioPassThru.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/EndAudioPassThru.h
deleted file mode 100644
index 89cf43623..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/EndAudioPassThru.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ENDAUDIOPASSTHRU_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ENDAUDIOPASSTHRU_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class EndAudioPassThru : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      EndAudioPassThru(const EndAudioPassThru& c);
-      EndAudioPassThru(void);
-    
-      EndAudioPassThru& operator =(const EndAudioPassThru&);
-    
-      virtual ~EndAudioPassThru(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      int get_appId(void);
-
-
-// setters
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class EndAudioPassThruMarshaller;
-
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/EndAudioPassThruResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/EndAudioPassThruResponse.h
deleted file mode 100644
index 665dff35a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/EndAudioPassThruResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ENDAUDIOPASSTHRURESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ENDAUDIOPASSTHRURESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class EndAudioPassThruResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      EndAudioPassThruResponse(const EndAudioPassThruResponse& c);
-      EndAudioPassThruResponse(void);
-    
-      EndAudioPassThruResponse& operator =(const EndAudioPassThruResponse&);
-    
-      virtual ~EndAudioPassThruResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class EndAudioPassThruResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetCapabilities.h
deleted file mode 100644
index 7eb81ce29..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetCapabilities.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_GETCAPABILITIES_INCLUDE
-#define NSRPC2COMMUNICATION_UI_GETCAPABILITIES_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class GetCapabilities : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetCapabilities(const GetCapabilities& c);
-      GetCapabilities(void);
-    
-      GetCapabilities& operator =(const GetCapabilities&);
-    
-      virtual ~GetCapabilities(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetCapabilitiesMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetCapabilitiesResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetCapabilitiesResponse.h
deleted file mode 100644
index 5d5b3b4a4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetCapabilitiesResponse.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_GETCAPABILITIESRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_GETCAPABILITIESRESPONSE_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/HmiZoneCapabilities.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class GetCapabilitiesResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetCapabilitiesResponse(const GetCapabilitiesResponse& c);
-      GetCapabilitiesResponse(void);
-    
-      GetCapabilitiesResponse& operator =(const GetCapabilitiesResponse&);
-    
-      virtual ~GetCapabilitiesResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::DisplayCapabilities& get_displayCapabilities(void);
-
-      const std::vector< NsSmartDeviceLinkRPCV2::HmiZoneCapabilities>& get_hmiZoneCapabilities(void);
-
-      const std::vector< NsSmartDeviceLinkRPCV2::SoftButtonCapabilities>* get_softButtonCapabilities(void);
-
-// setters
-      bool set_displayCapabilities(const NsSmartDeviceLinkRPCV2::DisplayCapabilities& displayCapabilities);
-
-/// 1 <= size <= 100
-      bool set_hmiZoneCapabilities(const std::vector< NsSmartDeviceLinkRPCV2::HmiZoneCapabilities>& hmiZoneCapabilities);
-
-/// 1 <= size <= 100
-      bool set_softButtonCapabilities(const std::vector< NsSmartDeviceLinkRPCV2::SoftButtonCapabilities>& softButtonCapabilities);
-
-      void reset_softButtonCapabilities(void);
-
-
-    private:
-
-      friend class GetCapabilitiesResponseMarshaller;
-
-      NsSmartDeviceLinkRPCV2::DisplayCapabilities displayCapabilities;
-      std::vector< NsSmartDeviceLinkRPCV2::HmiZoneCapabilities> hmiZoneCapabilities;
-      std::vector< NsSmartDeviceLinkRPCV2::SoftButtonCapabilities>* softButtonCapabilities;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetLanguage.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetLanguage.h
deleted file mode 100644
index d350718c1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetLanguage.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_GETLANGUAGE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_GETLANGUAGE_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class GetLanguage : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetLanguage(const GetLanguage& c);
-      GetLanguage(void);
-    
-      GetLanguage& operator =(const GetLanguage&);
-    
-      virtual ~GetLanguage(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetLanguageMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetLanguageResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetLanguageResponse.h
deleted file mode 100644
index 7e7d1f8a1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetLanguageResponse.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_GETLANGUAGERESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_GETLANGUAGERESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class GetLanguageResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetLanguageResponse(const GetLanguageResponse& c);
-      GetLanguageResponse(void);
-    
-      GetLanguageResponse& operator =(const GetLanguageResponse&);
-    
-      virtual ~GetLanguageResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::Language& get_hmiDisplayLanguage(void);
-
-
-// setters
-      bool set_hmiDisplayLanguage(const NsSmartDeviceLinkRPCV2::Language& hmiDisplayLanguage);
-
-
-    private:
-
-      friend class GetLanguageResponseMarshaller;
-
-      NsSmartDeviceLinkRPCV2::Language hmiDisplayLanguage;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetSupportedLanguages.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetSupportedLanguages.h
deleted file mode 100644
index 67419088b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetSupportedLanguages.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_GETSUPPORTEDLANGUAGES_INCLUDE
-#define NSRPC2COMMUNICATION_UI_GETSUPPORTEDLANGUAGES_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class GetSupportedLanguages : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetSupportedLanguages(const GetSupportedLanguages& c);
-      GetSupportedLanguages(void);
-    
-      GetSupportedLanguages& operator =(const GetSupportedLanguages&);
-    
-      virtual ~GetSupportedLanguages(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetSupportedLanguagesMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetSupportedLanguagesResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetSupportedLanguagesResponse.h
deleted file mode 100644
index 3f0230642..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetSupportedLanguagesResponse.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_GETSUPPORTEDLANGUAGESRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_GETSUPPORTEDLANGUAGESRESPONSE_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class GetSupportedLanguagesResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetSupportedLanguagesResponse(const GetSupportedLanguagesResponse& c);
-      GetSupportedLanguagesResponse(void);
-    
-      GetSupportedLanguagesResponse& operator =(const GetSupportedLanguagesResponse&);
-    
-      virtual ~GetSupportedLanguagesResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::Language>& get_languages(void);
-
-
-// setters
-/// 1 <= size <= 100
-      bool set_languages(const std::vector< NsSmartDeviceLinkRPCV2::Language>& languages);
-
-
-    private:
-
-      friend class GetSupportedLanguagesResponseMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::Language> languages;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnCommand.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnCommand.h
deleted file mode 100644
index df733754a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnCommand.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONCOMMAND_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONCOMMAND_INCLUDE
-
-#include "JSONHandler/RPC2Notification.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class OnCommand : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnCommand(const OnCommand& c);
-      OnCommand(void);
-    
-      OnCommand& operator =(const OnCommand&);
-    
-      virtual ~OnCommand(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_commandId(void);
-
-      int get_appId(void);
-
-
-// setters
-/// commandId <= 2000000000
-      bool set_commandId(unsigned int commandId);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class OnCommandMarshaller;
-
-      unsigned int commandId;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnDeviceChosen.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnDeviceChosen.h
deleted file mode 100644
index d453732fe..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnDeviceChosen.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONDEVICECHOSEN_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONDEVICECHOSEN_INCLUDE
-
-#include <string>
-#include "JSONHandler/RPC2Notification.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class OnDeviceChosen : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnDeviceChosen(const OnDeviceChosen& c);
-      OnDeviceChosen(void);
-    
-      OnDeviceChosen& operator =(const OnDeviceChosen&);
-    
-      virtual ~OnDeviceChosen(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::string& get_deviceName(void);
-
-
-// setters
-      bool set_deviceName(const std::string& deviceName);
-
-
-    private:
-
-      friend class OnDeviceChosenMarshaller;
-
-      std::string deviceName;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnDriverDistraction.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnDriverDistraction.h
deleted file mode 100644
index d4cf376fe..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnDriverDistraction.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONDRIVERDISTRACTION_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONDRIVERDISTRACTION_INCLUDE
-
-#include "JSONHandler/RPC2Notification.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DriverDistractionState.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class OnDriverDistraction : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnDriverDistraction(const OnDriverDistraction& c);
-      OnDriverDistraction(void);
-    
-      OnDriverDistraction& operator =(const OnDriverDistraction&);
-    
-      virtual ~OnDriverDistraction(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::DriverDistractionState& get_state(void);
-
-
-// setters
-      bool set_state(const NsSmartDeviceLinkRPCV2::DriverDistractionState& state);
-
-
-    private:
-
-      friend class OnDriverDistractionMarshaller;
-
-      NsSmartDeviceLinkRPCV2::DriverDistractionState state;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnLanguageChange.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnLanguageChange.h
deleted file mode 100644
index ab7782c21..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnLanguageChange.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONLANGUAGECHANGE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONLANGUAGECHANGE_INCLUDE
-
-#include "JSONHandler/RPC2Notification.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class OnLanguageChange : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnLanguageChange(const OnLanguageChange& c);
-      OnLanguageChange(void);
-    
-      OnLanguageChange& operator =(const OnLanguageChange&);
-    
-      virtual ~OnLanguageChange(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::Language& get_hmiDisplayLanguage(void);
-
-
-// setters
-      bool set_hmiDisplayLanguage(const NsSmartDeviceLinkRPCV2::Language& hmiDisplayLanguage);
-
-
-    private:
-
-      friend class OnLanguageChangeMarshaller;
-
-      NsSmartDeviceLinkRPCV2::Language hmiDisplayLanguage;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnReady.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnReady.h
deleted file mode 100644
index 84b6a5110..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnReady.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONREADY_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONREADY_INCLUDE
-
-#include "JSONHandler/RPC2Notification.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class OnReady : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnReady(const OnReady& c);
-      OnReady(void);
-    
-      OnReady& operator =(const OnReady&);
-    
-      virtual ~OnReady(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class OnReadyMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnSystemContext.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnSystemContext.h
deleted file mode 100644
index 932b74b5a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnSystemContext.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONSYSTEMCONTEXT_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONSYSTEMCONTEXT_INCLUDE
-
-#include "JSONHandler/RPC2Notification.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SystemContext.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class OnSystemContext : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnSystemContext(const OnSystemContext& c);
-      OnSystemContext(void);
-    
-      OnSystemContext& operator =(const OnSystemContext&);
-    
-      virtual ~OnSystemContext(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::SystemContext& get_systemContext(void);
-
-
-// setters
-      bool set_systemContext(const NsSmartDeviceLinkRPCV2::SystemContext& systemContext);
-
-
-    private:
-
-      friend class OnSystemContextMarshaller;
-
-      NsSmartDeviceLinkRPCV2::SystemContext systemContext;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnTBTClientState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnTBTClientState.h
deleted file mode 100644
index 84c0bcda4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnTBTClientState.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONTBTCLIENTSTATE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONTBTCLIENTSTATE_INCLUDE
-
-#include "JSONHandler/RPC2Notification.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TBTState.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class OnTBTClientState : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-
-      OnTBTClientState(const OnTBTClientState& c);
-      OnTBTClientState(void);
-
-      OnTBTClientState& operator =(const OnTBTClientState&);
-
-      virtual ~OnTBTClientState(void);
-
-      bool checkIntegrity(void);
-
-// getters
-      const NsSmartDeviceLinkRPCV2::TBTState& get_state(void);
-      int get_appId(void);
-
-// setters
-      bool set_state(const NsSmartDeviceLinkRPCV2::TBTState& state);
-      bool set_appId(int appId);
-
-    private:
-      friend class OnTBTClientStateMarshaller;
-
-      NsSmartDeviceLinkRPCV2::TBTState state;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformAudioPassThru.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformAudioPassThru.h
deleted file mode 100644
index 25b510747..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformAudioPassThru.h
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_PERFORMAUDIOPASSTHRU_INCLUDE
-#define NSRPC2COMMUNICATION_UI_PERFORMAUDIOPASSTHRU_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SamplingRate.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioCaptureQuality.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioType.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class PerformAudioPassThru : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      PerformAudioPassThru(const PerformAudioPassThru& c);
-      PerformAudioPassThru(void);
-    
-      PerformAudioPassThru& operator =(const PerformAudioPassThru&);
-    
-      virtual ~PerformAudioPassThru(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& get_initialPrompt(void);
-
-      const std::string* get_audioPassThruDisplayText1(void);
-      const std::string* get_audioPassThruDisplayText2(void);
-      const NsSmartDeviceLinkRPCV2::SamplingRate& get_samplingRate(void);
-
-      unsigned int get_maxDuration(void);
-
-      const NsSmartDeviceLinkRPCV2::AudioCaptureQuality& get_bitsPerSample(void);
-
-      const NsSmartDeviceLinkRPCV2::AudioType& get_audioType(void);
-
-      int get_appId(void);
-
-
-// setters
-/// 1 <= size <= 100
-      bool set_initialPrompt(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& initialPrompt);
-
-/// audioPassThruDisplayText1 <= 500
-      bool set_audioPassThruDisplayText1(const std::string& audioPassThruDisplayText1);
-
-      void reset_audioPassThruDisplayText1(void);
-
-/// audioPassThruDisplayText2 <= 500
-      bool set_audioPassThruDisplayText2(const std::string& audioPassThruDisplayText2);
-
-      void reset_audioPassThruDisplayText2(void);
-
-      bool set_samplingRate(const NsSmartDeviceLinkRPCV2::SamplingRate& samplingRate);
-
-/// maxDuration <= 1000000
-      bool set_maxDuration(unsigned int maxDuration);
-
-      bool set_bitsPerSample(const NsSmartDeviceLinkRPCV2::AudioCaptureQuality& bitsPerSample);
-
-      bool set_audioType(const NsSmartDeviceLinkRPCV2::AudioType& audioType);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class PerformAudioPassThruMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::TTSChunk> initialPrompt;
-      std::string* audioPassThruDisplayText1;
-      std::string* audioPassThruDisplayText2;
-      NsSmartDeviceLinkRPCV2::SamplingRate samplingRate;
-      unsigned int maxDuration;
-      NsSmartDeviceLinkRPCV2::AudioCaptureQuality bitsPerSample;
-      NsSmartDeviceLinkRPCV2::AudioType audioType;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformAudioPassThruResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformAudioPassThruResponse.h
deleted file mode 100644
index 112ccc655..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformAudioPassThruResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_PERFORMAUDIOPASSTHRURESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_PERFORMAUDIOPASSTHRURESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class PerformAudioPassThruResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      PerformAudioPassThruResponse(const PerformAudioPassThruResponse& c);
-      PerformAudioPassThruResponse(void);
-    
-      PerformAudioPassThruResponse& operator =(const PerformAudioPassThruResponse&);
-    
-      virtual ~PerformAudioPassThruResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class PerformAudioPassThruResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformInteraction.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformInteraction.h
deleted file mode 100644
index 796d2d010..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformInteraction.h
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_PERFORMINTERACTION_INCLUDE
-#define NSRPC2COMMUNICATION_UI_PERFORMINTERACTION_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/InteractionMode.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class PerformInteraction : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      PerformInteraction(const PerformInteraction& c);
-      PerformInteraction(void);
-    
-      PerformInteraction& operator =(const PerformInteraction&);
-    
-      virtual ~PerformInteraction(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::string& get_initialText(void);
-
-      const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& get_initialPrompt(void);
-
-      const NsSmartDeviceLinkRPCV2::InteractionMode& get_interactionMode(void);
-
-      const std::vector< unsigned int>& get_interactionChoiceSetIDList(void);
-
-      const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* get_helpPrompt(void);
-      const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* get_timeoutPrompt(void);
-      const unsigned int* get_timeout(void);
-      const std::vector< NsSmartDeviceLinkRPCV2::VrHelpItem>* get_vrHelp(void);
-      int get_appId(void);
-
-
-// setters
-/// initialText <= 500
-      bool set_initialText(const std::string& initialText);
-
-/// 1 <= size <= 100
-      bool set_initialPrompt(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& initialPrompt);
-
-      bool set_interactionMode(const NsSmartDeviceLinkRPCV2::InteractionMode& interactionMode);
-
-/// interactionChoiceSetIDList[] <= 2000000000 ; 1 <= size <= 100
-      bool set_interactionChoiceSetIDList(const std::vector< unsigned int>& interactionChoiceSetIDList);
-
-/// 1 <= size <= 100
-      bool set_helpPrompt(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& helpPrompt);
-
-      void reset_helpPrompt(void);
-
-/// 1 <= size <= 100
-      bool set_timeoutPrompt(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& timeoutPrompt);
-
-      void reset_timeoutPrompt(void);
-
-/// 5000 <= timeout <= 100000
-      bool set_timeout(const unsigned int& timeout);
-
-      void reset_timeout(void);
-
-/// 1 <= size <= 100
-      bool set_vrHelp(const std::vector< NsSmartDeviceLinkRPCV2::VrHelpItem>& vrHelp);
-
-      void reset_vrHelp(void);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class PerformInteractionMarshaller;
-
-      std::string initialText;
-      std::vector< NsSmartDeviceLinkRPCV2::TTSChunk> initialPrompt;
-      NsSmartDeviceLinkRPCV2::InteractionMode interactionMode;
-      std::vector< unsigned int> interactionChoiceSetIDList;
-      std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* helpPrompt;
-      std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* timeoutPrompt;
-      unsigned int* timeout;
-      std::vector< NsSmartDeviceLinkRPCV2::VrHelpItem>* vrHelp;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformInteractionResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformInteractionResponse.h
deleted file mode 100644
index fc28c4a73..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformInteractionResponse.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_PERFORMINTERACTIONRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_PERFORMINTERACTIONRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TriggerSource.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class PerformInteractionResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      PerformInteractionResponse(const PerformInteractionResponse& c);
-      PerformInteractionResponse(void);
-    
-      PerformInteractionResponse& operator =(const PerformInteractionResponse&);
-    
-      virtual ~PerformInteractionResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const unsigned int* get_choiceID(void);
-      const NsSmartDeviceLinkRPCV2::TriggerSource* get_triggerSource(void);
-
-// setters
-/// choiceID <= 2000000000
-      bool set_choiceID(const unsigned int& choiceID);
-
-      void reset_choiceID(void);
-
-      bool set_triggerSource(const NsSmartDeviceLinkRPCV2::TriggerSource& triggerSource);
-
-      void reset_triggerSource(void);
-
-
-    private:
-
-      friend class PerformInteractionResponseMarshaller;
-
-      unsigned int* choiceID;
-      NsSmartDeviceLinkRPCV2::TriggerSource* triggerSource;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/RPC2.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/RPC2.h
deleted file mode 100644
index 088cd9cd3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/RPC2.h
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_RPC2_INCLUDE
-#define NSRPC2COMMUNICATION_UI_RPC2_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AddCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AddCommandResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AddSubMenu.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AddSubMenuResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/Alert.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AlertResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AlertManeuver.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AlertManeuverResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ChangeRegistration.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ChangeRegistrationResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/CreateInteractionChoiceSet.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/CreateInteractionChoiceSetResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DeleteCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DeleteCommandResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DeleteInteractionChoiceSet.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DeleteInteractionChoiceSetResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DeleteSubMenu.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DeleteSubMenuResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DialNumber.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DialNumberResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/EndAudioPassThru.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/EndAudioPassThruResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/GetCapabilities.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/GetCapabilitiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/GetLanguage.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/GetLanguageResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/GetSupportedLanguages.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/GetSupportedLanguagesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnDeviceChosen.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnDriverDistraction.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnLanguageChange.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnReady.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnSystemContext.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnTBTClientState.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/PerformAudioPassThru.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/PerformAudioPassThruResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/PerformInteraction.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/PerformInteractionResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ResetGlobalProperties.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ResetGlobalPropertiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ScrollableMessage.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ScrollableMessageResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetAppIcon.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetAppIconResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetDisplayLayout.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetDisplayLayoutResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetGlobalProperties.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetGlobalPropertiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetMediaClockTimer.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetMediaClockTimerResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/Show.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ShowResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ShowConstantTBT.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ShowConstantTBTResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/Slider.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SliderResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/UpdateTurnList.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/UpdateTurnListResponse.h"
-
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ResetGlobalProperties.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ResetGlobalProperties.h
deleted file mode 100644
index affb93756..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ResetGlobalProperties.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_RESETGLOBALPROPERTIES_INCLUDE
-#define NSRPC2COMMUNICATION_UI_RESETGLOBALPROPERTIES_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GlobalProperty.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class ResetGlobalProperties : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      ResetGlobalProperties(const ResetGlobalProperties& c);
-      ResetGlobalProperties(void);
-    
-      ResetGlobalProperties& operator =(const ResetGlobalProperties&);
-    
-      virtual ~ResetGlobalProperties(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::GlobalProperty>& get_properties(void);
-
-      int get_appId(void);
-
-
-// setters
-/// 1 <= size <= 100
-      bool set_properties(const std::vector< NsSmartDeviceLinkRPCV2::GlobalProperty>& properties);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class ResetGlobalPropertiesMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::GlobalProperty> properties;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ResetGlobalPropertiesResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ResetGlobalPropertiesResponse.h
deleted file mode 100644
index 84cc644f5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ResetGlobalPropertiesResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_RESETGLOBALPROPERTIESRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_RESETGLOBALPROPERTIESRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class ResetGlobalPropertiesResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      ResetGlobalPropertiesResponse(const ResetGlobalPropertiesResponse& c);
-      ResetGlobalPropertiesResponse(void);
-    
-      ResetGlobalPropertiesResponse& operator =(const ResetGlobalPropertiesResponse&);
-    
-      virtual ~ResetGlobalPropertiesResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class ResetGlobalPropertiesResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ScrollableMessage.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ScrollableMessage.h
deleted file mode 100644
index d39f88d59..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ScrollableMessage.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SCROLLABLEMESSAGE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SCROLLABLEMESSAGE_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButton.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class ScrollableMessage : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      ScrollableMessage(const ScrollableMessage& c);
-      ScrollableMessage(void);
-    
-      ScrollableMessage& operator =(const ScrollableMessage&);
-    
-      virtual ~ScrollableMessage(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::string& get_scrollableMessageBody(void);
-
-      const unsigned int* get_timeout(void);
-      const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>* get_softButtons(void);
-      int get_appId(void);
-
-
-// setters
-/// scrollableMessageBody <= 500
-      bool set_scrollableMessageBody(const std::string& scrollableMessageBody);
-
-/// timeout <= 65535
-      bool set_timeout(const unsigned int& timeout);
-
-      void reset_timeout(void);
-
-/// 0 <= size <= 8
-      bool set_softButtons(const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& softButtons);
-
-      void reset_softButtons(void);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class ScrollableMessageMarshaller;
-
-      std::string scrollableMessageBody;
-      unsigned int* timeout;
-      std::vector< NsSmartDeviceLinkRPCV2::SoftButton>* softButtons;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ScrollableMessageResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ScrollableMessageResponse.h
deleted file mode 100644
index d98d2965b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ScrollableMessageResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SCROLLABLEMESSAGERESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SCROLLABLEMESSAGERESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class ScrollableMessageResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      ScrollableMessageResponse(const ScrollableMessageResponse& c);
-      ScrollableMessageResponse(void);
-    
-      ScrollableMessageResponse& operator =(const ScrollableMessageResponse&);
-    
-      virtual ~ScrollableMessageResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class ScrollableMessageResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetAppIcon.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetAppIcon.h
deleted file mode 100644
index 9b3d4ad38..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetAppIcon.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETAPPICON_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETAPPICON_INCLUDE
-
-#include <string>
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class SetAppIcon : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      SetAppIcon(const SetAppIcon& c);
-      SetAppIcon(void);
-    
-      SetAppIcon& operator =(const SetAppIcon&);
-    
-      virtual ~SetAppIcon(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::string& get_syncFileName(void);
-
-      int get_appId(void);
-
-
-// setters
-/// syncFileName <= 500
-      bool set_syncFileName(const std::string& syncFileName);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class SetAppIconMarshaller;
-
-      std::string syncFileName;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetAppIconResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetAppIconResponse.h
deleted file mode 100644
index 356075324..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetAppIconResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETAPPICONRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETAPPICONRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class SetAppIconResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      SetAppIconResponse(const SetAppIconResponse& c);
-      SetAppIconResponse(void);
-    
-      SetAppIconResponse& operator =(const SetAppIconResponse&);
-    
-      virtual ~SetAppIconResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class SetAppIconResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetDisplayLayout.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetDisplayLayout.h
deleted file mode 100644
index 7d49f4114..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetDisplayLayout.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETDISPLAYLAYOUT_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETDISPLAYLAYOUT_INCLUDE
-
-#include <string>
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class SetDisplayLayout : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      SetDisplayLayout(const SetDisplayLayout& c);
-      SetDisplayLayout(void);
-    
-      SetDisplayLayout& operator =(const SetDisplayLayout&);
-    
-      virtual ~SetDisplayLayout(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::string& get_displayLayout(void);
-
-      int get_appId(void);
-
-
-// setters
-      bool set_displayLayout(const std::string& displayLayout);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class SetDisplayLayoutMarshaller;
-
-      std::string displayLayout;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetDisplayLayoutResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetDisplayLayoutResponse.h
deleted file mode 100644
index cadf33614..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetDisplayLayoutResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETDISPLAYLAYOUTRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETDISPLAYLAYOUTRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class SetDisplayLayoutResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      SetDisplayLayoutResponse(const SetDisplayLayoutResponse& c);
-      SetDisplayLayoutResponse(void);
-    
-      SetDisplayLayoutResponse& operator =(const SetDisplayLayoutResponse&);
-    
-      virtual ~SetDisplayLayoutResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class SetDisplayLayoutResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetGlobalProperties.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetGlobalProperties.h
deleted file mode 100644
index e428498f7..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetGlobalProperties.h
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETGLOBALPROPERTIES_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETGLOBALPROPERTIES_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class SetGlobalProperties : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      SetGlobalProperties(const SetGlobalProperties& c);
-      SetGlobalProperties(void);
-    
-      SetGlobalProperties& operator =(const SetGlobalProperties&);
-    
-      virtual ~SetGlobalProperties(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* get_helpPrompt(void);
-      const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* get_timeoutPrompt(void);
-      const std::string* get_vrHelpTitle(void);
-      const std::vector< NsSmartDeviceLinkRPCV2::VrHelpItem>* get_vrHelp(void);
-      int get_appId(void);
-
-
-// setters
-/// 1 <= size <= 100
-      bool set_helpPrompt(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& helpPrompt);
-
-      void reset_helpPrompt(void);
-
-/// 1 <= size <= 100
-      bool set_timeoutPrompt(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& timeoutPrompt);
-
-      void reset_timeoutPrompt(void);
-
-/// vrHelpTitle <= 500
-      bool set_vrHelpTitle(const std::string& vrHelpTitle);
-
-      void reset_vrHelpTitle(void);
-
-/// 1 <= size <= 100
-      bool set_vrHelp(const std::vector< NsSmartDeviceLinkRPCV2::VrHelpItem>& vrHelp);
-
-      void reset_vrHelp(void);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class SetGlobalPropertiesMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* helpPrompt;
-      std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* timeoutPrompt;
-      std::string* vrHelpTitle;
-      std::vector< NsSmartDeviceLinkRPCV2::VrHelpItem>* vrHelp;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetGlobalPropertiesResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetGlobalPropertiesResponse.h
deleted file mode 100644
index 3f83e18e4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetGlobalPropertiesResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETGLOBALPROPERTIESRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETGLOBALPROPERTIESRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class SetGlobalPropertiesResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      SetGlobalPropertiesResponse(const SetGlobalPropertiesResponse& c);
-      SetGlobalPropertiesResponse(void);
-    
-      SetGlobalPropertiesResponse& operator =(const SetGlobalPropertiesResponse&);
-    
-      virtual ~SetGlobalPropertiesResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class SetGlobalPropertiesResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetMediaClockTimer.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetMediaClockTimer.h
deleted file mode 100644
index 011d7a21d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetMediaClockTimer.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETMEDIACLOCKTIMER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETMEDIACLOCKTIMER_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/StartTime.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateMode.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class SetMediaClockTimer : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      SetMediaClockTimer(const SetMediaClockTimer& c);
-      SetMediaClockTimer(void);
-    
-      SetMediaClockTimer& operator =(const SetMediaClockTimer&);
-    
-      virtual ~SetMediaClockTimer(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::StartTime* get_startTime(void);
-      const NsSmartDeviceLinkRPCV2::UpdateMode& get_updateMode(void);
-
-      int get_appId(void);
-
-
-// setters
-      bool set_startTime(const NsSmartDeviceLinkRPCV2::StartTime& startTime);
-
-      void reset_startTime(void);
-
-      bool set_updateMode(const NsSmartDeviceLinkRPCV2::UpdateMode& updateMode);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class SetMediaClockTimerMarshaller;
-
-      NsSmartDeviceLinkRPCV2::StartTime* startTime;
-      NsSmartDeviceLinkRPCV2::UpdateMode updateMode;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetMediaClockTimerResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetMediaClockTimerResponse.h
deleted file mode 100644
index 8b5aa5b2b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetMediaClockTimerResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETMEDIACLOCKTIMERRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETMEDIACLOCKTIMERRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class SetMediaClockTimerResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      SetMediaClockTimerResponse(const SetMediaClockTimerResponse& c);
-      SetMediaClockTimerResponse(void);
-    
-      SetMediaClockTimerResponse& operator =(const SetMediaClockTimerResponse&);
-    
-      virtual ~SetMediaClockTimerResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class SetMediaClockTimerResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Show.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Show.h
deleted file mode 100644
index 01f733106..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Show.h
+++ /dev/null
@@ -1,163 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SHOW_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SHOW_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextAlignment.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Image.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButton.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class Show : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      Show(const Show& c);
-      Show(void);
-    
-      Show& operator =(const Show&);
-    
-      virtual ~Show(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::string* get_mainField1(void);
-      const std::string* get_mainField2(void);
-      const std::string* get_mainField3(void);
-      const std::string* get_mainField4(void);
-      const NsSmartDeviceLinkRPCV2::TextAlignment* get_alignment(void);
-      const std::string* get_statusBar(void);
-      const std::string* get_mediaClock(void);
-      const std::string* get_mediaTrack(void);
-      const NsSmartDeviceLinkRPCV2::Image* get_graphic(void);
-      const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>* get_softButtons(void);
-      const std::vector< std::string>* get_customPresets(void);
-      int get_appId(void);
-
-
-// setters
-/// mainField1 <= 500
-      bool set_mainField1(const std::string& mainField1);
-
-      void reset_mainField1(void);
-
-/// mainField2 <= 500
-      bool set_mainField2(const std::string& mainField2);
-
-      void reset_mainField2(void);
-
-/// mainField3 <= 500
-      bool set_mainField3(const std::string& mainField3);
-
-      void reset_mainField3(void);
-
-/// mainField4 <= 500
-      bool set_mainField4(const std::string& mainField4);
-
-      void reset_mainField4(void);
-
-      bool set_alignment(const NsSmartDeviceLinkRPCV2::TextAlignment& alignment);
-
-      void reset_alignment(void);
-
-/// statusBar <= 500
-      bool set_statusBar(const std::string& statusBar);
-
-      void reset_statusBar(void);
-
-/// mediaClock <= 500
-      bool set_mediaClock(const std::string& mediaClock);
-
-      void reset_mediaClock(void);
-
-/// mediaTrack <= 500
-      bool set_mediaTrack(const std::string& mediaTrack);
-
-      void reset_mediaTrack(void);
-
-      bool set_graphic(const NsSmartDeviceLinkRPCV2::Image& graphic);
-
-      void reset_graphic(void);
-
-/// 0 <= size <= 8
-      bool set_softButtons(const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& softButtons);
-
-      void reset_softButtons(void);
-
-/// customPresets[] <= 500 ; 0 <= size <= 6
-      bool set_customPresets(const std::vector< std::string>& customPresets);
-
-      void reset_customPresets(void);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class ShowMarshaller;
-
-      std::string* mainField1;
-      std::string* mainField2;
-      std::string* mainField3;
-      std::string* mainField4;
-      NsSmartDeviceLinkRPCV2::TextAlignment* alignment;
-      std::string* statusBar;
-      std::string* mediaClock;
-      std::string* mediaTrack;
-      NsSmartDeviceLinkRPCV2::Image* graphic;
-      std::vector< NsSmartDeviceLinkRPCV2::SoftButton>* softButtons;
-      std::vector< std::string>* customPresets;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowConstantTBT.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowConstantTBT.h
deleted file mode 100644
index b761d1a37..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowConstantTBT.h
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SHOWCONSTANTTBT_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SHOWCONSTANTTBT_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Image.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButton.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class ShowConstantTBT : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      ShowConstantTBT(const ShowConstantTBT& c);
-      ShowConstantTBT(void);
-    
-      ShowConstantTBT& operator =(const ShowConstantTBT&);
-    
-      virtual ~ShowConstantTBT(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::string* get_navigationText1(void);
-      const std::string* get_navigationText2(void);
-      const std::string* get_eta(void);
-      const std::string* get_totalDistance(void);
-      const NsSmartDeviceLinkRPCV2::Image& get_turnIcon(void);
-
-      float get_distanceToManeuver(void);
-
-      float get_distanceToManeuverScale(void);
-
-      const bool* get_maneuverComplete(void);
-      const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& get_softButtons(void);
-
-      int get_appId(void);
-
-
-// setters
-/// navigationText1 <= 500
-      bool set_navigationText1(const std::string& navigationText1);
-
-      void reset_navigationText1(void);
-
-/// navigationText2 <= 500
-      bool set_navigationText2(const std::string& navigationText2);
-
-      void reset_navigationText2(void);
-
-/// eta <= 500
-      bool set_eta(const std::string& eta);
-
-      void reset_eta(void);
-
-/// totalDistance <= 500
-      bool set_totalDistance(const std::string& totalDistance);
-
-      void reset_totalDistance(void);
-
-      bool set_turnIcon(const NsSmartDeviceLinkRPCV2::Image& turnIcon);
-
-/// 0 <= distanceToManeuver <= 1000000000
-      bool set_distanceToManeuver(float distanceToManeuver);
-
-/// 0 <= distanceToManeuverScale <= 1000000000
-      bool set_distanceToManeuverScale(float distanceToManeuverScale);
-
-      bool set_maneuverComplete(const bool& maneuverComplete);
-
-      void reset_maneuverComplete(void);
-
-/// 0 <= size <= 3
-      bool set_softButtons(const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& softButtons);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class ShowConstantTBTMarshaller;
-
-      std::string* navigationText1;
-      std::string* navigationText2;
-      std::string* eta;
-      std::string* totalDistance;
-      NsSmartDeviceLinkRPCV2::Image turnIcon;
-      float distanceToManeuver;
-      float distanceToManeuverScale;
-      bool* maneuverComplete;
-      std::vector< NsSmartDeviceLinkRPCV2::SoftButton> softButtons;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowConstantTBTResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowConstantTBTResponse.h
deleted file mode 100644
index fc4f4930e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowConstantTBTResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SHOWCONSTANTTBTRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SHOWCONSTANTTBTRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class ShowConstantTBTResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      ShowConstantTBTResponse(const ShowConstantTBTResponse& c);
-      ShowConstantTBTResponse(void);
-    
-      ShowConstantTBTResponse& operator =(const ShowConstantTBTResponse&);
-    
-      virtual ~ShowConstantTBTResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class ShowConstantTBTResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowResponse.h
deleted file mode 100644
index eb05ecf66..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SHOWRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SHOWRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class ShowResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      ShowResponse(const ShowResponse& c);
-      ShowResponse(void);
-    
-      ShowResponse& operator =(const ShowResponse&);
-    
-      virtual ~ShowResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class ShowResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Slider.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Slider.h
deleted file mode 100644
index 2421bb870..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Slider.h
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SLIDER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SLIDER_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class Slider : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      Slider(const Slider& c);
-      Slider(void);
-    
-      Slider& operator =(const Slider&);
-    
-      virtual ~Slider(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_numTicks(void);
-
-      unsigned int get_position(void);
-
-      const std::string& get_sliderHeader(void);
-
-      const std::vector< std::string>* get_sliderFooter(void);
-      unsigned int get_timeout(void);
-
-      int get_appId(void);
-
-
-// setters
-/// 2 <= numTicks <= 26
-      bool set_numTicks(unsigned int numTicks);
-
-/// 1 <= position <= 16
-      bool set_position(unsigned int position);
-
-/// sliderHeader <= 500
-      bool set_sliderHeader(const std::string& sliderHeader);
-
-/// sliderFooter[] <= 500 ; 1 <= size <= 26
-      bool set_sliderFooter(const std::vector< std::string>& sliderFooter);
-
-      void reset_sliderFooter(void);
-
-/// timeout <= 65535
-      bool set_timeout(unsigned int timeout);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class SliderMarshaller;
-
-      unsigned int numTicks;
-      unsigned int position;
-      std::string sliderHeader;
-      std::vector< std::string>* sliderFooter;
-      unsigned int timeout;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SliderResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SliderResponse.h
deleted file mode 100644
index f7828c125..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SliderResponse.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SLIDERRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SLIDERRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class SliderResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      SliderResponse(const SliderResponse& c);
-      SliderResponse(void);
-    
-      SliderResponse& operator =(const SliderResponse&);
-    
-      virtual ~SliderResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_sliderPosition(void);
-
-
-// setters
-/// 1 <= sliderPosition <= 26
-      bool set_sliderPosition(unsigned int sliderPosition);
-
-
-    private:
-
-      friend class SliderResponseMarshaller;
-
-      unsigned int sliderPosition;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/UpdateTurnList.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/UpdateTurnList.h
deleted file mode 100644
index 0bac9c820..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/UpdateTurnList.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_UPDATETURNLIST_INCLUDE
-#define NSRPC2COMMUNICATION_UI_UPDATETURNLIST_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Turn.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButton.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class UpdateTurnList : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      UpdateTurnList(const UpdateTurnList& c);
-      UpdateTurnList(void);
-    
-      UpdateTurnList& operator =(const UpdateTurnList&);
-    
-      virtual ~UpdateTurnList(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::Turn>& get_turnList(void);
-
-      const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& get_softButtons(void);
-
-      int get_appId(void);
-
-
-// setters
-/// 1 <= size <= 100
-      bool set_turnList(const std::vector< NsSmartDeviceLinkRPCV2::Turn>& turnList);
-
-/// 0 <= size <= 1
-      bool set_softButtons(const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& softButtons);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class UpdateTurnListMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::Turn> turnList;
-      std::vector< NsSmartDeviceLinkRPCV2::SoftButton> softButtons;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/UpdateTurnListResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/UpdateTurnListResponse.h
deleted file mode 100644
index d6cef5d31..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/UpdateTurnListResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_UPDATETURNLISTRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_UI_UPDATETURNLISTRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    class UpdateTurnListResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      UpdateTurnListResponse(const UpdateTurnListResponse& c);
-      UpdateTurnListResponse(void);
-    
-      UpdateTurnListResponse& operator =(const UpdateTurnListResponse&);
-    
-      virtual ~UpdateTurnListResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class UpdateTurnListResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/AddCommand.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/AddCommand.h
deleted file mode 100644
index be4373577..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/AddCommand.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_ADDCOMMAND_INCLUDE
-#define NSRPC2COMMUNICATION_VR_ADDCOMMAND_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class AddCommand : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      AddCommand(const AddCommand& c);
-      AddCommand(void);
-    
-      AddCommand& operator =(const AddCommand&);
-    
-      virtual ~AddCommand(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_cmdId(void);
-
-      const std::vector< std::string>& get_vrCommands(void);
-
-      int get_appId(void);
-
-
-// setters
-/// cmdId <= 2000000000
-      bool set_cmdId(unsigned int cmdId);
-
-/// vrCommands[] <= 99 ; 1 <= size <= 100
-      bool set_vrCommands(const std::vector< std::string>& vrCommands);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class AddCommandMarshaller;
-
-      unsigned int cmdId;
-      std::vector< std::string> vrCommands;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/AddCommandResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/AddCommandResponse.h
deleted file mode 100644
index ee135f4e6..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/AddCommandResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_ADDCOMMANDRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_VR_ADDCOMMANDRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class AddCommandResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      AddCommandResponse(const AddCommandResponse& c);
-      AddCommandResponse(void);
-    
-      AddCommandResponse& operator =(const AddCommandResponse&);
-    
-      virtual ~AddCommandResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class AddCommandResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/ChangeRegistration.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/ChangeRegistration.h
deleted file mode 100644
index 58f18caa9..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/ChangeRegistration.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_CHANGEREGISTRATION_INCLUDE
-#define NSRPC2COMMUNICATION_VR_CHANGEREGISTRATION_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class ChangeRegistration : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      ChangeRegistration(const ChangeRegistration& c);
-      ChangeRegistration(void);
-    
-      ChangeRegistration& operator =(const ChangeRegistration&);
-    
-      virtual ~ChangeRegistration(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::Language& get_language(void);
-
-      int get_appId(void);
-
-
-// setters
-      bool set_language(const NsSmartDeviceLinkRPCV2::Language& language);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class ChangeRegistrationMarshaller;
-
-      NsSmartDeviceLinkRPCV2::Language language;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/ChangeRegistrationResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/ChangeRegistrationResponse.h
deleted file mode 100644
index 8d8e7b206..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/ChangeRegistrationResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_CHANGEREGISTRATIONRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_VR_CHANGEREGISTRATIONRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class ChangeRegistrationResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      ChangeRegistrationResponse(const ChangeRegistrationResponse& c);
-      ChangeRegistrationResponse(void);
-    
-      ChangeRegistrationResponse& operator =(const ChangeRegistrationResponse&);
-    
-      virtual ~ChangeRegistrationResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class ChangeRegistrationResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/DeleteCommand.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/DeleteCommand.h
deleted file mode 100644
index 8c8d39936..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/DeleteCommand.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_DELETECOMMAND_INCLUDE
-#define NSRPC2COMMUNICATION_VR_DELETECOMMAND_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class DeleteCommand : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      DeleteCommand(const DeleteCommand& c);
-      DeleteCommand(void);
-    
-      DeleteCommand& operator =(const DeleteCommand&);
-    
-      virtual ~DeleteCommand(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_cmdId(void);
-
-      int get_appId(void);
-
-
-// setters
-/// cmdId <= 2000000000
-      bool set_cmdId(unsigned int cmdId);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class DeleteCommandMarshaller;
-
-      unsigned int cmdId;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/DeleteCommandResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/DeleteCommandResponse.h
deleted file mode 100644
index 717b8fda0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/DeleteCommandResponse.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_DELETECOMMANDRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_VR_DELETECOMMANDRESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class DeleteCommandResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      DeleteCommandResponse(const DeleteCommandResponse& c);
-      DeleteCommandResponse(void);
-    
-      DeleteCommandResponse& operator =(const DeleteCommandResponse&);
-    
-      virtual ~DeleteCommandResponse(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class DeleteCommandResponseMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetCapabilities.h
deleted file mode 100644
index ca03cfa8c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetCapabilities.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_GETCAPABILITIES_INCLUDE
-#define NSRPC2COMMUNICATION_VR_GETCAPABILITIES_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class GetCapabilities : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetCapabilities(const GetCapabilities& c);
-      GetCapabilities(void);
-    
-      GetCapabilities& operator =(const GetCapabilities&);
-    
-      virtual ~GetCapabilities(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetCapabilitiesMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetCapabilitiesResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetCapabilitiesResponse.h
deleted file mode 100644
index aee9be237..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetCapabilitiesResponse.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_GETCAPABILITIESRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_VR_GETCAPABILITIESRESPONSE_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrCapabilities.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class GetCapabilitiesResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetCapabilitiesResponse(const GetCapabilitiesResponse& c);
-      GetCapabilitiesResponse(void);
-    
-      GetCapabilitiesResponse& operator =(const GetCapabilitiesResponse&);
-    
-      virtual ~GetCapabilitiesResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::VrCapabilities>& get_capabilities(void);
-
-
-// setters
-/// 1 <= size <= 100
-      bool set_capabilities(const std::vector< NsSmartDeviceLinkRPCV2::VrCapabilities>& capabilities);
-
-
-    private:
-
-      friend class GetCapabilitiesResponseMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::VrCapabilities> capabilities;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetLanguage.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetLanguage.h
deleted file mode 100644
index fa3459ad1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetLanguage.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_GETLANGUAGE_INCLUDE
-#define NSRPC2COMMUNICATION_VR_GETLANGUAGE_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class GetLanguage : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetLanguage(const GetLanguage& c);
-      GetLanguage(void);
-    
-      GetLanguage& operator =(const GetLanguage&);
-    
-      virtual ~GetLanguage(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetLanguageMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetLanguageResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetLanguageResponse.h
deleted file mode 100644
index 08b0e143b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetLanguageResponse.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_GETLANGUAGERESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_VR_GETLANGUAGERESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class GetLanguageResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetLanguageResponse(const GetLanguageResponse& c);
-      GetLanguageResponse(void);
-    
-      GetLanguageResponse& operator =(const GetLanguageResponse&);
-    
-      virtual ~GetLanguageResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::Language& get_language(void);
-
-
-// setters
-      bool set_language(const NsSmartDeviceLinkRPCV2::Language& language);
-
-
-    private:
-
-      friend class GetLanguageResponseMarshaller;
-
-      NsSmartDeviceLinkRPCV2::Language language;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetSupportedLanguages.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetSupportedLanguages.h
deleted file mode 100644
index 7a2b9866c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetSupportedLanguages.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_GETSUPPORTEDLANGUAGES_INCLUDE
-#define NSRPC2COMMUNICATION_VR_GETSUPPORTEDLANGUAGES_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class GetSupportedLanguages : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetSupportedLanguages(const GetSupportedLanguages& c);
-      GetSupportedLanguages(void);
-    
-      GetSupportedLanguages& operator =(const GetSupportedLanguages&);
-    
-      virtual ~GetSupportedLanguages(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetSupportedLanguagesMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetSupportedLanguagesResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetSupportedLanguagesResponse.h
deleted file mode 100644
index 3e0c3d52d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetSupportedLanguagesResponse.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_GETSUPPORTEDLANGUAGESRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_VR_GETSUPPORTEDLANGUAGESRESPONSE_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class GetSupportedLanguagesResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetSupportedLanguagesResponse(const GetSupportedLanguagesResponse& c);
-      GetSupportedLanguagesResponse(void);
-    
-      GetSupportedLanguagesResponse& operator =(const GetSupportedLanguagesResponse&);
-    
-      virtual ~GetSupportedLanguagesResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::Language>& get_languages(void);
-
-
-// setters
-/// 1 <= size <= 100
-      bool set_languages(const std::vector< NsSmartDeviceLinkRPCV2::Language>& languages);
-
-
-    private:
-
-      friend class GetSupportedLanguagesResponseMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::Language> languages;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/OnCommand.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/OnCommand.h
deleted file mode 100644
index 9d0bf0c5c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/OnCommand.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_ONCOMMAND_INCLUDE
-#define NSRPC2COMMUNICATION_VR_ONCOMMAND_INCLUDE
-
-#include "JSONHandler/RPC2Notification.h"
-
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class OnCommand : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnCommand(const OnCommand& c);
-      OnCommand(void);
-    
-      OnCommand& operator =(const OnCommand&);
-    
-      virtual ~OnCommand(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_cmdID(void);
-
-      int get_appId(void);
-
-
-// setters
-/// cmdID <= 2000000000
-      bool set_cmdID(unsigned int cmdID);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class OnCommandMarshaller;
-
-      unsigned int cmdID;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/OnLanguageChange.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/OnLanguageChange.h
deleted file mode 100644
index 8da1b2b74..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/OnLanguageChange.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_ONLANGUAGECHANGE_INCLUDE
-#define NSRPC2COMMUNICATION_VR_ONLANGUAGECHANGE_INCLUDE
-
-#include "JSONHandler/RPC2Notification.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    class OnLanguageChange : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnLanguageChange(const OnLanguageChange& c);
-      OnLanguageChange(void);
-    
-      OnLanguageChange& operator =(const OnLanguageChange&);
-    
-      virtual ~OnLanguageChange(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::Language& get_language(void);
-
-
-// setters
-      bool set_language(const NsSmartDeviceLinkRPCV2::Language& language);
-
-
-    private:
-
-      friend class OnLanguageChangeMarshaller;
-
-      NsSmartDeviceLinkRPCV2::Language language;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/RPC2.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/RPC2.h
deleted file mode 100644
index 175d7a1d6..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/RPC2.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_RPC2_INCLUDE
-#define NSRPC2COMMUNICATION_VR_RPC2_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/AddCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/AddCommandResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/ChangeRegistration.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/ChangeRegistrationResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/DeleteCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/DeleteCommandResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/GetCapabilities.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/GetCapabilitiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/GetLanguage.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/GetLanguageResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/GetSupportedLanguages.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/GetSupportedLanguagesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/OnCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/OnLanguageChange.h"
-
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetDTCs.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetDTCs.h
deleted file mode 100644
index 2d0995875..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetDTCs.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_GETDTCS_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_GETDTCS_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    class GetDTCs : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetDTCs(const GetDTCs& c);
-      GetDTCs(void);
-    
-      GetDTCs& operator =(const GetDTCs&);
-    
-      virtual ~GetDTCs(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_ecuName(void);
-
-      const bool* get_encrypted(void);
-      int get_appId(void);
-
-
-// setters
-/// ecuName <= 65535
-      bool set_ecuName(unsigned int ecuName);
-
-      bool set_encrypted(const bool& encrypted);
-
-      void reset_encrypted(void);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class GetDTCsMarshaller;
-
-      unsigned int ecuName;
-      bool* encrypted;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetDTCsResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetDTCsResponse.h
deleted file mode 100644
index 90e77bac9..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetDTCsResponse.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_GETDTCSRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_GETDTCSRESPONSE_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DTC.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    class GetDTCsResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetDTCsResponse(const GetDTCsResponse& c);
-      GetDTCsResponse(void);
-    
-      GetDTCsResponse& operator =(const GetDTCsResponse&);
-    
-      virtual ~GetDTCsResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::DTC>* get_dtcList(void);
-
-// setters
-/// 1 <= size <= 100
-      bool set_dtcList(const std::vector< NsSmartDeviceLinkRPCV2::DTC>& dtcList);
-
-      void reset_dtcList(void);
-
-
-    private:
-
-      friend class GetDTCsResponseMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::DTC>* dtcList;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleData.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleData.h
deleted file mode 100644
index 4f340faf7..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleData.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLEDATA_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLEDATA_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataType.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    class GetVehicleData : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetVehicleData(const GetVehicleData& c);
-      GetVehicleData(void);
-    
-      GetVehicleData& operator =(const GetVehicleData&);
-    
-      virtual ~GetVehicleData(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::VehicleDataType& get_dataType(void);
-
-      int get_appId(void);
-
-
-// setters
-      bool set_dataType(const NsSmartDeviceLinkRPCV2::VehicleDataType& dataType);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class GetVehicleDataMarshaller;
-
-      NsSmartDeviceLinkRPCV2::VehicleDataType dataType;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleDataResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleDataResponse.h
deleted file mode 100644
index 3b638a466..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleDataResponse.h
+++ /dev/null
@@ -1,198 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLEDATARESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLEDATARESPONSE_INCLUDE
-
-#include <string>
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GPSData.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PRNDL.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/TireStatus.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    class GetVehicleDataResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetVehicleDataResponse(const GetVehicleDataResponse& c);
-      GetVehicleDataResponse(void);
-    
-      GetVehicleDataResponse& operator =(const GetVehicleDataResponse&);
-    
-      virtual ~GetVehicleDataResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::GPSData* get_gps(void);
-      const float* get_speed(void);
-      const unsigned int* get_rpm(void);
-      const float* get_fuelLevel(void);
-      const float* get_avgFuelEconomy(void);
-      const float* get_batteryVoltage(void);
-      const float* get_externalTemperature(void);
-      const std::string* get_vin(void);
-      const NsSmartDeviceLinkRPCV2::PRNDL* get_prndl(void);
-      const NsSmartDeviceLinkRPCV2::TireStatus* get_tirePressure(void);
-      const float* get_batteryPackVoltage(void);
-      const float* get_batteryPackCurrent(void);
-      const int* get_batteryPackTemperature(void);
-      const int* get_engineTorque(void);
-      const unsigned int* get_odometer(void);
-      const unsigned int* get_tripOdometer(void);
-      const std::string* get_satRadioESN(void);
-
-// setters
-      bool set_gps(const NsSmartDeviceLinkRPCV2::GPSData& gps);
-
-      void reset_gps(void);
-
-/// -100 <= speed <= 500
-      bool set_speed(const float& speed);
-
-      void reset_speed(void);
-
-/// rpm <= 20000
-      bool set_rpm(const unsigned int& rpm);
-
-      void reset_rpm(void);
-
-/// 0 <= fuelLevel <= 100
-      bool set_fuelLevel(const float& fuelLevel);
-
-      void reset_fuelLevel(void);
-
-/// 0 <= avgFuelEconomy <= 7000
-      bool set_avgFuelEconomy(const float& avgFuelEconomy);
-
-      void reset_avgFuelEconomy(void);
-
-/// 0 <= batteryVoltage <= 26
-      bool set_batteryVoltage(const float& batteryVoltage);
-
-      void reset_batteryVoltage(void);
-
-/// -40 <= externalTemperature <= 100
-      bool set_externalTemperature(const float& externalTemperature);
-
-      void reset_externalTemperature(void);
-
-/// vin <= 17
-      bool set_vin(const std::string& vin);
-
-      void reset_vin(void);
-
-      bool set_prndl(const NsSmartDeviceLinkRPCV2::PRNDL& prndl);
-
-      void reset_prndl(void);
-
-      bool set_tirePressure(const NsSmartDeviceLinkRPCV2::TireStatus& tirePressure);
-
-      void reset_tirePressure(void);
-
-/// -1000 <= batteryPackVoltage <= 1000
-      bool set_batteryPackVoltage(const float& batteryPackVoltage);
-
-      void reset_batteryPackVoltage(void);
-
-/// -1000 <= batteryPackCurrent <= 1000
-      bool set_batteryPackCurrent(const float& batteryPackCurrent);
-
-      void reset_batteryPackCurrent(void);
-
-/// -50 <= batteryPackTemperature <= 250
-      bool set_batteryPackTemperature(const int& batteryPackTemperature);
-
-      void reset_batteryPackTemperature(void);
-
-/// -10000 <= engineTorque <= 55000
-      bool set_engineTorque(const int& engineTorque);
-
-      void reset_engineTorque(void);
-
-/// odometer <= 2000000
-      bool set_odometer(const unsigned int& odometer);
-
-      void reset_odometer(void);
-
-/// tripOdometer <= 2000000
-      bool set_tripOdometer(const unsigned int& tripOdometer);
-
-      void reset_tripOdometer(void);
-
-/// satRadioESN <= 500
-      bool set_satRadioESN(const std::string& satRadioESN);
-
-      void reset_satRadioESN(void);
-
-
-    private:
-
-      friend class GetVehicleDataResponseMarshaller;
-
-      NsSmartDeviceLinkRPCV2::GPSData* gps;
-      float* speed;
-      unsigned int* rpm;
-      float* fuelLevel;
-      float* avgFuelEconomy;
-      float* batteryVoltage;
-      float* externalTemperature;
-      std::string* vin;
-      NsSmartDeviceLinkRPCV2::PRNDL* prndl;
-      NsSmartDeviceLinkRPCV2::TireStatus* tirePressure;
-      float* batteryPackVoltage;
-      float* batteryPackCurrent;
-      int* batteryPackTemperature;
-      int* engineTorque;
-      unsigned int* odometer;
-      unsigned int* tripOdometer;
-      std::string* satRadioESN;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleType.h
deleted file mode 100644
index 8162d4c00..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleType.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLETYPE_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLETYPE_INCLUDE
-
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    class GetVehicleType : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      GetVehicleType(const GetVehicleType& c);
-      GetVehicleType(void);
-    
-      GetVehicleType& operator =(const GetVehicleType&);
-    
-      virtual ~GetVehicleType(void);
-    
-      bool checkIntegrity(void);
-    
-
-    private:
-
-      friend class GetVehicleTypeMarshaller;
-
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponse.h
deleted file mode 100644
index 32293a341..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponse.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLETYPERESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLETYPERESPONSE_INCLUDE
-
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleType.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    class GetVehicleTypeResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      GetVehicleTypeResponse(const GetVehicleTypeResponse& c);
-      GetVehicleTypeResponse(void);
-    
-      GetVehicleTypeResponse& operator =(const GetVehicleTypeResponse&);
-    
-      virtual ~GetVehicleTypeResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::VehicleType& get_vehicleType(void);
-
-
-// setters
-      bool set_vehicleType(const NsSmartDeviceLinkRPCV2::VehicleType& vehicleType);
-
-
-    private:
-
-      friend class GetVehicleTypeResponseMarshaller;
-
-      NsSmartDeviceLinkRPCV2::VehicleType vehicleType;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/OnVehicleData.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/OnVehicleData.h
deleted file mode 100644
index bff4fd304..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/OnVehicleData.h
+++ /dev/null
@@ -1,198 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_ONVEHICLEDATA_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_ONVEHICLEDATA_INCLUDE
-
-#include <string>
-#include "JSONHandler/RPC2Notification.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GPSData.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PRNDL.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/TireStatus.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    class OnVehicleData : public ::NsRPC2Communication::RPC2Notification
-    {
-    public:
-    
-      OnVehicleData(const OnVehicleData& c);
-      OnVehicleData(void);
-    
-      OnVehicleData& operator =(const OnVehicleData&);
-    
-      virtual ~OnVehicleData(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const NsSmartDeviceLinkRPCV2::GPSData* get_gps(void);
-      const float* get_speed(void);
-      const unsigned int* get_rpm(void);
-      const float* get_fuelLevel(void);
-      const float* get_avgFuelEconomy(void);
-      const float* get_batteryVoltage(void);
-      const float* get_externalTemperature(void);
-      const std::string* get_vin(void);
-      const NsSmartDeviceLinkRPCV2::PRNDL* get_prndl(void);
-      const NsSmartDeviceLinkRPCV2::TireStatus* get_tirePressure(void);
-      const float* get_batteryPackVoltage(void);
-      const float* get_batteryPackCurrent(void);
-      const int* get_batteryPackTemperature(void);
-      const int* get_engineTorque(void);
-      const unsigned int* get_odometer(void);
-      const unsigned int* get_tripOdometer(void);
-      const std::string* get_genericbinary(void);
-
-// setters
-      bool set_gps(const NsSmartDeviceLinkRPCV2::GPSData& gps);
-
-      void reset_gps(void);
-
-/// -100 <= speed <= 500
-      bool set_speed(const float& speed);
-
-      void reset_speed(void);
-
-/// rpm <= 20000
-      bool set_rpm(const unsigned int& rpm);
-
-      void reset_rpm(void);
-
-/// 0 <= fuelLevel <= 100
-      bool set_fuelLevel(const float& fuelLevel);
-
-      void reset_fuelLevel(void);
-
-/// 0 <= avgFuelEconomy <= 7000
-      bool set_avgFuelEconomy(const float& avgFuelEconomy);
-
-      void reset_avgFuelEconomy(void);
-
-/// 0 <= batteryVoltage <= 26
-      bool set_batteryVoltage(const float& batteryVoltage);
-
-      void reset_batteryVoltage(void);
-
-/// -40 <= externalTemperature <= 100
-      bool set_externalTemperature(const float& externalTemperature);
-
-      void reset_externalTemperature(void);
-
-/// vin <= 17
-      bool set_vin(const std::string& vin);
-
-      void reset_vin(void);
-
-      bool set_prndl(const NsSmartDeviceLinkRPCV2::PRNDL& prndl);
-
-      void reset_prndl(void);
-
-      bool set_tirePressure(const NsSmartDeviceLinkRPCV2::TireStatus& tirePressure);
-
-      void reset_tirePressure(void);
-
-/// -1000 <= batteryPackVoltage <= 1000
-      bool set_batteryPackVoltage(const float& batteryPackVoltage);
-
-      void reset_batteryPackVoltage(void);
-
-/// -1000 <= batteryPackCurrent <= 1000
-      bool set_batteryPackCurrent(const float& batteryPackCurrent);
-
-      void reset_batteryPackCurrent(void);
-
-/// -50 <= batteryPackTemperature <= 250
-      bool set_batteryPackTemperature(const int& batteryPackTemperature);
-
-      void reset_batteryPackTemperature(void);
-
-/// -10000 <= engineTorque <= 55000
-      bool set_engineTorque(const int& engineTorque);
-
-      void reset_engineTorque(void);
-
-/// odometer <= 2000000
-      bool set_odometer(const unsigned int& odometer);
-
-      void reset_odometer(void);
-
-/// tripOdometer <= 2000000
-      bool set_tripOdometer(const unsigned int& tripOdometer);
-
-      void reset_tripOdometer(void);
-
-/// genericbinary <= 500
-      bool set_genericbinary(const std::string& genericbinary);
-
-      void reset_genericbinary(void);
-
-
-    private:
-
-      friend class OnVehicleDataMarshaller;
-
-      NsSmartDeviceLinkRPCV2::GPSData* gps;
-      float* speed;
-      unsigned int* rpm;
-      float* fuelLevel;
-      float* avgFuelEconomy;
-      float* batteryVoltage;
-      float* externalTemperature;
-      std::string* vin;
-      NsSmartDeviceLinkRPCV2::PRNDL* prndl;
-      NsSmartDeviceLinkRPCV2::TireStatus* tirePressure;
-      float* batteryPackVoltage;
-      float* batteryPackCurrent;
-      int* batteryPackTemperature;
-      int* engineTorque;
-      unsigned int* odometer;
-      unsigned int* tripOdometer;
-      std::string* genericbinary;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/RPC2.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/RPC2.h
deleted file mode 100644
index 63fb0bc48..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/RPC2.h
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_RPC2_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_RPC2_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/GetDTCs.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/GetDTCsResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/GetVehicleData.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/GetVehicleDataResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/GetVehicleType.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/GetVehicleTypeResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/OnVehicleData.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/ReadDID.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/ReadDIDResponse.h"
-
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/ReadDID.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/ReadDID.h
deleted file mode 100644
index dd5c6a2c0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/ReadDID.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_READDID_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_READDID_INCLUDE
-
-#include <vector>
-#include "JSONHandler/RPC2Request.h"
-
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    class ReadDID : public ::NsRPC2Communication::RPC2Request
-    {
-    public:
-    
-      ReadDID(const ReadDID& c);
-      ReadDID(void);
-    
-      ReadDID& operator =(const ReadDID&);
-    
-      virtual ~ReadDID(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      unsigned int get_ecuName(void);
-
-      const std::vector< unsigned int>& get_didLocation(void);
-
-      const bool* get_encrypted(void);
-      int get_appId(void);
-
-
-// setters
-/// ecuName <= 65535
-      bool set_ecuName(unsigned int ecuName);
-
-/// didLocation[] <= 65535 ; 0 <= size <= 1000
-      bool set_didLocation(const std::vector< unsigned int>& didLocation);
-
-      bool set_encrypted(const bool& encrypted);
-
-      void reset_encrypted(void);
-
-      bool set_appId(int appId);
-
-
-    private:
-
-      friend class ReadDIDMarshaller;
-
-      unsigned int ecuName;
-      std::vector< unsigned int> didLocation;
-      bool* encrypted;
-      int appId;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/ReadDIDResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/ReadDIDResponse.h
deleted file mode 100644
index 23ff4d6e4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/ReadDIDResponse.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_READDIDRESPONSE_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_READDIDRESPONSE_INCLUDE
-
-#include <string>
-#include <vector>
-#include "JSONHandler/RPC2Response.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataResultCode.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    class ReadDIDResponse : public ::NsRPC2Communication::RPC2Response
-    {
-    public:
-    
-      ReadDIDResponse(const ReadDIDResponse& c);
-      ReadDIDResponse(void);
-    
-      ReadDIDResponse& operator =(const ReadDIDResponse&);
-    
-      virtual ~ReadDIDResponse(void);
-    
-      bool checkIntegrity(void);
-    
-// getters
-      const std::vector< NsSmartDeviceLinkRPCV2::VehicleDataResultCode>* get_dataResult(void);
-      const std::vector< std::string>* get_data(void);
-
-// setters
-/// 0 <= size <= 1000
-      bool set_dataResult(const std::vector< NsSmartDeviceLinkRPCV2::VehicleDataResultCode>& dataResult);
-
-      void reset_dataResult(void);
-
-/// data[] <= 5000 ; 0 <= size <= 1000
-      bool set_data(const std::vector< std::string>& data);
-
-      void reset_data(void);
-
-
-    private:
-
-      friend class ReadDIDResponseMarshaller;
-
-      std::vector< NsSmartDeviceLinkRPCV2::VehicleDataResultCode>* dataResult;
-      std::vector< std::string>* data;
-
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Request.h
deleted file mode 100644
index f68eae6f4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Request.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
-* \file RPC2Request.hpp
-* \brief RPC2Request class header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef RPC2_REQUEST_CLASS
-#define RPC2_REQUEST_CLASS
-
-#include "RPC2Command.h"
-
-/**
-  *\namespace NsRPC2Communication
-  *\brief Namespace for communication with HMI.
-*/
-namespace NsRPC2Communication
-{  
-    /**
-     * \class RPC2Request
-     * \brief Base class for requests generated from Json RPC2
-    */
-    class RPC2Request : public RPC2Command
-    {
-    public:
-        /**
-         * \brief Default Constructor
-        */
-        RPC2Request( );
-
-        /**
-         * \brief Constructor
-         * \param method Method Id.
-        */
-        RPC2Request( int method );
-
-        /**
-         * \brief Constructor
-         * \param method Method Id.
-         * \param id Message id.
-        */
-        RPC2Request( int method ,unsigned int id);
-
-        /**
-         * \brief Destructor
-        */
-        virtual ~RPC2Request();
-
-        /**
-         * \brief Getter of message id.
-         * \return Message id.
-         */
-        virtual unsigned int getId() const;
-
-        /**
-         * \brief Setter of message id.
-         * \param id Message id.
-         */
-        virtual void setId(unsigned int id);        
-
-    private:
-        /**
-          *\brief Message id
-          * //! mId should be >0
-        */
-        unsigned int mId;
-        
-    };
-
-}
-
-#endif  //  RPC2_REQUEST_CLASS
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Response.h
deleted file mode 100644
index 7d3bb66e9..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/RPC2Response.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
-* \file RPC2Response.hpp
-* \brief RPC2Response class header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef RPC2_RESPONSE_CLASS
-#define RPC2_RESPONSE_CLASS
-
-#include "RPC2Command.h"
-
-/**
-  *\namespace NsRPC2Communication
-  *\brief Namespace for communication with HMI.
-*/
-namespace NsRPC2Communication
-{
-    /**
-     * \class RPC2Response
-     * \brief Base class for responses generated from Json RPC2
-    */
-    class RPC2Response : public RPC2Command
-    {
-    public:
-        /**
-         * \brief Default Constructor
-        */
-        RPC2Response( );
-
-        /**
-         * \brief Constructor
-         * \param method Method Id.
-        */
-        RPC2Response(int method);
-
-        /**
-         * \brief Constructor
-         * \param method Method Id.
-         * \param id Message id.
-        */
-        RPC2Response(int method ,unsigned int id);
-
-        /**
-         * \brief Constructor
-         * \param method Method Id.
-         * \param id Message id.
-         * \param res Result code.
-        */
-        RPC2Response(int method ,unsigned int id,int res);
-
-        /**
-         * \brief Destructor
-        */
-        virtual ~RPC2Response();
-
-        /**
-         * \brief Getter of Message id.
-         * \return Message id.
-         */
-        virtual unsigned int getId() const;
-
-        /**
-         * \brief Setter of Message id.
-         * \param id Message id.
-         */
-        virtual void setId(unsigned int id);
-
-        /**
-         * \brief Getter of Result.
-         * \return Result code.
-         */
-        virtual int getResult() const;
-
-        /**
-         * \brief Setter of Result.
-         * \param r Result code.
-         */
-        virtual void setResult(int r);
-
-
-    private:
-        /**
-          *\brief Message id
-        */
-        unsigned int mId;
-
-        /**
-          *\brief Result code
-        */
-        int mResultCode;
-
-    };
-}
-
-#endif // RPC2_RESPONSE_CLASS
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCMessage.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCMessage.h
deleted file mode 100644
index 52d46c19f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCMessage.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
-* \file SDLRPCMessage.hpp
-* \brief SDLRPCMessage class header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef ALRPCMESSAGE_INCLUDE
-#define ALRPCMESSAGE_INCLUDE
-
-#include <vector>
-
-/**
-  *\namespace NsSmartDeviceLinkRPC
-  *\brief Namespace for SmartDeviceLink JSON protocol related functionality.
-*/
-namespace NsSmartDeviceLinkRPC
-{
-    /**
-     * \class SDLRPCMessage
-     * \brief Base class for SmartDeviceLink Json messages classes.
-    */
-    class SDLRPCMessage
-    {
-    public:
-        /**
-         *\enum MessageType
-         *\brief SmartDeviceLink message types.
-        */
-        enum MessageType { REQUEST = 0x0, RESPONSE = 0x1, NOTIFICATION = 0x2, UNDEFINED };
-
-    public:
-        /**
-         * \brief Constructor
-         * \param protocolVersion Version of SmartDeviceLink protocol (currently 1,2)
-         * \param messageType Type of SmartDeviceLink message
-        */
-        SDLRPCMessage(unsigned int protocolVersion, MessageType messageType = UNDEFINED);
-
-        /**
-         * \brief Constructor
-         * \param protocolVersion Version of SmartDeviceLink protocol (currently 1,2).
-         * \param messageType Type of SmartDeviceLink message.
-         * \param methodID ID of RPC in message.
-        */
-        SDLRPCMessage(unsigned int protocolVersion, MessageType messageType, int methodID);
-        /**
-         * \brief Destructor
-        */
-        virtual ~SDLRPCMessage();
-
-        /**
-         * \brief Getter for protocol version.
-        */
-        virtual unsigned int getProtocolVersion() const;
-
-        /**
-         * \brief Getter for type of message.
-        */
-        virtual MessageType  getMessageType() const;
-
-        /**
-         * \brief Getter for id of RPC.
-        */
-        virtual int getMethodId() const;
-
-        /**
-         * \breif Setter for protocol version.
-        */
-        virtual void setProtocolVersion(unsigned int protocolVersion);
-
-        /**
-         * \brief setter for type of message.
-        */
-        virtual void setMessageType(MessageType messageType);
-
-        /**
-         * \brief setter for id of RPC.
-        */
-        virtual void setMethodId(int packetID);
-
-        /**
-         * \brief setter of binary data
-         * \param binaryData Vector of binary.
-         */
-        virtual void setBinaryData(const std::vector<unsigned char>& binaryData);
-
-        /**
-         * \brief Getter of binary data
-         * \return Pointer to binary data or NULL if doesn't exist.
-         */
-        virtual const std::vector<unsigned char>* getBinaryData() const;
-
-        /**
-         * \brief Getter for correlation id of JSON message.
-         * TODO (PV) it is not supposed to be in base class.
-         * \return correlation id of JSON message.
-         */
-        virtual unsigned int getCorrelationID() const;
-
-        /**
-         * \brief Setter for correlation id of JSON message.
-         * TODO (PV) it is not supposed to be in base class.
-         * \param correlationID Correlation ID of JSON message.
-         * \return type description
-         */
-        virtual void setCorrelationID(unsigned int correlationID);
-    private:
-        /**
-         * \brief SmartDeviceLink protocol version (currently 1,2)
-        */
-        unsigned int mProtocolVersion;
-
-        /**
-         * \brief Type of Message
-         * \sa enum MessageType
-        */
-        MessageType mMessageType;
-
-        /**
-         * \brief Id of RPC called in message
-         * function name + "_" + MessageType+ "Id"
-        */
-        int mMethodId;
-
-        /**
-          *\brief Array of binary data if it exists
-        */
-        std::vector<unsigned char>* mBinaryData;
-
-        /**
-          *\brief Correlation id of JSON message
-          * TODO not supposed to be in base class.
-        */
-        unsigned int    mCorrelationID;
-    };
-
-}
-
-#endif    //  ALRPCMESSAGE_INCLUDE
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCNotification.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCNotification.h
deleted file mode 100644
index 3a72160f4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCNotification.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
-* \file SDLRPCNotification.hpp
-* \brief Class SDLRPCNotification header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef ALRPCNOTIFICATION_INCLUDE
-#define ALRPCNOTIFICATION_INCLUDE
-
-#include "SDLRPCMessage.h"
-
-/**
- * \namespace NsSmartDeviceLinkRPC
- * \brief Namespace for SmartDeviceLink JSON protocol related functionality.
-*/ 
-namespace NsSmartDeviceLinkRPC
-{
-    /**
-     * \class SDLRPCNotification
-     * \brief Base class for SmartDeviceLink Json notification messages.
-     */
-    class SDLRPCNotification : public SDLRPCMessage
-    {
-    public:
-        /**
-         * \brief Constructor
-         * \param protocolVersion Version of protocol (currently 1,2)
-        */
-        SDLRPCNotification( unsigned int protocolVersion );
-
-        /**
-         * \brief Constructor
-         * \param protocolVersion Version of protocol (currently 1,2).
-         * \param methodID ID of RPC called by message.
-        */
-        SDLRPCNotification( unsigned int protocolVersion, int methodID);
-
-        /**
-         * \brief Default Constructor
-        */
-        SDLRPCNotification(void);
-
-        /**
-         * \brief Destructor
-        */
-        virtual ~SDLRPCNotification();
-
-    };
-
-}
-
-#endif //  ALRPCNOTIFICATION_INCLUDE
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AddCommand_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AddCommand_request.h
deleted file mode 100644
index 3f24c6a96..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AddCommand_request.h
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ADDCOMMAND_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKRPC_ADDCOMMAND_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "MenuParams.h"
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-/**
-     Adds a command to the in application menu.
-     Either menuParams or vrCommands must be provided.
-*/
-
-  class AddCommand_request : public SDLRPCRequest
-  {
-  public:
-  
-    AddCommand_request(const AddCommand_request& c);
-    AddCommand_request(void);
-    
-    virtual ~AddCommand_request(void);
-  
-    AddCommand_request& operator =(const AddCommand_request&);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_cmdID(void) const;
-    const MenuParams* get_menuParams(void) const;
-    const std::vector<std::string>* get_vrCommands(void) const;
-
-    bool set_cmdID(unsigned int cmdID_);
-    void reset_menuParams(void);
-    bool set_menuParams(const MenuParams& menuParams_);
-    void reset_vrCommands(void);
-    bool set_vrCommands(const std::vector<std::string>& vrCommands_);
-
-  private:
-  
-    friend class AddCommand_requestMarshaller;
-
-
-///  unique ID of the command to add.
-      unsigned int cmdID;	//!<  (0,2000000000)
-
-///  Optional sub value containing menu parameters
-      MenuParams* menuParams;
-
-/**
-     An array of strings to be used as VR sysnonyms for this command.
-     If this array is provided, it may not be empty.
-*/
-      std::vector<std::string>* vrCommands;	//!<   [%s..%s] (99)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AddCommand_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AddCommand_response.h
deleted file mode 100644
index 3ce8c6551..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AddCommand_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ADDCOMMAND_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKRPC_ADDCOMMAND_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class AddCommand_response : public SDLRPCResponse
-    {
-    public:
-        AddCommand_response(const AddCommand_response& c);
-        AddCommand_response(void);
-
-        virtual ~AddCommand_response(void);
-
-        AddCommand_response& operator =(const AddCommand_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class AddCommand_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_request.h
deleted file mode 100644
index 71f5f30f5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_request.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ADDSUBMENU_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKRPC_ADDSUBMENU_REQUEST_INCLUDE
-
-#include <string>
-
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Adds a sub menu to the in-application menu.
-
-  class AddSubMenu_request : public SDLRPCRequest
-  {
-  public:
-  
-    AddSubMenu_request(const AddSubMenu_request& c);
-    AddSubMenu_request(void);
-    
-    virtual ~AddSubMenu_request(void);
-  
-    AddSubMenu_request& operator =(const AddSubMenu_request&);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_menuID(void) const;
-    const unsigned int* get_position(void) const;
-    const std::string& get_menuName(void) const;
-
-    bool set_menuID(unsigned int menuID_);
-    void reset_position(void);
-    bool set_position(unsigned int position_);
-    bool set_menuName(const std::string& menuName_);
-
-  private:
-  
-    friend class AddSubMenu_requestMarshaller;
-
-
-///  unique ID of the sub menu to add.
-      unsigned int menuID;	//!<  (0,2000000000)
-
-/**
-     Position within the items that are are at top level of the in application menu.
-     0 will insert at the front.
-     1 will insert at the second position.
-     If position is greater or equal than the number of items on top level, the sub menu will be appended to the end.
-     Position of any submenu will always be located before the return and exit options
-     If this param was omitted the entry will be added at the end.
-*/
-      unsigned int* position;	//!<  (0,1000)
-
-///  Text to show in the menu for this sub menu.
-      std::string menuName;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_response.h
deleted file mode 100644
index f5a1e88a6..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ADDSUBMENU_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ADDSUBMENU_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class AddSubMenu_response : public SDLRPCResponse
-    {
-    public:
-        AddSubMenu_response(const AddSubMenu_response& c);
-        AddSubMenu_response(void);
-
-        virtual ~AddSubMenu_response(void);
-
-        AddSubMenu_response& operator =(const AddSubMenu_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class AddSubMenu_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Alert_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Alert_request.h
deleted file mode 100644
index 064a19171..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Alert_request.h
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ALERT_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ALERT_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Shows an alert which typically consists of text-to-speech message and text on the display. At least either alertText1, alertText2 or TTSChunks need to be provided.
-
-  class Alert_request : public SDLRPCRequest
-  {
-  public:
-  
-    Alert_request(const Alert_request& c);
-    Alert_request(void);
-    
-    virtual ~Alert_request(void);
-  
-    Alert_request& operator =(const Alert_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string* get_alertText1(void) const;
-    const std::string* get_alertText2(void) const;
-    const std::vector<TTSChunk>* get_ttsChunks(void) const;
-    const unsigned int* get_duration(void) const;
-    const bool* get_playTone(void) const;
-
-    void reset_alertText1(void);
-    bool set_alertText1(const std::string& alertText1_);
-    void reset_alertText2(void);
-    bool set_alertText2(const std::string& alertText2_);
-    void reset_ttsChunks(void);
-    bool set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_);
-    void reset_duration(void);
-    bool set_duration(unsigned int duration_);
-    void reset_playTone(void);
-    bool set_playTone(bool playTone_);
-
-  private:
-  
-    friend class Alert_requestMarshaller;
-
-
-///  The first line of the alert text field
-      std::string* alertText1;	//!< (500)
-
-///  The second line of the alert text field
-      std::string* alertText2;	//!< (500)
-
-/**
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* ttsChunks;	//!<   [%s..%s] 
-
-/**
-     Timeout in milliseconds.
-     Typical timeouts are 3-5 seconds
-     If omitted, timeout is set to 5s.
-*/
-      unsigned int* duration;	//!<  (3000,10000)
-
-/**
-     Defines if tone should be played. Tone is played before TTS.
-     If omitted, no tone is played.
-*/
-      bool* playTone;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Alert_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Alert_response.h
deleted file mode 100644
index 5ae8c40cf..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Alert_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ALERT_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ALERT_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class Alert_response : public SDLRPCResponse
-    {
-    public:
-        Alert_response(const Alert_response& c);
-        Alert_response(void);
-
-        virtual ~Alert_response(void);
-
-        Alert_response& operator =(const Alert_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class Alert_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AppInterfaceUnregisteredReason.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AppInterfaceUnregisteredReason.h
deleted file mode 100644
index 49c1010a8..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AppInterfaceUnregisteredReason.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_APPINTERFACEUNREGISTEREDREASON_INCLUDE
-#define NSSMARTDEVICELINKKRPC_APPINTERFACEUNREGISTEREDREASON_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Error code, which comes from sync side.
-
-  class AppInterfaceUnregisteredReason
-  {
-  public:
-    enum AppInterfaceUnregisteredReasonInternal
-    {
-      INVALID_ENUM=-1,
-      USER_EXIT=0,
-      IGNITION_OFF=1,
-      BLUETOOTH_OFF=2,
-      USB_DISCONNECTED=3,
-      REQUEST_WHILE_IN_NONE_HMI_LEVEL=4,
-      TOO_MANY_REQUESTS=5,
-      DRIVER_DISTRACTION_VIOLATION=6,
-      LANGUAGE_CHANGE=7,
-      MASTER_RESET=8,
-      FACTORY_DEFAULTS=9
-    };
-  
-    AppInterfaceUnregisteredReason() : mInternal(INVALID_ENUM)				{}
-    AppInterfaceUnregisteredReason(AppInterfaceUnregisteredReasonInternal e) : mInternal(e)		{}
-  
-    AppInterfaceUnregisteredReasonInternal get(void) const	{ return mInternal; }
-    void set(AppInterfaceUnregisteredReasonInternal e)		{ mInternal=e; }
-  
-  private:
-    AppInterfaceUnregisteredReasonInternal mInternal;
-    friend class AppInterfaceUnregisteredReasonMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AudioCaptureQuality.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AudioCaptureQuality.h
deleted file mode 100644
index 1bcdb2e67..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AudioCaptureQuality.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_AUDIOCAPTUREQUALITY_INCLUDE
-#define NSSMARTDEVICELINKKRPC_AUDIOCAPTUREQUALITY_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Describes different quality options for PerformAudioCapture.
-
-  class AudioCaptureQuality
-  {
-  public:
-    enum AudioCaptureQualityInternal
-    {
-      INVALID_ENUM=-1,
-      FIX_8KHZ=0,
-      FIX_16KHZ=1
-    };
-  
-    AudioCaptureQuality() : mInternal(INVALID_ENUM)				{}
-    AudioCaptureQuality(AudioCaptureQualityInternal e) : mInternal(e)		{}
-  
-    AudioCaptureQualityInternal get(void) const	{ return mInternal; }
-    void set(AudioCaptureQualityInternal e)		{ mInternal=e; }
-  
-  private:
-    AudioCaptureQualityInternal mInternal;
-    friend class AudioCaptureQualityMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AudioStreamingState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AudioStreamingState.h
deleted file mode 100644
index a646fc412..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/AudioStreamingState.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_AUDIOSTREAMINGSTATE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_AUDIOSTREAMINGSTATE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Enumeraction that describes possible states of audio streaming.
-
-  class AudioStreamingState
-  {
-  public:
-    enum AudioStreamingStateInternal
-    {
-      INVALID_ENUM=-1,
-      AUDIBLE=0,
-      NOT_AUDIBLE=1
-    };
-  
-    AudioStreamingState() : mInternal(INVALID_ENUM)				{}
-    AudioStreamingState(AudioStreamingStateInternal e) : mInternal(e)		{}
-  
-    AudioStreamingStateInternal get(void) const	{ return mInternal; }
-    void set(AudioStreamingStateInternal e)		{ mInternal=e; }
-  
-  private:
-    AudioStreamingStateInternal mInternal;
-    friend class AudioStreamingStateMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ButtonCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ButtonCapabilities.h
deleted file mode 100644
index e0922ef34..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ButtonCapabilities.h
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_BUTTONCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPC_BUTTONCAPABILITIES_INCLUDE
-
-
-#include "ButtonName.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Contains information about a buttons capabilities.
-
-  class ButtonCapabilities
-  {
-  public:
-  
-    ButtonCapabilities(const ButtonCapabilities& c);
-    ButtonCapabilities(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    bool get_longPressAvailable(void) const;
-    const ButtonName& get_name(void) const;
-    bool get_shortPressAvailable(void) const;
-    bool get_upDownAvailable(void) const;
-
-// setters
-
-    bool set_longPressAvailable(bool longPressAvailable_);
-    bool set_name(const ButtonName& name_);
-    bool set_shortPressAvailable(bool shortPressAvailable_);
-    bool set_upDownAvailable(bool upDownAvailable_);
-
-  private:
-
-    friend class ButtonCapabilitiesMarshaller;
-
-
-/**
-     The button supports a LONG press.
-     Whenever the button is pressed long, onButtonPressed( LONG) will be invoked.
-*/
-      bool longPressAvailable;
-
-///  The name of the button. See ButtonName.
-      ButtonName name;
-
-/**
-     The button supports a short press.
-     Whenever the button is pressed short, onButtonPressed( SHORT) will be invoked.
-*/
-      bool shortPressAvailable;
-
-/**
-     The button supports "button down" and "button up".
-     Whenever the button is pressed, onButtonEvent( DOWN) will be invoked.
-     Whenever the button is released, onButtonEvent( UP) will be invoked.
-*/
-      bool upDownAvailable;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ButtonEventMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ButtonEventMode.h
deleted file mode 100644
index 2244bd7a5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ButtonEventMode.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_BUTTONEVENTMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_BUTTONEVENTMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  class ButtonEventMode
-  {
-  public:
-    enum ButtonEventModeInternal
-    {
-      INVALID_ENUM=-1,
-
-///  A button has been released up
-      BUTTONUP=0,
-
-///  A button has been pressed down
-      BUTTONDOWN=1
-    };
-  
-    ButtonEventMode() : mInternal(INVALID_ENUM)				{}
-    ButtonEventMode(ButtonEventModeInternal e) : mInternal(e)		{}
-  
-    ButtonEventModeInternal get(void) const	{ return mInternal; }
-    void set(ButtonEventModeInternal e)		{ mInternal=e; }
-  
-  private:
-    ButtonEventModeInternal mInternal;
-    friend class ButtonEventModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ButtonName.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ButtonName.h
deleted file mode 100644
index 0f7fc41a9..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ButtonName.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_BUTTONNAME_INCLUDE
-#define NSSMARTDEVICELINKKRPC_BUTTONNAME_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Defines the hard (physical) and soft (touchscreen) buttons available from SYNC
-
-  class ButtonName
-  {
-  public:
-    enum ButtonNameInternal
-    {
-      INVALID_ENUM=-1,
-      OK=0,
-      SEEKLEFT=1,
-      SEEKRIGHT=2,
-      TUNEUP=3,
-      TUNEDOWN=4,
-      PRESET_0=5,
-      PRESET_1=6,
-      PRESET_2=7,
-      PRESET_3=8,
-      PRESET_4=9,
-      PRESET_5=10,
-      PRESET_6=11,
-      PRESET_7=12,
-      PRESET_8=13,
-      PRESET_9=14
-    };
-  
-    ButtonName() : mInternal(INVALID_ENUM)				{}
-    ButtonName(ButtonNameInternal e) : mInternal(e)		{}
-  
-    ButtonNameInternal get(void) const	{ return mInternal; }
-    void set(ButtonNameInternal e)		{ mInternal=e; }
-  
-  private:
-    ButtonNameInternal mInternal;
-    friend class ButtonNameMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ButtonPressMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ButtonPressMode.h
deleted file mode 100644
index d39c5db2b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ButtonPressMode.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_BUTTONPRESSMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_BUTTONPRESSMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  class ButtonPressMode
-  {
-  public:
-    enum ButtonPressModeInternal
-    {
-      INVALID_ENUM=-1,
-
-/**
-     A button was released, after it was pressed for a long time
-     Actual timing is defined by Sync and may vary
-*/
-      LONG=0,
-
-/**
-     A button was released, after it was pressed for a short time
-     Actual timing is defined by Sync and may vary
-*/
-      SHORT=1
-    };
-  
-    ButtonPressMode() : mInternal(INVALID_ENUM)				{}
-    ButtonPressMode(ButtonPressModeInternal e) : mInternal(e)		{}
-  
-    ButtonPressModeInternal get(void) const	{ return mInternal; }
-    void set(ButtonPressModeInternal e)		{ mInternal=e; }
-  
-  private:
-    ButtonPressModeInternal mInternal;
-    friend class ButtonPressModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/CharacterSet.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/CharacterSet.h
deleted file mode 100644
index f2c202eac..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/CharacterSet.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_CHARACTERSET_INCLUDE
-#define NSSMARTDEVICELINKKRPC_CHARACTERSET_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  The list of potential character sets
-
-  class CharacterSet
-  {
-  public:
-    enum CharacterSetInternal
-    {
-      INVALID_ENUM=-1,
-
-///  See [@TODO: create file ref]
-      TYPE2SET=0,
-
-///  See [@TODO: create file ref]
-      TYPE5SET=1,
-
-///  See [@TODO: create file ref]
-      CID1SET=2,
-
-///  See [@TODO: create file ref]
-      CID2SET=3
-    };
-  
-    CharacterSet() : mInternal(INVALID_ENUM)				{}
-    CharacterSet(CharacterSetInternal e) : mInternal(e)		{}
-  
-    CharacterSetInternal get(void) const	{ return mInternal; }
-    void set(CharacterSetInternal e)		{ mInternal=e; }
-  
-  private:
-    CharacterSetInternal mInternal;
-    friend class CharacterSetMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Choice.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Choice.h
deleted file mode 100644
index 1ff1921c3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Choice.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_CHOICE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_CHOICE_INCLUDE
-
-#include <string>
-#include <vector>
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  A choice is an option given to the user, which can be selected either by menu, or through voice recognition system.
-
-  class Choice
-  {
-  public:
-  
-    Choice(const Choice& c);
-    Choice(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    unsigned int get_choiceID(void) const;
-    const std::string& get_menuName(void) const;
-    const std::vector<std::string>& get_vrCommands(void) const;
-
-// setters
-
-    bool set_choiceID(unsigned int choiceID_);
-    bool set_menuName(const std::string& menuName_);
-    bool set_vrCommands(const std::vector<std::string>& vrCommands_);
-
-  private:
-
-    friend class ChoiceMarshaller;
-
-      unsigned int choiceID;	//!<  (0,65535)
-      std::string menuName;	//!< (500)
-      std::vector<std::string> vrCommands;	//!<   [%s..%s] (99)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_request.h
deleted file mode 100644
index 1021f0e01..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_request.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_CREATEINTERACTIONCHOICESET_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_CREATEINTERACTIONCHOICESET_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "Choice.h"
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  creates interaction choice set to be used later by performInteraction
-
-  class CreateInteractionChoiceSet_request : public SDLRPCRequest
-  {
-  public:
-  
-    CreateInteractionChoiceSet_request(const CreateInteractionChoiceSet_request& c);
-    CreateInteractionChoiceSet_request(void);
-    
-    virtual ~CreateInteractionChoiceSet_request(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_interactionChoiceSetID(void) const;
-    const std::vector<Choice>& get_choiceSet(void) const;
-
-    bool set_interactionChoiceSetID(unsigned int interactionChoiceSetID_);
-    bool set_choiceSet(const std::vector<Choice>& choiceSet_);
-
-  private:
-  
-    friend class CreateInteractionChoiceSet_requestMarshaller;
-
-
-///  Unique ID used for this interaction choice set.
-      unsigned int interactionChoiceSetID;	//!<  (0,2000000000)
-      std::vector<Choice> choiceSet;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_response.h
deleted file mode 100644
index 3fa301a03..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_CREATEINTERACTIONCHOICESET_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_CREATEINTERACTIONCHOICESET_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class CreateInteractionChoiceSet_response : public SDLRPCResponse
-    {
-    public:
-        CreateInteractionChoiceSet_response(const CreateInteractionChoiceSet_response& c);
-        CreateInteractionChoiceSet_response(void);
-
-        virtual ~CreateInteractionChoiceSet_response(void);
-
-        CreateInteractionChoiceSet_response& operator =(const CreateInteractionChoiceSet_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class CreateInteractionChoiceSet_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_request.h
deleted file mode 100644
index 7426e69cb..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_request.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_DELETECOMMAND_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_DELETECOMMAND_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Deletes all commands from the in-application menu with the specified command id.
-
-  class DeleteCommand_request : public SDLRPCRequest
-  {
-  public:
-  
-    DeleteCommand_request(const DeleteCommand_request& c);
-    DeleteCommand_request(void);
-    
-    virtual ~DeleteCommand_request(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_cmdID(void) const;
-
-    bool set_cmdID(unsigned int cmdID_);
-
-  private:
-  
-    friend class DeleteCommand_requestMarshaller;
-
-
-///  ID of the command(s) to delete.
-      unsigned int cmdID;	//!<  (0,2000000000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_response.h
deleted file mode 100644
index 3188e337b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_DELETECOMMAND_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_DELETECOMMAND_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class DeleteCommand_response : public SDLRPCResponse
-    {
-    public:
-        DeleteCommand_response(const DeleteCommand_response& c);
-        DeleteCommand_response(void);
-
-        virtual ~DeleteCommand_response(void);
-
-        DeleteCommand_response& operator =(const DeleteCommand_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class DeleteCommand_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_request.h
deleted file mode 100644
index 01d83f3e0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_request.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_DELETEINTERACTIONCHOICESET_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_DELETEINTERACTIONCHOICESET_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-/**
-     Deletes interaction choice set that has been created with "CreateInteractionChoiceSet".
-     The interaction may only be deleted when not currently in use by a "performInteraction".
-*/
-
-  class DeleteInteractionChoiceSet_request : public SDLRPCRequest
-  {
-  public:
-  
-    DeleteInteractionChoiceSet_request(const DeleteInteractionChoiceSet_request& c);
-    DeleteInteractionChoiceSet_request(void);
-    
-    virtual ~DeleteInteractionChoiceSet_request(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_interactionChoiceSetID(void) const;
-
-    bool set_interactionChoiceSetID(unsigned int interactionChoiceSetID_);
-
-  private:
-  
-    friend class DeleteInteractionChoiceSet_requestMarshaller;
-
-
-///  ID of the interaction choice set to delete.
-      unsigned int interactionChoiceSetID;	//!<  (0,2000000000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_response.h
deleted file mode 100644
index 81286dc13..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_DELETEINTERACTIONCHOICESET_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_DELETEINTERACTIONCHOICESET_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class DeleteInteractionChoiceSet_response : public SDLRPCResponse
-    {
-    public:
-        DeleteInteractionChoiceSet_response(const DeleteInteractionChoiceSet_response& c);
-        DeleteInteractionChoiceSet_response(void);
-
-        virtual ~DeleteInteractionChoiceSet_response(void);
-
-        DeleteInteractionChoiceSet_response& operator =(const DeleteInteractionChoiceSet_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class DeleteInteractionChoiceSet_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_request.h
deleted file mode 100644
index 00a3893be..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_request.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_DELETESUBMENU_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_DELETESUBMENU_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Deletes a submenu from the in-application menu.
-
-  class DeleteSubMenu_request : public SDLRPCRequest
-  {
-  public:
-  
-    DeleteSubMenu_request(const DeleteSubMenu_request& c);
-    DeleteSubMenu_request(void);
-    
-    virtual ~DeleteSubMenu_request(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_menuID(void) const;
-
-    bool set_menuID(unsigned int menuID_);
-
-  private:
-  
-    friend class DeleteSubMenu_requestMarshaller;
-
-
-///  The "menuID" of the submenu to delete. (See addSubMenu.menuID)
-      unsigned int menuID;	//!<  (0,2000000000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_response.h
deleted file mode 100644
index c9bbe84a4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_DELETESUBMENU_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_DELETESUBMENU_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class DeleteSubMenu_response : public SDLRPCResponse
-    {
-    public:
-        DeleteSubMenu_response(const DeleteSubMenu_response& c);
-        DeleteSubMenu_response(void);
-
-        virtual ~DeleteSubMenu_response(void);
-
-        DeleteSubMenu_response& operator =(const DeleteSubMenu_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class DeleteSubMenu_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DisplayCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DisplayCapabilities.h
deleted file mode 100644
index 1b5274370..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DisplayCapabilities.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_DISPLAYCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPC_DISPLAYCAPABILITIES_INCLUDE
-
-#include <vector>
-
-#include "DisplayType.h"
-#include "MediaClockFormat.h"
-#include "TextField.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Contains information about the display capabilities.
-
-  class DisplayCapabilities
-  {
-  public:
-  
-    DisplayCapabilities(const DisplayCapabilities& c);
-    DisplayCapabilities(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const DisplayType& get_displayType(void) const;
-    const std::vector<MediaClockFormat>& get_mediaClockFormats(void) const;
-    const std::vector<TextField>& get_textFields(void) const;
-
-// setters
-
-    bool set_displayType(const DisplayType& displayType_);
-    bool set_mediaClockFormats(const std::vector<MediaClockFormat>& mediaClockFormats_);
-    bool set_textFields(const std::vector<TextField>& textFields_);
-
-  private:
-
-    friend class DisplayCapabilitiesMarshaller;
-
-
-///  The type of the display. See DisplayType
-      DisplayType displayType;
-
-///  A set of all supported formats of the media clock. See MediaClockFormat
-      std::vector<MediaClockFormat> mediaClockFormats;	//!<   [%s..%s] 
-
-///  A set of all fields that support text data. See TextField
-      std::vector<TextField> textFields;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DisplayType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DisplayType.h
deleted file mode 100644
index d9ec435f1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DisplayType.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_DISPLAYTYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_DISPLAYTYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  See DAES for further infos regarding the displays]
-
-  class DisplayType
-  {
-  public:
-    enum DisplayTypeInternal
-    {
-      INVALID_ENUM=-1,
-      CID=0,
-      TYPE2=1,
-      TYPE5=2,
-      NGN=3,
-      GEN2_8_DMA=4,
-      GEN2_6_DMA=5,
-      MFD3=6,
-      MFD4=7,
-      MFD5=8
-    };
-  
-    DisplayType() : mInternal(INVALID_ENUM)				{}
-    DisplayType(DisplayTypeInternal e) : mInternal(e)		{}
-  
-    DisplayTypeInternal get(void) const	{ return mInternal; }
-    void set(DisplayTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    DisplayTypeInternal mInternal;
-    friend class DisplayTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DriverDistractionState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DriverDistractionState.h
deleted file mode 100644
index 60f1c05fc..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/DriverDistractionState.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_DRIVERDISTRACTIONSTATE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_DRIVERDISTRACTIONSTATE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Enumeration that describes possible states of driver distraction.
-
-  class DriverDistractionState
-  {
-  public:
-    enum DriverDistractionStateInternal
-    {
-      INVALID_ENUM=-1,
-      DD_ON=0,
-      DD_OFF=1
-    };
-  
-    DriverDistractionState() : mInternal(INVALID_ENUM)				{}
-    DriverDistractionState(DriverDistractionStateInternal e) : mInternal(e)		{}
-  
-    DriverDistractionStateInternal get(void) const	{ return mInternal; }
-    void set(DriverDistractionStateInternal e)		{ mInternal=e; }
-  
-  private:
-    DriverDistractionStateInternal mInternal;
-    friend class DriverDistractionStateMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_request.h
deleted file mode 100644
index f95493e9e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_request.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ENCODEDSYNCPDATA_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ENCODEDSYNCPDATA_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Allows encoded data in the form of SyncP packets to be sent to the SYNC module
-
-  class EncodedSyncPData_request : public SDLRPCRequest
-  {
-  public:
-  
-    EncodedSyncPData_request(const EncodedSyncPData_request& c);
-    EncodedSyncPData_request(void);
-    
-    virtual ~EncodedSyncPData_request(void);
-  
-    EncodedSyncPData_request& operator =(const EncodedSyncPData_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<std::string>* get_data(void) const;
-
-    void reset_data(void);
-    bool set_data(const std::vector<std::string>& data_);
-
-  private:
-  
-    friend class EncodedSyncPData_requestMarshaller;
-
-
-///  Contains base64 encoded string of SyncP packets.
-      std::vector<std::string>* data;	//!<   [%s..%s] (10000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_response.h
deleted file mode 100644
index 01e78d403..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ENCODEDSYNCPDATA_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ENCODEDSYNCPDATA_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class EncodedSyncPData_response : public SDLRPCResponse
-    {
-    public:
-        EncodedSyncPData_response(const EncodedSyncPData_response& c);
-        EncodedSyncPData_response(void);
-
-        virtual ~EncodedSyncPData_response(void);
-
-        EncodedSyncPData_response& operator =(const EncodedSyncPData_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class EncodedSyncPData_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/GenericResponse_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/GenericResponse_response.h
deleted file mode 100644
index 337180bcb..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/GenericResponse_response.h
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_GENERICRESPONSE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_GENERICRESPONSE_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    /**
-         Generic Response is sent, when the name of a received msg cannot be retrieved. Only used in case of an error.
-         Currently, only resultCode INVALID_DATA is used.
-    */
-    class GenericResponse_response : public SDLRPCResponse
-    {
-    public:
-        GenericResponse_response(const GenericResponse_response& c);
-        GenericResponse_response(void);
-
-        virtual ~GenericResponse_response(void);
-
-        GenericResponse_response& operator =(const GenericResponse_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class GenericResponse_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/GlobalProperty.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/GlobalProperty.h
deleted file mode 100644
index 0f5dbee8b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/GlobalProperty.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_GLOBALPROPERTY_INCLUDE
-#define NSSMARTDEVICELINKKRPC_GLOBALPROPERTY_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  The different global properties.
-
-  class GlobalProperty
-  {
-  public:
-    enum GlobalPropertyInternal
-    {
-      INVALID_ENUM=-1,
-
-///  The property helpPrompt of setGlobalProperties
-      HELPPROMPT=0,
-
-///  The property timeoutPrompt of setGlobalProperties
-      TIMEOUTPROMPT=1
-    };
-  
-    GlobalProperty() : mInternal(INVALID_ENUM)				{}
-    GlobalProperty(GlobalPropertyInternal e) : mInternal(e)		{}
-  
-    GlobalPropertyInternal get(void) const	{ return mInternal; }
-    void set(GlobalPropertyInternal e)		{ mInternal=e; }
-  
-  private:
-    GlobalPropertyInternal mInternal;
-    friend class GlobalPropertyMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/HMILevel.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/HMILevel.h
deleted file mode 100644
index da0dc36d3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/HMILevel.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_HMILEVEL_INCLUDE
-#define NSSMARTDEVICELINKKRPC_HMILEVEL_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Enumeraction that describes current levels of HMI.
-
-  class HMILevel
-  {
-  public:
-    enum HMILevelInternal
-    {
-      INVALID_ENUM=-1,
-      HMI_FULL=0,
-      HMI_LIMITED=1,
-      HMI_BACKGROUND=2,
-      HMI_NONE=3
-    };
-  
-    HMILevel() : mInternal(INVALID_ENUM)				{}
-    HMILevel(HMILevelInternal e) : mInternal(e)		{}
-  
-    HMILevelInternal get(void) const	{ return mInternal; }
-    void set(HMILevelInternal e)		{ mInternal=e; }
-  
-  private:
-    HMILevelInternal mInternal;
-    friend class HMILevelMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/HmiZoneCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/HmiZoneCapabilities.h
deleted file mode 100644
index 057ecb499..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/HmiZoneCapabilities.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_HMIZONECAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPC_HMIZONECAPABILITIES_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-/**
-     Contains information about the HMI zone capabilities.
-     For future use.
-*/
-
-  class HmiZoneCapabilities
-  {
-  public:
-    enum HmiZoneCapabilitiesInternal
-    {
-      INVALID_ENUM=-1,
-      FRONT=0,
-      BACK=1
-    };
-  
-    HmiZoneCapabilities() : mInternal(INVALID_ENUM)				{}
-    HmiZoneCapabilities(HmiZoneCapabilitiesInternal e) : mInternal(e)		{}
-  
-    HmiZoneCapabilitiesInternal get(void) const	{ return mInternal; }
-    void set(HmiZoneCapabilitiesInternal e)		{ mInternal=e; }
-  
-  private:
-    HmiZoneCapabilitiesInternal mInternal;
-    friend class HmiZoneCapabilitiesMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/InteractionMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/InteractionMode.h
deleted file mode 100644
index cfcb114a3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/InteractionMode.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_INTERACTIONMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_INTERACTIONMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-/**
-     For application-requested interactions, this mode indicates the method in which the user is notified and uses the interaction.
-     This mode causes the interaction to only occur on the display, meaning the choices are provided only via the display.
-     Selections are made with the OK and Seek Right and Left, Tune Up and Down buttons.
-     This mode causes the interaction to only occur using V4.
-     Selections are made by saying the command.
-     This mode causes both a VR and display selection option for an interaction.
-     Selections can be made either from the menu display or by speaking the command.
-*/
-
-  class InteractionMode
-  {
-  public:
-    enum InteractionModeInternal
-    {
-      INVALID_ENUM=-1,
-      MANUAL_ONLY=0,
-      VR_ONLY=1,
-      BOTH=2
-    };
-  
-    InteractionMode() : mInternal(INVALID_ENUM)				{}
-    InteractionMode(InteractionModeInternal e) : mInternal(e)		{}
-  
-    InteractionModeInternal get(void) const	{ return mInternal; }
-    void set(InteractionModeInternal e)		{ mInternal=e; }
-  
-  private:
-    InteractionModeInternal mInternal;
-    friend class InteractionModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Language.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Language.h
deleted file mode 100644
index 13bd80bbf..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Language.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_LANGUAGE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_LANGUAGE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  The set of potential languages
-
-  class Language
-  {
-  public:
-    enum LanguageInternal
-    {
-      INVALID_ENUM=-1,
-
-///  US English
-      EN_US=0,
-
-///  Mexican Spanish
-      ES_MX=1,
-
-///  Canadian French
-      FR_CA=2
-    };
-  
-    Language() : mInternal(INVALID_ENUM)				{}
-    Language(LanguageInternal e) : mInternal(e)		{}
-  
-    LanguageInternal get(void) const	{ return mInternal; }
-    void set(LanguageInternal e)		{ mInternal=e; }
-  
-  private:
-    LanguageInternal mInternal;
-    friend class LanguageMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Marshaller.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Marshaller.h
deleted file mode 100644
index 085a41c4b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Marshaller.h
+++ /dev/null
@@ -1,728 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_MARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKKRPC_MARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/SDLRPCObjectsImpl/V1/RegisterAppInterface_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/RegisterAppInterface_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/SetGlobalProperties_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/SetGlobalProperties_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/AddCommand_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/AddCommand_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/DeleteCommand_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/DeleteCommand_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/AddSubMenu_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/AddSubMenu_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/DeleteSubMenu_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/DeleteSubMenu_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/PerformInteraction_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/PerformInteraction_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/Alert_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/Alert_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/Show_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/Show_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/Speak_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/Speak_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/EncodedSyncPData_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/EncodedSyncPData_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/SubscribeButton_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/SubscribeButton_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/UnsubscribeButton_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/UnsubscribeButton_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/GenericResponse_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/OnHMIStatusMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/OnAppInterfaceUnregisteredMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/OnButtonEventMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/OnButtonPressMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/OnCommandMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/OnEncodedSyncPDataMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/OnTBTClientStateMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V1/OnDriverDistractionMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-  class Marshaller
-  {
-  public:
-
-    enum Methods
-    {
-      METHOD_INVALID=-1,
-      METHOD_REGISTERAPPINTERFACE_REQUEST=0,
-      METHOD_REGISTERAPPINTERFACE_RESPONSE=1,
-      METHOD_UNREGISTERAPPINTERFACE_REQUEST=2,
-      METHOD_UNREGISTERAPPINTERFACE_RESPONSE=3,
-      METHOD_SETGLOBALPROPERTIES_REQUEST=4,
-      METHOD_SETGLOBALPROPERTIES_RESPONSE=5,
-      METHOD_RESETGLOBALPROPERTIES_REQUEST=6,
-      METHOD_RESETGLOBALPROPERTIES_RESPONSE=7,
-      METHOD_ADDCOMMAND_REQUEST=8,
-      METHOD_ADDCOMMAND_RESPONSE=9,
-      METHOD_DELETECOMMAND_REQUEST=10,
-      METHOD_DELETECOMMAND_RESPONSE=11,
-      METHOD_ADDSUBMENU_REQUEST=12,
-      METHOD_ADDSUBMENU_RESPONSE=13,
-      METHOD_DELETESUBMENU_REQUEST=14,
-      METHOD_DELETESUBMENU_RESPONSE=15,
-      METHOD_CREATEINTERACTIONCHOICESET_REQUEST=16,
-      METHOD_CREATEINTERACTIONCHOICESET_RESPONSE=17,
-      METHOD_PERFORMINTERACTION_REQUEST=18,
-      METHOD_PERFORMINTERACTION_RESPONSE=19,
-      METHOD_DELETEINTERACTIONCHOICESET_REQUEST=20,
-      METHOD_DELETEINTERACTIONCHOICESET_RESPONSE=21,
-      METHOD_ALERT_REQUEST=22,
-      METHOD_ALERT_RESPONSE=23,
-      METHOD_SHOW_REQUEST=24,
-      METHOD_SHOW_RESPONSE=25,
-      METHOD_SPEAK_REQUEST=26,
-      METHOD_SPEAK_RESPONSE=27,
-      METHOD_SETMEDIACLOCKTIMER_REQUEST=28,
-      METHOD_SETMEDIACLOCKTIMER_RESPONSE=29,
-      METHOD_ENCODEDSYNCPDATA_REQUEST=30,
-      METHOD_ENCODEDSYNCPDATA_RESPONSE=31,
-      METHOD_SUBSCRIBEBUTTON_REQUEST=32,
-      METHOD_SUBSCRIBEBUTTON_RESPONSE=33,
-      METHOD_UNSUBSCRIBEBUTTON_REQUEST=34,
-      METHOD_UNSUBSCRIBEBUTTON_RESPONSE=35,
-      METHOD_GENERICRESPONSE_RESPONSE=36,
-      METHOD_ONHMISTATUS=37,
-      METHOD_ONAPPINTERFACEUNREGISTERED=38,
-      METHOD_ONBUTTONEVENT=39,
-      METHOD_ONBUTTONPRESS=40,
-      METHOD_ONCOMMAND=41,
-      METHOD_ONENCODEDSYNCPDATA=42,
-      METHOD_ONTBTCLIENTSTATE=43,
-      METHOD_ONDRIVERDISTRACTION=44
-    };
-
-    Marshaller()					{}
-    ~Marshaller()					{}
-    
-  
-    static SDLRPCMessage* fromString(const std::string&);
-    static std::string toString(const SDLRPCMessage* msg);
-
-     static SDLRPCMessage* fromJSON(const Json::Value&);
-    static Json::Value toJSON(const SDLRPCMessage* msg);
-  
-  protected:
-   
-
-// RegisterAppInterface_request
-    static bool fromString(const std::string& str, RegisterAppInterface_request& res)
-    {
-      return mRegisterAppInterface_request.fromString(str, res);
-    }
-
-    static std::string toString(const RegisterAppInterface_request& res)
-    {
-      return mRegisterAppInterface_request.toString(res);
-    }
-
-// RegisterAppInterface_response
-    static bool fromString(const std::string& str, RegisterAppInterface_response& res)
-    {
-      return mRegisterAppInterface_response.fromString(str, res);
-    }
-
-    static std::string toString(const RegisterAppInterface_response& res)
-    {
-      return mRegisterAppInterface_response.toString(res);
-    }
-
-// UnregisterAppInterface_request
-    static bool fromString(const std::string& str, UnregisterAppInterface_request& res)
-    {
-      return mUnregisterAppInterface_request.fromString(str, res);
-    }
-
-    static std::string toString(const UnregisterAppInterface_request& res)
-    {
-      return mUnregisterAppInterface_request.toString(res);
-    }
-
-// UnregisterAppInterface_response
-    static bool fromString(const std::string& str, UnregisterAppInterface_response& res)
-    {
-      return mUnregisterAppInterface_response.fromString(str, res);
-    }
-
-    static std::string toString(const UnregisterAppInterface_response& res)
-    {
-      return mUnregisterAppInterface_response.toString(res);
-    }
-
-// SetGlobalProperties_request
-    static bool fromString(const std::string& str, SetGlobalProperties_request& res)
-    {
-      return mSetGlobalProperties_request.fromString(str, res);
-    }
-
-    static std::string toString(const SetGlobalProperties_request& res)
-    {
-      return mSetGlobalProperties_request.toString(res);
-    }
-
-// SetGlobalProperties_response
-    static bool fromString(const std::string& str, SetGlobalProperties_response& res)
-    {
-      return mSetGlobalProperties_response.fromString(str, res);
-    }
-
-    static std::string toString(const SetGlobalProperties_response& res)
-    {
-      return mSetGlobalProperties_response.toString(res);
-    }
-
-// ResetGlobalProperties_request
-    static bool fromString(const std::string& str, ResetGlobalProperties_request& res)
-    {
-      return mResetGlobalProperties_request.fromString(str, res);
-    }
-
-    static std::string toString(const ResetGlobalProperties_request& res)
-    {
-      return mResetGlobalProperties_request.toString(res);
-    }
-
-// ResetGlobalProperties_response
-    static bool fromString(const std::string& str, ResetGlobalProperties_response& res)
-    {
-      return mResetGlobalProperties_response.fromString(str, res);
-    }
-
-    static std::string toString(const ResetGlobalProperties_response& res)
-    {
-      return mResetGlobalProperties_response.toString(res);
-    }
-
-// AddCommand_request
-    static bool fromString(const std::string& str, AddCommand_request& res)
-    {
-      return mAddCommand_request.fromString(str, res);
-    }
-
-    static std::string toString(const AddCommand_request& res)
-    {
-      return mAddCommand_request.toString(res);
-    }
-
-// AddCommand_response
-    static bool fromString(const std::string& str, AddCommand_response& res)
-    {
-      return mAddCommand_response.fromString(str, res);
-    }
-
-    static std::string toString(const AddCommand_response& res)
-    {
-      return mAddCommand_response.toString(res);
-    }
-
-// DeleteCommand_request
-    static bool fromString(const std::string& str, DeleteCommand_request& res)
-    {
-      return mDeleteCommand_request.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteCommand_request& res)
-    {
-      return mDeleteCommand_request.toString(res);
-    }
-
-// DeleteCommand_response
-    static bool fromString(const std::string& str, DeleteCommand_response& res)
-    {
-      return mDeleteCommand_response.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteCommand_response& res)
-    {
-      return mDeleteCommand_response.toString(res);
-    }
-
-// AddSubMenu_request
-    static bool fromString(const std::string& str, AddSubMenu_request& res)
-    {
-      return mAddSubMenu_request.fromString(str, res);
-    }
-
-    static std::string toString(const AddSubMenu_request& res)
-    {
-      return mAddSubMenu_request.toString(res);
-    }
-
-// AddSubMenu_response
-    static bool fromString(const std::string& str, AddSubMenu_response& res)
-    {
-      return mAddSubMenu_response.fromString(str, res);
-    }
-
-    static std::string toString(const AddSubMenu_response& res)
-    {
-      return mAddSubMenu_response.toString(res);
-    }
-
-// DeleteSubMenu_request
-    static bool fromString(const std::string& str, DeleteSubMenu_request& res)
-    {
-      return mDeleteSubMenu_request.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteSubMenu_request& res)
-    {
-      return mDeleteSubMenu_request.toString(res);
-    }
-
-// DeleteSubMenu_response
-    static bool fromString(const std::string& str, DeleteSubMenu_response& res)
-    {
-      return mDeleteSubMenu_response.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteSubMenu_response& res)
-    {
-      return mDeleteSubMenu_response.toString(res);
-    }
-
-// CreateInteractionChoiceSet_request
-    static bool fromString(const std::string& str, CreateInteractionChoiceSet_request& res)
-    {
-      return mCreateInteractionChoiceSet_request.fromString(str, res);
-    }
-
-    static std::string toString(const CreateInteractionChoiceSet_request& res)
-    {
-      return mCreateInteractionChoiceSet_request.toString(res);
-    }
-
-// CreateInteractionChoiceSet_response
-    static bool fromString(const std::string& str, CreateInteractionChoiceSet_response& res)
-    {
-      return mCreateInteractionChoiceSet_response.fromString(str, res);
-    }
-
-    static std::string toString(const CreateInteractionChoiceSet_response& res)
-    {
-      return mCreateInteractionChoiceSet_response.toString(res);
-    }
-
-// PerformInteraction_request
-    static bool fromString(const std::string& str, PerformInteraction_request& res)
-    {
-      return mPerformInteraction_request.fromString(str, res);
-    }
-
-    static std::string toString(const PerformInteraction_request& res)
-    {
-      return mPerformInteraction_request.toString(res);
-    }
-
-// PerformInteraction_response
-    static bool fromString(const std::string& str, PerformInteraction_response& res)
-    {
-      return mPerformInteraction_response.fromString(str, res);
-    }
-
-    static std::string toString(const PerformInteraction_response& res)
-    {
-      return mPerformInteraction_response.toString(res);
-    }
-
-// DeleteInteractionChoiceSet_request
-    static bool fromString(const std::string& str, DeleteInteractionChoiceSet_request& res)
-    {
-      return mDeleteInteractionChoiceSet_request.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteInteractionChoiceSet_request& res)
-    {
-      return mDeleteInteractionChoiceSet_request.toString(res);
-    }
-
-// DeleteInteractionChoiceSet_response
-    static bool fromString(const std::string& str, DeleteInteractionChoiceSet_response& res)
-    {
-      return mDeleteInteractionChoiceSet_response.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteInteractionChoiceSet_response& res)
-    {
-      return mDeleteInteractionChoiceSet_response.toString(res);
-    }
-
-// Alert_request
-    static bool fromString(const std::string& str, Alert_request& res)
-    {
-      return mAlert_request.fromString(str, res);
-    }
-
-    static std::string toString(const Alert_request& res)
-    {
-      return mAlert_request.toString(res);
-    }
-
-// Alert_response
-    static bool fromString(const std::string& str, Alert_response& res)
-    {
-      return mAlert_response.fromString(str, res);
-    }
-
-    static std::string toString(const Alert_response& res)
-    {
-      return mAlert_response.toString(res);
-    }
-
-// Show_request
-    static bool fromString(const std::string& str, Show_request& res)
-    {
-      return mShow_request.fromString(str, res);
-    }
-
-    static std::string toString(const Show_request& res)
-    {
-      return mShow_request.toString(res);
-    }
-
-// Show_response
-    static bool fromString(const std::string& str, Show_response& res)
-    {
-      return mShow_response.fromString(str, res);
-    }
-
-    static std::string toString(const Show_response& res)
-    {
-      return mShow_response.toString(res);
-    }
-
-// Speak_request
-    static bool fromString(const std::string& str, Speak_request& res)
-    {
-      return mSpeak_request.fromString(str, res);
-    }
-
-    static std::string toString(const Speak_request& res)
-    {
-      return mSpeak_request.toString(res);
-    }
-
-// Speak_response
-    static bool fromString(const std::string& str, Speak_response& res)
-    {
-      return mSpeak_response.fromString(str, res);
-    }
-
-    static std::string toString(const Speak_response& res)
-    {
-      return mSpeak_response.toString(res);
-    }
-
-// SetMediaClockTimer_request
-    static bool fromString(const std::string& str, SetMediaClockTimer_request& res)
-    {
-      return mSetMediaClockTimer_request.fromString(str, res);
-    }
-
-    static std::string toString(const SetMediaClockTimer_request& res)
-    {
-      return mSetMediaClockTimer_request.toString(res);
-    }
-
-// SetMediaClockTimer_response
-    static bool fromString(const std::string& str, SetMediaClockTimer_response& res)
-    {
-      return mSetMediaClockTimer_response.fromString(str, res);
-    }
-
-    static std::string toString(const SetMediaClockTimer_response& res)
-    {
-      return mSetMediaClockTimer_response.toString(res);
-    }
-
-// EncodedSyncPData_request
-    static bool fromString(const std::string& str, EncodedSyncPData_request& res)
-    {
-      return mEncodedSyncPData_request.fromString(str, res);
-    }
-
-    static std::string toString(const EncodedSyncPData_request& res)
-    {
-      return mEncodedSyncPData_request.toString(res);
-    }
-
-// EncodedSyncPData_response
-    static bool fromString(const std::string& str, EncodedSyncPData_response& res)
-    {
-      return mEncodedSyncPData_response.fromString(str, res);
-    }
-
-    static std::string toString(const EncodedSyncPData_response& res)
-    {
-      return mEncodedSyncPData_response.toString(res);
-    }
-
-// SubscribeButton_request
-    static bool fromString(const std::string& str, SubscribeButton_request& res)
-    {
-      return mSubscribeButton_request.fromString(str, res);
-    }
-
-    static std::string toString(const SubscribeButton_request& res)
-    {
-      return mSubscribeButton_request.toString(res);
-    }
-
-// SubscribeButton_response
-    static bool fromString(const std::string& str, SubscribeButton_response& res)
-    {
-      return mSubscribeButton_response.fromString(str, res);
-    }
-
-    static std::string toString(const SubscribeButton_response& res)
-    {
-      return mSubscribeButton_response.toString(res);
-    }
-
-// UnsubscribeButton_request
-    static bool fromString(const std::string& str, UnsubscribeButton_request& res)
-    {
-      return mUnsubscribeButton_request.fromString(str, res);
-    }
-
-    static std::string toString(const UnsubscribeButton_request& res)
-    {
-      return mUnsubscribeButton_request.toString(res);
-    }
-
-// UnsubscribeButton_response
-    static bool fromString(const std::string& str, UnsubscribeButton_response& res)
-    {
-      return mUnsubscribeButton_response.fromString(str, res);
-    }
-
-    static std::string toString(const UnsubscribeButton_response& res)
-    {
-      return mUnsubscribeButton_response.toString(res);
-    }
-
-// GenericResponse_response
-    static bool fromString(const std::string& str, GenericResponse_response& res)
-    {
-      return mGenericResponse_response.fromString(str, res);
-    }
-
-    static std::string toString(const GenericResponse_response& res)
-    {
-      return mGenericResponse_response.toString(res);
-    }
-
-// OnHMIStatus
-    static bool fromString(const std::string& str, OnHMIStatus& res)
-    {
-      return mOnHMIStatus.fromString(str, res);
-    }
-
-    static std::string toString(const OnHMIStatus& res)
-    {
-      return mOnHMIStatus.toString(res);
-    }
-
-// OnAppInterfaceUnregistered
-    static bool fromString(const std::string& str, OnAppInterfaceUnregistered& res)
-    {
-      return mOnAppInterfaceUnregistered.fromString(str, res);
-    }
-
-    static std::string toString(const OnAppInterfaceUnregistered& res)
-    {
-      return mOnAppInterfaceUnregistered.toString(res);
-    }
-
-// OnButtonEvent
-    static bool fromString(const std::string& str, OnButtonEvent& res)
-    {
-      return mOnButtonEvent.fromString(str, res);
-    }
-
-    static std::string toString(const OnButtonEvent& res)
-    {
-      return mOnButtonEvent.toString(res);
-    }
-
-// OnButtonPress
-    static bool fromString(const std::string& str, OnButtonPress& res)
-    {
-      return mOnButtonPress.fromString(str, res);
-    }
-
-    static std::string toString(const OnButtonPress& res)
-    {
-      return mOnButtonPress.toString(res);
-    }
-
-// OnCommand
-    static bool fromString(const std::string& str, OnCommand& res)
-    {
-      return mOnCommand.fromString(str, res);
-    }
-
-    static std::string toString(const OnCommand& res)
-    {
-      return mOnCommand.toString(res);
-    }
-
-// OnEncodedSyncPData
-    static bool fromString(const std::string& str, OnEncodedSyncPData& res)
-    {
-      return mOnEncodedSyncPData.fromString(str, res);
-    }
-
-    static std::string toString(const OnEncodedSyncPData& res)
-    {
-      return mOnEncodedSyncPData.toString(res);
-    }
-
-// OnTBTClientState
-    static bool fromString(const std::string& str, OnTBTClientState& res)
-    {
-      return mOnTBTClientState.fromString(str, res);
-    }
-
-    static std::string toString(const OnTBTClientState& res)
-    {
-      return mOnTBTClientState.toString(res);
-    }
-
-// OnDriverDistraction
-    static bool fromString(const std::string& str, OnDriverDistraction& res)
-    {
-      return mOnDriverDistraction.fromString(str, res);
-    }
-
-    static std::string toString(const OnDriverDistraction& res)
-    {
-      return mOnDriverDistraction.toString(res);
-    }
-
-    struct localHash
-    {
-      const char *name;
-      unsigned int idx;
-      void* marshaller;					// Bingo!!!  old good plain C with direct casting!!!
-    };
-  
-  private:
-
-    static RegisterAppInterface_requestMarshaller mRegisterAppInterface_request;
-    static RegisterAppInterface_responseMarshaller mRegisterAppInterface_response;
-    static UnregisterAppInterface_requestMarshaller mUnregisterAppInterface_request;
-    static UnregisterAppInterface_responseMarshaller mUnregisterAppInterface_response;
-    static SetGlobalProperties_requestMarshaller mSetGlobalProperties_request;
-    static SetGlobalProperties_responseMarshaller mSetGlobalProperties_response;
-    static ResetGlobalProperties_requestMarshaller mResetGlobalProperties_request;
-    static ResetGlobalProperties_responseMarshaller mResetGlobalProperties_response;
-    static AddCommand_requestMarshaller mAddCommand_request;
-    static AddCommand_responseMarshaller mAddCommand_response;
-    static DeleteCommand_requestMarshaller mDeleteCommand_request;
-    static DeleteCommand_responseMarshaller mDeleteCommand_response;
-    static AddSubMenu_requestMarshaller mAddSubMenu_request;
-    static AddSubMenu_responseMarshaller mAddSubMenu_response;
-    static DeleteSubMenu_requestMarshaller mDeleteSubMenu_request;
-    static DeleteSubMenu_responseMarshaller mDeleteSubMenu_response;
-    static CreateInteractionChoiceSet_requestMarshaller mCreateInteractionChoiceSet_request;
-    static CreateInteractionChoiceSet_responseMarshaller mCreateInteractionChoiceSet_response;
-    static PerformInteraction_requestMarshaller mPerformInteraction_request;
-    static PerformInteraction_responseMarshaller mPerformInteraction_response;
-    static DeleteInteractionChoiceSet_requestMarshaller mDeleteInteractionChoiceSet_request;
-    static DeleteInteractionChoiceSet_responseMarshaller mDeleteInteractionChoiceSet_response;
-    static Alert_requestMarshaller mAlert_request;
-    static Alert_responseMarshaller mAlert_response;
-    static Show_requestMarshaller mShow_request;
-    static Show_responseMarshaller mShow_response;
-    static Speak_requestMarshaller mSpeak_request;
-    static Speak_responseMarshaller mSpeak_response;
-    static SetMediaClockTimer_requestMarshaller mSetMediaClockTimer_request;
-    static SetMediaClockTimer_responseMarshaller mSetMediaClockTimer_response;
-    static EncodedSyncPData_requestMarshaller mEncodedSyncPData_request;
-    static EncodedSyncPData_responseMarshaller mEncodedSyncPData_response;
-    static SubscribeButton_requestMarshaller mSubscribeButton_request;
-    static SubscribeButton_responseMarshaller mSubscribeButton_response;
-    static UnsubscribeButton_requestMarshaller mUnsubscribeButton_request;
-    static UnsubscribeButton_responseMarshaller mUnsubscribeButton_response;
-    static GenericResponse_responseMarshaller mGenericResponse_response;
-    static OnHMIStatusMarshaller mOnHMIStatus;
-    static OnAppInterfaceUnregisteredMarshaller mOnAppInterfaceUnregistered;
-    static OnButtonEventMarshaller mOnButtonEvent;
-    static OnButtonPressMarshaller mOnButtonPress;
-    static OnCommandMarshaller mOnCommand;
-    static OnEncodedSyncPDataMarshaller mOnEncodedSyncPData;
-    static OnTBTClientStateMarshaller mOnTBTClientState;
-    static OnDriverDistractionMarshaller mOnDriverDistraction;
-
-    static const char* getName(Methods e)
-    {
-       return (e>=0 && e<45) ? mHashTable[e].name : NULL;
-    }
-     
-    static const Methods getIndex(const char* s);
-  
-    static const localHash mHashTable[45];
-    
-    friend class Marshaller_intHash;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/MediaClockFormat.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/MediaClockFormat.h
deleted file mode 100644
index 96ae8668d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/MediaClockFormat.h
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_MEDIACLOCKFORMAT_INCLUDE
-#define NSSMARTDEVICELINKKRPC_MEDIACLOCKFORMAT_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  class MediaClockFormat
-  {
-  public:
-    enum MediaClockFormatInternal
-    {
-      INVALID_ENUM=-1,
-
-/**
-     minutesFieldWidth = 2;minutesFieldMax = 19;secondsFieldWidth = 2;secondsFieldMax = 99;maxHours = 19;maxMinutes = 59;maxSeconds = 59;
-     used for Type II and CID headunits
-*/
-      CLOCK1=0,
-
-/**
-     minutesFieldWidth = 3;minutesFieldMax = 199;secondsFieldWidth = 2;secondsFieldMax = 99;maxHours = 59;maxMinutes = 59;maxSeconds = 59;
-     used for Type V headunit
-*/
-      CLOCK2=1,
-
-/**
-     5 characters possible
-     Format:      1|sp   c   :|sp   c   c
-     1|sp : digit "1" or space
-     c    : character out of following character set: sp|0-9|[letters, see TypeII column in XLS. See [@TODO: create file ref]]
-     :|sp : colon or space
-     used for Type II headunit
-*/
-      CLOCKTEXT1=2,
-
-/**
-     5 chars possible
-     Format:      1|sp   c   :|sp   c   c
-     1|sp : digit "1" or space
-     c    : character out of following character set: sp|0-9|[letters, see CID column in XLS. See [@TODO: create file ref]]
-     :|sp : colon or space
-     used for CID headunit
-     NOTE: difference between CLOCKTEXT1 and CLOCKTEXT2 is the supported character set
-*/
-      CLOCKTEXT2=3,
-
-/**
-     6 chars possible
-     Format:      1|sp   c   c   :|sp   c   c
-     1|sp : digit "1" or space
-     c    : character out of following character set: sp|0-9|[letters, see Type 5 column in XLS]. See [@TODO: create file ref]
-     :|sp : colon or space
-     used for Type V headunit
-*/
-      CLOCKTEXT3=4
-    };
-  
-    MediaClockFormat() : mInternal(INVALID_ENUM)				{}
-    MediaClockFormat(MediaClockFormatInternal e) : mInternal(e)		{}
-  
-    MediaClockFormatInternal get(void) const	{ return mInternal; }
-    void set(MediaClockFormatInternal e)		{ mInternal=e; }
-  
-  private:
-    MediaClockFormatInternal mInternal;
-    friend class MediaClockFormatMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/MenuParams.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/MenuParams.h
deleted file mode 100644
index dea4c0bc8..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/MenuParams.h
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_MENUPARAMS_INCLUDE
-#define NSSMARTDEVICELINKKRPC_MENUPARAMS_INCLUDE
-
-#include <string>
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  class MenuParams
-  {
-  public:
-  
-    MenuParams(const MenuParams& c);
-    MenuParams(void);
-  
-    bool checkIntegrity(void);
-  
-    ~MenuParams(void);
-    MenuParams& operator =(const MenuParams&);
-
-// getters
-
-    const std::string& get_menuName(void) const;
-    const unsigned int* get_parentID(void) const;
-    const unsigned int* get_position(void) const;
-
-// setters
-
-    bool set_menuName(const std::string& menuName_);
-    void reset_parentID(void);
-    bool set_parentID(unsigned int parentID_);
-    void reset_position(void);
-    bool set_position(unsigned int position_);
-
-  private:
-
-    friend class MenuParamsMarshaller;
-
-
-///  Text to show in the menu for this sub menu.
-      std::string menuName;	//!< (500)
-
-/**
-     unique ID of the sub menu, the command will be added to.
-     If not provided, it will be provided to the top level of the in application menu.
-*/
-      unsigned int* parentID;	//!<  (0,2000000000)
-
-/**
-     Position within the items that are are at top level of the in application menu.
-     0 will insert at the front.
-     1 will insert at the second position.
-     if position is greater or equal than the number of items on top level, the sub menu will be appended to the end.
-     If this param was omitted the entry will be added at the end.
-*/
-      unsigned int* position;	//!<  (0,1000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnAppInterfaceUnregistered.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnAppInterfaceUnregistered.h
deleted file mode 100644
index d2228ff2f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnAppInterfaceUnregistered.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ONAPPINTERFACEUNREGISTERED_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ONAPPINTERFACEUNREGISTERED_INCLUDE
-
-
-#include "AppInterfaceUnregisteredReason.h"
-#include "JSONHandler/SDLRPCNotification.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  class OnAppInterfaceUnregistered : public SDLRPCNotification
-  {
-  public:
-  
-    OnAppInterfaceUnregistered(const OnAppInterfaceUnregistered& c);
-    OnAppInterfaceUnregistered(void);
-    
-    virtual ~OnAppInterfaceUnregistered(void);
-  
-    bool checkIntegrity(void);
-
-    const AppInterfaceUnregisteredReason& get_reason(void) const;
-
-    bool set_reason(const AppInterfaceUnregisteredReason& reason_);
-
-  private:
-  
-    friend class OnAppInterfaceUnregisteredMarshaller;
-
-
-///  See AppInterfaceUnregisteredReason
-      AppInterfaceUnregisteredReason reason;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnButtonEvent.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnButtonEvent.h
deleted file mode 100644
index 8e96d75e6..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnButtonEvent.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ONBUTTONEVENT_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ONBUTTONEVENT_INCLUDE
-
-
-#include "ButtonEventMode.h"
-#include "ButtonName.h"
-#include "JSONHandler/SDLRPCNotification.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Notifies application of UP/DOWN events for buttons to which the application is subscribed.
-
-  class OnButtonEvent : public SDLRPCNotification
-  {
-  public:
-  
-    OnButtonEvent(const OnButtonEvent& c);
-    OnButtonEvent(void);
-    
-    virtual ~OnButtonEvent(void);
-  
-    bool checkIntegrity(void);
-
-    const ButtonName& get_buttonName(void) const;
-    const ButtonEventMode& get_buttonEventMode(void) const;
-
-    bool set_buttonName(const ButtonName& buttonName_);
-    bool set_buttonEventMode(const ButtonEventMode& buttonEventMode_);
-
-  private:
-  
-    friend class OnButtonEventMarshaller;
-
-      ButtonName buttonName;
-
-///  Indicates whether this is an UP or DOWN event.
-      ButtonEventMode buttonEventMode;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnButtonPress.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnButtonPress.h
deleted file mode 100644
index 8d6838493..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnButtonPress.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ONBUTTONPRESS_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ONBUTTONPRESS_INCLUDE
-
-
-#include "ButtonName.h"
-#include "ButtonPressMode.h"
-#include "JSONHandler/SDLRPCNotification.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Notifies application of LONG/SHORT press events for buttons to which the application is subscribed.
-
-  class OnButtonPress : public SDLRPCNotification
-  {
-  public:
-  
-    OnButtonPress(const OnButtonPress& c);
-    OnButtonPress(void);
-    
-    virtual ~OnButtonPress(void);
-  
-    bool checkIntegrity(void);
-
-    const ButtonName& get_buttonName(void) const;
-    const ButtonPressMode& get_buttonPressMode(void) const;
-
-    bool set_buttonName(const ButtonName& buttonName_);
-    bool set_buttonPressMode(const ButtonPressMode& buttonPressMode_);
-
-  private:
-  
-    friend class OnButtonPressMarshaller;
-
-      ButtonName buttonName;
-
-///  Indicates whether this is a LONG or SHORT button press event.
-      ButtonPressMode buttonPressMode;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnCommand.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnCommand.h
deleted file mode 100644
index e7be89195..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnCommand.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ONCOMMAND_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ONCOMMAND_INCLUDE
-
-
-#include "TriggerSource.h"
-#include "JSONHandler/SDLRPCNotification.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  class OnCommand : public SDLRPCNotification
-  {
-  public:
-  
-    OnCommand(const OnCommand& c);
-    OnCommand(void);
-    
-    virtual ~OnCommand(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_cmdID(void) const;
-    const TriggerSource& get_triggerSource(void) const;
-
-    bool set_cmdID(unsigned int cmdID_);
-    bool set_triggerSource(const TriggerSource& triggerSource_);
-
-  private:
-  
-    friend class OnCommandMarshaller;
-
-
-///  Command ID, which is related to a specific menu entry.
-      unsigned int cmdID;	//!<  (0,2000000000)
-
-///  See TriggerSource
-      TriggerSource triggerSource;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnDriverDistraction.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnDriverDistraction.h
deleted file mode 100644
index c01a8cb04..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnDriverDistraction.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ONDRIVERDISTRACTION_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ONDRIVERDISTRACTION_INCLUDE
-
-
-#include "DriverDistractionState.h"
-#include "JSONHandler/SDLRPCNotification.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Provides driver distraction state to mobile applications
-
-  class OnDriverDistraction : public SDLRPCNotification
-  {
-  public:
-  
-    OnDriverDistraction(const OnDriverDistraction& c);
-    OnDriverDistraction(void);
-    
-    virtual ~OnDriverDistraction(void);
-  
-    bool checkIntegrity(void);
-
-    const DriverDistractionState& get_state(void) const;
-
-    bool set_state(const DriverDistractionState& state_);
-
-  private:
-  
-    friend class OnDriverDistractionMarshaller;
-
-
-///  Current State of Driver Distraction
-      DriverDistractionState state;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnEncodedSyncPData.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnEncodedSyncPData.h
deleted file mode 100644
index f7a8e64f2..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnEncodedSyncPData.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ONENCODEDSYNCPDATA_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ONENCODEDSYNCPDATA_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "JSONHandler/SDLRPCNotification.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Callback including encoded data of any SyncP packets that SYNC needs to send back to the mobile device.
-
-  class OnEncodedSyncPData : public SDLRPCNotification
-  {
-  public:
-  
-    OnEncodedSyncPData(const OnEncodedSyncPData& c);
-    OnEncodedSyncPData(void);
-    
-    virtual ~OnEncodedSyncPData(void);
-  
-    OnEncodedSyncPData& operator =(const OnEncodedSyncPData&);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<std::string>* get_data(void) const;
-
-    void reset_data(void);
-    bool set_data(const std::vector<std::string>& data_);
-
-  private:
-  
-    friend class OnEncodedSyncPDataMarshaller;
-
-
-///  Contains base64 encoded string of SyncP packets.
-      std::vector<std::string>* data;	//!<   [%s..%s] (10000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnHMIStatus.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnHMIStatus.h
deleted file mode 100644
index 00c202b2d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnHMIStatus.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ONHMISTATUS_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ONHMISTATUS_INCLUDE
-
-
-#include "AudioStreamingState.h"
-#include "HMILevel.h"
-#include "SystemContext.h"
-#include "JSONHandler/SDLRPCNotification.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  class OnHMIStatus : public SDLRPCNotification
-  {
-  public:
-  
-    OnHMIStatus(const OnHMIStatus& c);
-    OnHMIStatus(void);
-    
-    virtual ~OnHMIStatus(void);
-  
-    bool checkIntegrity(void);
-
-    const HMILevel& get_hmiLevel(void) const;
-    const AudioStreamingState& get_audioStreamingState(void) const;
-    const SystemContext& get_systemContext(void) const;
-
-    bool set_hmiLevel(const HMILevel& hmiLevel_);
-    bool set_audioStreamingState(const AudioStreamingState& audioStreamingState_);
-    bool set_systemContext(const SystemContext& systemContext_);
-
-  private:
-  
-    friend class OnHMIStatusMarshaller;
-
-
-///  See HMILevel
-      HMILevel hmiLevel;
-
-///  See AudioStreamingState
-      AudioStreamingState audioStreamingState;
-
-///  See SystemContext
-      SystemContext systemContext;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnTBTClientState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnTBTClientState.h
deleted file mode 100644
index 8b1e98531..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/OnTBTClientState.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_ONTBTCLIENTSTATE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_ONTBTCLIENTSTATE_INCLUDE
-
-
-#include "TBTState.h"
-#include "JSONHandler/SDLRPCNotification.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Provides applications with notifications specific to the current TBT client status on the module
-
-  class OnTBTClientState : public SDLRPCNotification
-  {
-  public:
-  
-    OnTBTClientState(const OnTBTClientState& c);
-    OnTBTClientState(void);
-    
-    virtual ~OnTBTClientState(void);
-  
-    bool checkIntegrity(void);
-
-    const TBTState& get_state(void) const;
-
-    bool set_state(const TBTState& state_);
-
-  private:
-  
-    friend class OnTBTClientStateMarshaller;
-
-
-///  Current State of TBT client
-      TBTState state;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_request.h
deleted file mode 100644
index e7a9a294b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_request.h
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_PERFORMINTERACTION_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_PERFORMINTERACTION_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "InteractionMode.h"
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Triggers an interaction (e.g. "Permit GPS?" - Yes, no, Always Allow).
-
-  class PerformInteraction_request : public SDLRPCRequest
-  {
-  public:
-  
-    PerformInteraction_request(const PerformInteraction_request& c);
-    PerformInteraction_request(void);
-    
-    virtual ~PerformInteraction_request(void);
-  
-    PerformInteraction_request& operator =(const PerformInteraction_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_initialText(void) const;
-    const std::vector<TTSChunk>& get_initialPrompt(void) const;
-    const InteractionMode& get_interactionMode(void) const;
-    const std::vector<unsigned int>& get_interactionChoiceSetIDList(void) const;
-    const std::vector<TTSChunk>* get_helpPrompt(void) const;
-    const std::vector<TTSChunk>* get_timeoutPrompt(void) const;
-    const unsigned int* get_timeout(void) const;
-
-    bool set_initialText(const std::string& initialText_);
-    bool set_initialPrompt(const std::vector<TTSChunk>& initialPrompt_);
-    bool set_interactionMode(const InteractionMode& interactionMode_);
-    bool set_interactionChoiceSetIDList(const std::vector<unsigned int>& interactionChoiceSetIDList_);
-    void reset_helpPrompt(void);
-    bool set_helpPrompt(const std::vector<TTSChunk>& helpPrompt_);
-    void reset_timeoutPrompt(void);
-    bool set_timeoutPrompt(const std::vector<TTSChunk>& timeoutPrompt_);
-    void reset_timeout(void);
-    bool set_timeout(unsigned int timeout_);
-
-  private:
-  
-    friend class PerformInteraction_requestMarshaller;
-
-
-///  Text to be displayed first.
-      std::string initialText;	//!< (500)
-
-/**
-     This is the intial prompt spoken to the user at the start of an interaction
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk> initialPrompt;	//!<   [%s..%s] 
-
-///  See InteractionMode.
-      InteractionMode interactionMode;
-
-///  List of interaction choice set IDs to use with an interaction.
-      std::vector<unsigned int> interactionChoiceSetIDList;	//!<   [%s..%s]  (0,2000000000)
-
-/**
-     Help text. This is the spoken string when a user speaks "help" when the interaction is occuring.
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* helpPrompt;	//!<   [%s..%s] 
-
-/**
-     Timeout text. This text is spoken when a VR interaction times out.
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* timeoutPrompt;	//!<   [%s..%s] 
-
-/**
-     Timeout in milliseconds.
-     If omitted a standard value of 10000 milliseconds is used.
-*/
-      unsigned int* timeout;	//!<  (5000,100000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_response.h
deleted file mode 100644
index ae7c5eed8..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_response.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_PERFORMINTERACTION_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_PERFORMINTERACTION_RESPONSE_INCLUDE
-
-#include "TriggerSource.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class PerformInteraction_response : public SDLRPCResponse
-    {
-    public:
-        PerformInteraction_response(const PerformInteraction_response& c);
-        PerformInteraction_response(void);
-
-        virtual ~PerformInteraction_response(void);
-
-        PerformInteraction_response& operator =(const PerformInteraction_response&);
-
-        bool checkIntegrity(void);
-
-        const unsigned int* get_choiceID(void) const;
-        const TriggerSource* get_triggerSource(void) const;
-
-        void reset_choiceID(void);
-        bool set_choiceID(unsigned int choiceID_);
-        void reset_triggerSource(void);
-        bool set_triggerSource(const TriggerSource& triggerSource_);
-
-    private:
-        friend class PerformInteraction_responseMarshaller;
-
-        ///  ID of the choice that was selected in response to PerformInteraction.
-        unsigned int* choiceID;   //!<  (0,2000000000)
-
-        ///  See TriggerSource
-        TriggerSource* triggerSource;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/RPC.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/RPC.h
deleted file mode 100644
index 57f2a2cd9..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/RPC.h
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_RPC_INCLUDE
-#define NSSMARTDEVICELINKKRPC_RPC_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "AppInterfaceUnregisteredReason.h"
-#include "AudioCaptureQuality.h"
-#include "AudioStreamingState.h"
-#include "ButtonCapabilities.h"
-#include "ButtonEventMode.h"
-#include "ButtonName.h"
-#include "ButtonPressMode.h"
-#include "CharacterSet.h"
-#include "Choice.h"
-#include "DisplayCapabilities.h"
-#include "DisplayType.h"
-#include "DriverDistractionState.h"
-#include "GlobalProperty.h"
-#include "HMILevel.h"
-#include "HmiZoneCapabilities.h"
-#include "InteractionMode.h"
-#include "Language.h"
-#include "MediaClockFormat.h"
-#include "MenuParams.h"
-#include "Result.h"
-#include "SpeechCapabilities.h"
-#include "StartTime.h"
-#include "SyncMsgVersion.h"
-#include "SystemContext.h"
-#include "TBTState.h"
-#include "TTSChunk.h"
-#include "TextAlignment.h"
-#include "TextField.h"
-#include "TextFieldName.h"
-#include "TriggerSource.h"
-#include "UpdateMode.h"
-#include "VrCapabilities.h"
-#include "RegisterAppInterface_request.h"
-#include "RegisterAppInterface_response.h"
-#include "UnregisterAppInterface_request.h"
-#include "UnregisterAppInterface_response.h"
-#include "SetGlobalProperties_request.h"
-#include "SetGlobalProperties_response.h"
-#include "ResetGlobalProperties_request.h"
-#include "ResetGlobalProperties_response.h"
-#include "AddCommand_request.h"
-#include "AddCommand_response.h"
-#include "DeleteCommand_request.h"
-#include "DeleteCommand_response.h"
-#include "AddSubMenu_request.h"
-#include "AddSubMenu_response.h"
-#include "DeleteSubMenu_request.h"
-#include "DeleteSubMenu_response.h"
-#include "CreateInteractionChoiceSet_request.h"
-#include "CreateInteractionChoiceSet_response.h"
-#include "PerformInteraction_request.h"
-#include "PerformInteraction_response.h"
-#include "DeleteInteractionChoiceSet_request.h"
-#include "DeleteInteractionChoiceSet_response.h"
-#include "Alert_request.h"
-#include "Alert_response.h"
-#include "Show_request.h"
-#include "Show_response.h"
-#include "Speak_request.h"
-#include "Speak_response.h"
-#include "SetMediaClockTimer_request.h"
-#include "SetMediaClockTimer_response.h"
-#include "EncodedSyncPData_request.h"
-#include "EncodedSyncPData_response.h"
-#include "SubscribeButton_request.h"
-#include "SubscribeButton_response.h"
-#include "UnsubscribeButton_request.h"
-#include "UnsubscribeButton_response.h"
-#include "GenericResponse_response.h"
-#include "OnHMIStatus.h"
-#include "OnAppInterfaceUnregistered.h"
-#include "OnButtonEvent.h"
-#include "OnButtonPress.h"
-#include "OnCommand.h"
-#include "OnEncodedSyncPData.h"
-#include "OnTBTClientState.h"
-#include "OnDriverDistraction.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_request.h
deleted file mode 100644
index 2d96f5b3b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_request.h
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_REGISTERAPPINTERFACE_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_REGISTERAPPINTERFACE_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "Language.h"
-#include "SyncMsgVersion.h"
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-/**
-     Establishes an interface with a mobile application.
-     Before registerAppInterface no other commands will be accepted/executed.
-*/
-
-  class RegisterAppInterface_request : public SDLRPCRequest
-  {
-  public:
-  
-    RegisterAppInterface_request(const RegisterAppInterface_request& c);
-    RegisterAppInterface_request(void);
-    
-    virtual ~RegisterAppInterface_request(void);
-  
-    RegisterAppInterface_request& operator =(const RegisterAppInterface_request&);
-  
-    bool checkIntegrity(void);
-
-    const SyncMsgVersion& get_syncMsgVersion(void) const;
-    const std::string& get_appName(void) const;
-    const std::string* get_ngnMediaScreenAppName(void) const;
-    const std::vector<std::string>* get_vrSynonyms(void) const;
-    const bool* get_usesVehicleData(void) const;
-    bool get_isMediaApplication(void) const;
-    const Language& get_languageDesired(void) const;
-    const std::string* get_autoActivateID(void) const;
-
-    bool set_syncMsgVersion(const SyncMsgVersion& syncMsgVersion_);
-    bool set_appName(const std::string& appName_);
-    void reset_ngnMediaScreenAppName(void);
-    bool set_ngnMediaScreenAppName(const std::string& ngnMediaScreenAppName_);
-    void reset_vrSynonyms(void);
-    bool set_vrSynonyms(const std::vector<std::string>& vrSynonyms_);
-    void reset_usesVehicleData(void);
-    bool set_usesVehicleData(bool usesVehicleData_);
-    bool set_isMediaApplication(bool isMediaApplication_);
-    bool set_languageDesired(const Language& languageDesired_);
-    void reset_autoActivateID(void);
-    bool set_autoActivateID(const std::string& autoActivateID_);
-
-  private:
-  
-    friend class RegisterAppInterface_requestMarshaller;
-
-
-///  See SyncMsgVersion
-      SyncMsgVersion syncMsgVersion;
-
-/**
-     The mobile application name, e.g. "Ford Drive Green".
-     Needs to be unique over all applications.
-     May not be empty.
-     May not start with a new line character.
-     May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)
-     Needs to be unique over all applications. Applications with the same name will be rejected.
-     Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.
-*/
-      std::string appName;	//!< (100)
-
-/**
-     Provides an abbreviated version of the app name (if needed), that will be displayed on the NGN media screen.
-     If not provided, the appName is used instead (and will be truncated if too long)
-     Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.
-*/
-      std::string* ngnMediaScreenAppName;	//!< (100)
-
-/**
-     Defines an additional voice recognition command.
-     May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)
-     Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.
-*/
-      std::vector<std::string>* vrSynonyms;	//!<   [%s..%s] (40)
-
-/**
-     If not provided, the default is equal to False"
-     Indicates if the mobile application wants to use vehicle data like GPS or speed.
-*/
-      bool* usesVehicleData;
-
-/**
-     Indicates if the application is a media or a non-media application.
-     Only media applications will be able to stream audio to Sync that is audible outside of the BT media source.
-*/
-      bool isMediaApplication;
-
-/**
-     See Language
-     If the language doesn't match the active language on Sync, it will be rejected.
-     If the language is changed, while an app is registered, it will get disconnected.
-*/
-      Language languageDesired;
-
-/**
-     Used to support auto activation after an initial successful registerAppInterface (for example after an ignition cycle).
-     The app should always provide the id that was provided by the most recent registerAppInterface response.
-     If this is the first call to registerAppInterface, then do not provide this parameter at all.
-     If not provided or not matching with the id of the last registerAppInterface response, the app will not be automatically put into foreground on startup.
-*/
-      std::string* autoActivateID;	//!< (16)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_response.h
deleted file mode 100644
index 7987777f3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_response.h
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_REGISTERAPPINTERFACE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_REGISTERAPPINTERFACE_RESPONSE_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "ButtonCapabilities.h"
-#include "DisplayCapabilities.h"
-#include "HmiZoneCapabilities.h"
-#include "Language.h"
-#include "SpeechCapabilities.h"
-#include "SyncMsgVersion.h"
-#include "VrCapabilities.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    ///  The response to registerAppInterface
-    class RegisterAppInterface_response : public SDLRPCResponse
-    {
-    public:
-        RegisterAppInterface_response(const RegisterAppInterface_response& c);
-        RegisterAppInterface_response(void);
-
-        virtual ~RegisterAppInterface_response(void);
-
-        RegisterAppInterface_response& operator =(const RegisterAppInterface_response&);
-
-        bool checkIntegrity(void);
-
-        const SyncMsgVersion* get_syncMsgVersion(void) const;
-        const std::string* get_autoActivateID(void) const;
-        const Language* get_language(void) const;
-        const DisplayCapabilities* get_displayCapabilities(void) const;
-        const std::vector<ButtonCapabilities>* get_buttonCapabilities(void) const;
-        const std::vector<HmiZoneCapabilities>* get_hmiZoneCapabilities(void) const;
-        const std::vector<SpeechCapabilities>* get_speechCapabilities(void) const;
-        const std::vector<VrCapabilities>* get_vrCapabilities(void) const;
-
-        void reset_syncMsgVersion(void);
-        bool set_syncMsgVersion(const SyncMsgVersion& syncMsgVersion_);
-        void reset_autoActivateID(void);
-        bool set_autoActivateID(const std::string& autoActivateID_);
-        void reset_language(void);
-        bool set_language(const Language& language_);
-        void reset_displayCapabilities(void);
-        bool set_displayCapabilities(const DisplayCapabilities& displayCapabilities_);
-        void reset_buttonCapabilities(void);
-        bool set_buttonCapabilities(const std::vector<ButtonCapabilities>& buttonCapabilities_);
-        void reset_hmiZoneCapabilities(void);
-        bool set_hmiZoneCapabilities(const std::vector<HmiZoneCapabilities>& hmiZoneCapabilities_);
-        void reset_speechCapabilities(void);
-        bool set_speechCapabilities(const std::vector<SpeechCapabilities>& speechCapabilities_);
-        void reset_vrCapabilities(void);
-        bool set_vrCapabilities(const std::vector<VrCapabilities>& vrCapabilities_);
-
-    private:
-        friend class RegisterAppInterface_responseMarshaller;
-
-        ///  See SyncMsgVersion
-        SyncMsgVersion* syncMsgVersion;
-
-        ///  Provides an id that the app may use on a subsequent registerAppInterface to
-        ///  allow for auto activation (for example after an ignition cycle).
-        std::string* autoActivateID;  //!< (16)
-
-        ///  The currently active language on Sync. See "Language" for options.
-        Language* language;
-
-        ///  See DisplayCapabilities
-        DisplayCapabilities* displayCapabilities;
-
-        ///  See ButtonCapabilities
-        std::vector<ButtonCapabilities>* buttonCapabilities;  //!<   [%s..%s]
-
-        ///  See HmiZoneCapabilities
-        std::vector<HmiZoneCapabilities>* hmiZoneCapabilities;    //!<   [%s..%s]
-
-        ///  See SpeechCapabilities
-        std::vector<SpeechCapabilities>* speechCapabilities;  //!<   [%s..%s]
-
-        ///  See VrCapabilities
-        std::vector<VrCapabilities>* vrCapabilities;  //!<   [%s..%s]
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_request.h
deleted file mode 100644
index aa8522b1a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_request.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_RESETGLOBALPROPERTIES_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_RESETGLOBALPROPERTIES_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "GlobalProperty.h"
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Allows resetting global properties.
-
-  class ResetGlobalProperties_request : public SDLRPCRequest
-  {
-  public:
-  
-    ResetGlobalProperties_request(const ResetGlobalProperties_request& c);
-    ResetGlobalProperties_request(void);
-    
-    virtual ~ResetGlobalProperties_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<GlobalProperty>& get_properties(void) const;
-
-    bool set_properties(const std::vector<GlobalProperty>& properties_);
-
-  private:
-  
-    friend class ResetGlobalProperties_requestMarshaller;
-
-
-///  Contains the names of all global properties (like timeoutPrompt) that should be unset. Resetting means, that they have the same value as at start up (default)
-      std::vector<GlobalProperty> properties;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_response.h
deleted file mode 100644
index 58915443b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_RESETGLOBALPROPERTIES_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_RESETGLOBALPROPERTIES_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class ResetGlobalProperties_response : public SDLRPCResponse
-    {
-    public:
-        ResetGlobalProperties_response(const ResetGlobalProperties_response& c);
-        ResetGlobalProperties_response(void);
-
-        virtual ~ResetGlobalProperties_response(void);
-
-        ResetGlobalProperties_response& operator =(const ResetGlobalProperties_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class ResetGlobalProperties_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Result.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Result.h
deleted file mode 100644
index 2dd1bbecc..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Result.h
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_RESULT_INCLUDE
-#define NSSMARTDEVICELINKKRPC_RESULT_INCLUDE
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class Result;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-    class Result
-    {
-    public:
-        enum ResultInternal
-        {
-            INVALID_ENUM = -1,
-
-            ///  The request succeeded
-            SUCCESS = 0,
-
-            /**
-                 The data sent is invalid. For example
-                 Invalid Json syntax
-                 Parameters out of bounds (number or enum range)
-                 Mandatory parameters not provided
-                 Parameter provided with wrong type
-                 Invalid characters
-                 Empty string
-            */
-            INVALID_DATA = 1,
-
-            ///  The request is not supported by Sync
-            UNSUPPORTED_REQUEST = 2,
-
-            ///  The system could not process the request because the necessary memory couldn't be allocated
-            OUT_OF_MEMORY = 3,
-
-            ///  There are too many requests pending (means, that the response has not been delivered, yet).
-            TOO_MANY_PENDING_REQUESTS = 4,
-
-            /**
-                 One of the provided IDs is not valid. For example
-                 This applies to CorrelationID, SubscriptionID [@TODO if SubscriptionID is used], CommandID, MenuID, [@TODO: missed one?]
-            */
-            INVALID_ID = 5,
-
-            ///  There was a conflict with an registered name (application or menu item) or vr command
-            DUPLICATE_NAME = 6,
-
-            ///  There are already too many registered applications
-            TOO_MANY_APPLICATIONS = 7,
-
-            ///  RegisterApplication has been called again, after a RegisterApplication was successful before.
-            APPLICATION_REGISTERED_ALREADY = 8,
-
-            ///  Sync doesn't support the protocol that is requested by the mobile application
-            UNSUPPORTED_VERSION = 9,
-
-            /**
-                 The requested language is currently not supported.
-                 Might be because of a mismatch of the currently active language on Sync and the requested language
-            */
-            WRONG_LANGUAGE = 10,
-
-            ///  An command can not be executed because no application has been registered with RegisterApplication.
-            APPLICATION_NOT_REGISTERED = 11,
-
-            /**
-                 The data may not be changed, because it is currently in use.
-                 For example when trying to delete a command set that is currently involved in an interaction.
-            */
-            IN_USE = 12,
-
-            ///  The item to subscribe to is already subscribed to.
-            SUBSCRIBED_ALREADY = 13,
-
-            /**
-                 The requested command was rejected, e.g. because mobile app is in background and cannot perform any HMI commands.
-                 Or an HMI command (e.g. Speak) is rejected because a higher priority HMI command (e.g. Alert) is playing.
-            */
-            REJECTED = 14,
-
-            /**
-                 A command was aborted, for example due to user interaction (e.g. user pressed button).
-                 Or an HMI command (e.g. Speak) is aborted because a higher priority HMI command (e.g. Alert) was requested.
-            */
-            ABORTED = 15,
-
-            /**
-                 A command was ignored, because the intended result is already in effect.
-                 For example, SetMediaClockTimer was used to pause the media clock although the clock is paused already.
-                 NOTE: potentially replaces SUBSCRIBED_ALREADY
-            */
-            IGNORED = 16,
-
-            /**
-                 A button that was requested for subscription is not supported under the current system.
-                 NOTE: could become a more generic UNSUPPORTED_RESOURCE by merging with VEHIVLE_DATA_NOT_AVAILABLE.
-            */
-            UNSUPPORTED_BUTTON = 17,
-
-            ///  A specified file could not be found on Sync.
-            FILE_NOT_FOUND = 18,
-
-            ///  Provided data is valid but something went wrong in the lower layers.
-            GENERIC_ERROR = 19
-        };
-
-        Result();
-        Result(ResultInternal e);
-        Result(const Result& result);
-
-        ResultInternal get(void) const;
-        void set(ResultInternal e);
-
-        // TODO(AK): remove this after new code generation
-        operator NsSmartDeviceLinkRPCV2::Result();
-        Result& operator= (const Result& result);
-
-    private:
-        ResultInternal mInternal;
-        friend class ResultMarshaller;
-    };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_request.h
deleted file mode 100644
index e519bd8d1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_request.h
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SETGLOBALPROPERTIES_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SETGLOBALPROPERTIES_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Allows setting global properties.
-
-  class SetGlobalProperties_request : public SDLRPCRequest
-  {
-  public:
-  
-    SetGlobalProperties_request(const SetGlobalProperties_request& c);
-    SetGlobalProperties_request(void);
-    
-    virtual ~SetGlobalProperties_request(void);
-  
-    SetGlobalProperties_request& operator =(const SetGlobalProperties_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<TTSChunk>* get_helpPrompt(void) const;
-    const std::vector<TTSChunk>* get_timeoutPrompt(void) const;
-
-    void reset_helpPrompt(void);
-    bool set_helpPrompt(const std::vector<TTSChunk>& helpPrompt_);
-    void reset_timeoutPrompt(void);
-    bool set_timeoutPrompt(const std::vector<TTSChunk>& timeoutPrompt_);
-
-  private:
-  
-    friend class SetGlobalProperties_requestMarshaller;
-
-
-/**
-     The help prompt.
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* helpPrompt;	//!<   [%s..%s] 
-
-/**
-     Help text for a wait timeout.
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* timeoutPrompt;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_response.h
deleted file mode 100644
index d38596c31..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SETGLOBALPROPERTIES_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SETGLOBALPROPERTIES_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class SetGlobalProperties_response : public SDLRPCResponse
-    {
-    public:
-        SetGlobalProperties_response(const SetGlobalProperties_response& c);
-        SetGlobalProperties_response(void);
-
-        virtual ~SetGlobalProperties_response(void);
-
-        SetGlobalProperties_response& operator =(const SetGlobalProperties_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SetGlobalProperties_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_request.h
deleted file mode 100644
index 7b7abca82..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_request.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SETMEDIACLOCKTIMER_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SETMEDIACLOCKTIMER_REQUEST_INCLUDE
-
-
-#include "StartTime.h"
-#include "UpdateMode.h"
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Sets the initial media clock value and automatic update method.
-
-  class SetMediaClockTimer_request : public SDLRPCRequest
-  {
-  public:
-  
-    SetMediaClockTimer_request(const SetMediaClockTimer_request& c);
-    SetMediaClockTimer_request(void);
-    
-    virtual ~SetMediaClockTimer_request(void);
-  
-    SetMediaClockTimer_request& operator =(const SetMediaClockTimer_request&);
-  
-    bool checkIntegrity(void);
-
-    const StartTime* get_startTime(void) const;
-    const UpdateMode& get_updateMode(void) const;
-
-    void reset_startTime(void);
-    bool set_startTime(const StartTime& startTime_);
-    bool set_updateMode(const UpdateMode& updateMode_);
-
-  private:
-  
-    friend class SetMediaClockTimer_requestMarshaller;
-
-
-/**
-     See StartTime
-     startTime must be provided for "run"
-     startTime will be ignored for "pause" and "resum"
-*/
-      StartTime* startTime;
-
-/**
-     Enumeration to control the media clock.
-     In case of pause or resume, the start time value is ignored and shall be left out.  For resume, the time continues with the same value as it was when paused.
-*/
-      UpdateMode updateMode;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_response.h
deleted file mode 100644
index 21829b3b7..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SETMEDIACLOCKTIMER_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SETMEDIACLOCKTIMER_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class SetMediaClockTimer_response : public SDLRPCResponse
-    {
-    public:
-        SetMediaClockTimer_response(const SetMediaClockTimer_response& c);
-        SetMediaClockTimer_response(void);
-
-        virtual ~SetMediaClockTimer_response(void);
-
-        SetMediaClockTimer_response& operator =(const SetMediaClockTimer_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SetMediaClockTimer_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Show_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Show_request.h
deleted file mode 100644
index 121cf9aab..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Show_request.h
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SHOW_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SHOW_REQUEST_INCLUDE
-
-#include <string>
-
-#include "TextAlignment.h"
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Updates the persistent display. Supported fields depend on display capabilities.
-
-  class Show_request : public SDLRPCRequest
-  {
-  public:
-  
-    Show_request(const Show_request& c);
-    Show_request(void);
-    
-    virtual ~Show_request(void);
-  
-    Show_request& operator =(const Show_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string* get_mainField1(void) const;
-    const std::string* get_mainField2(void) const;
-    const TextAlignment* get_alignment(void) const;
-    const std::string* get_statusBar(void) const;
-    const std::string* get_mediaClock(void) const;
-    const std::string* get_mediaTrack(void) const;
-
-    void reset_mainField1(void);
-    bool set_mainField1(const std::string& mainField1_);
-    void reset_mainField2(void);
-    bool set_mainField2(const std::string& mainField2_);
-    void reset_alignment(void);
-    bool set_alignment(const TextAlignment& alignment_);
-    void reset_statusBar(void);
-    bool set_statusBar(const std::string& statusBar_);
-    void reset_mediaClock(void);
-    bool set_mediaClock(const std::string& mediaClock_);
-    void reset_mediaTrack(void);
-    bool set_mediaTrack(const std::string& mediaTrack_);
-
-  private:
-  
-    friend class Show_requestMarshaller;
-
-
-/**
-     The text that should be displayed in a single or upper display line.
-     If this text is not set, the text of mainField1 stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mainField1;	//!< (500)
-
-/**
-     The text that should be displayed on the second dispay line.
-     If this text is not set, the text of mainField2 stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mainField2;	//!< (500)
-
-/**
-     Specifies how mainField1 and mainField2 texts should be aligned on display.
-     If omitted, texts will be centered
-*/
-      TextAlignment* alignment;
-
-///  Requires investigation regarding the nav display capabilities. Potentially lower lowerStatusBar, upperStatusBar, titleBar, etc.
-      std::string* statusBar;	//!< (500)
-
-/**
-     Text value for MediaClock field. Has to be properly formatted by Mobile App according to Sync capabilities.
-     If this text is set, any automatic media clock updates previously set with SetMediaClockTimer will be stopped.
-*/
-      std::string* mediaClock;	//!< (500)
-
-/**
-     The text that should be displayed in the track field.
-     This field is only valid for media applications on NGN type ACMs.
-     If this text is not set, the text of mediaTrack stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mediaTrack;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Show_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Show_response.h
deleted file mode 100644
index 0a53eaf6e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Show_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SHOW_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SHOW_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class Show_response : public SDLRPCResponse
-    {
-    public:
-        Show_response(const Show_response& c);
-        Show_response(void);
-
-        virtual ~Show_response(void);
-
-        Show_response& operator =(const Show_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class Show_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Speak_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Speak_request.h
deleted file mode 100644
index 6d8a928cd..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Speak_request.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SPEAK_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SPEAK_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Speaks a text.
-
-  class Speak_request : public SDLRPCRequest
-  {
-  public:
-  
-    Speak_request(const Speak_request& c);
-    Speak_request(void);
-    
-    virtual ~Speak_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<TTSChunk>& get_ttsChunks(void) const;
-
-    bool set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_);
-
-  private:
-  
-    friend class Speak_requestMarshaller;
-
-
-/**
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk> ttsChunks;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Speak_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Speak_response.h
deleted file mode 100644
index 046ab07cd..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/Speak_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SPEAK_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SPEAK_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class Speak_response : public SDLRPCResponse
-    {
-    public:
-        Speak_response(const Speak_response& c);
-        Speak_response(void);
-
-        virtual ~Speak_response(void);
-
-        Speak_response& operator =(const Speak_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class Speak_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SpeechCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SpeechCapabilities.h
deleted file mode 100644
index bf2e6e9dd..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SpeechCapabilities.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SPEECHCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SPEECHCAPABILITIES_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Contains information about the TTS capabilities.
-
-  class SpeechCapabilities
-  {
-  public:
-    enum SpeechCapabilitiesInternal
-    {
-      INVALID_ENUM=-1,
-      TEXT=0,
-      SAPI_PHONEMES=1,
-      LHPLUS_PHONEMES=2,
-      PRE_RECORDED=3,
-      SILENCE=4
-    };
-  
-    SpeechCapabilities() : mInternal(INVALID_ENUM)				{}
-    SpeechCapabilities(SpeechCapabilitiesInternal e) : mInternal(e)		{}
-  
-    SpeechCapabilitiesInternal get(void) const	{ return mInternal; }
-    void set(SpeechCapabilitiesInternal e)		{ mInternal=e; }
-  
-  private:
-    SpeechCapabilitiesInternal mInternal;
-    friend class SpeechCapabilitiesMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/StartTime.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/StartTime.h
deleted file mode 100644
index cad404060..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/StartTime.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_STARTTIME_INCLUDE
-#define NSSMARTDEVICELINKKRPC_STARTTIME_INCLUDE
-
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  class StartTime
-  {
-  public:
-  
-    StartTime(const StartTime& c);
-    StartTime(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    unsigned int get_hours(void) const;
-    unsigned int get_minutes(void) const;
-    unsigned int get_seconds(void) const;
-
-// setters
-
-    bool set_hours(unsigned int hours_);
-    bool set_minutes(unsigned int minutes_);
-    bool set_seconds(unsigned int seconds_);
-
-  private:
-
-    friend class StartTimeMarshaller;
-
-
-/**
-     The hour of the media clock.
-     Some radios only support a max of 19 hours. If out of range, it will be rejected.
-*/
-      unsigned int hours;	//!<  (0,59)
-      unsigned int minutes;	//!<  (0,59)
-      unsigned int seconds;	//!<  (0,59)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_request.h
deleted file mode 100644
index 0e2b0464c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_request.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SUBSCRIBEBUTTON_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SUBSCRIBEBUTTON_REQUEST_INCLUDE
-
-
-#include "ButtonName.h"
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-/**
-     Subscribes to built-in HMI buttons.
-     The application will be notified by the OnButtonEvent and OnButtonPress.
-     To unsubscribe the notifications, use unsubscribeButton.
-*/
-
-  class SubscribeButton_request : public SDLRPCRequest
-  {
-  public:
-  
-    SubscribeButton_request(const SubscribeButton_request& c);
-    SubscribeButton_request(void);
-    
-    virtual ~SubscribeButton_request(void);
-  
-    bool checkIntegrity(void);
-
-    const ButtonName& get_buttonName(void) const;
-
-    bool set_buttonName(const ButtonName& buttonName_);
-
-  private:
-  
-    friend class SubscribeButton_requestMarshaller;
-
-
-///  Name of the button to subscribe.
-      ButtonName buttonName;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_response.h
deleted file mode 100644
index 0fd7f7336..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SUBSCRIBEBUTTON_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SUBSCRIBEBUTTON_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class SubscribeButton_response : public SDLRPCResponse
-    {
-    public:
-        SubscribeButton_response(const SubscribeButton_response& c);
-        SubscribeButton_response(void);
-
-        virtual ~SubscribeButton_response(void);
-
-        SubscribeButton_response& operator =(const SubscribeButton_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SubscribeButton_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SyncMsgVersion.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SyncMsgVersion.h
deleted file mode 100644
index 6b0b9bdc7..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SyncMsgVersion.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SYNCMSGVERSION_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SYNCMSGVERSION_INCLUDE
-
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Specifies the version number of the SYNC V4 protocol, that is supported by the mobile application
-
-  class SyncMsgVersion
-  {
-  public:
-  
-    SyncMsgVersion(const SyncMsgVersion& c);
-    SyncMsgVersion(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    unsigned int get_majorVersion(void) const;
-    unsigned int get_minorVersion(void) const;
-
-// setters
-
-    bool set_majorVersion(unsigned int majorVersion_);
-    bool set_minorVersion(unsigned int minorVersion_);
-
-  private:
-
-    friend class SyncMsgVersionMarshaller;
-
-
-///  The major version indicates versions that is not-compatible to previous versions.
-      unsigned int majorVersion;	//!<  (1,1)
-
-///  The minor version indicates a change to a previous version that should still allow to be run on an older version (with limited functionality)
-      unsigned int minorVersion;	//!<  (0,1000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SystemContext.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SystemContext.h
deleted file mode 100644
index 7777667ba..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/SystemContext.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_SYSTEMCONTEXT_INCLUDE
-#define NSSMARTDEVICELINKKRPC_SYSTEMCONTEXT_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Enumeraction that describes possible contexts and app's HMI might be in.
-
-  class SystemContext
-  {
-  public:
-    enum SystemContextInternal
-    {
-      INVALID_ENUM=-1,
-      SYSCTXT_MAIN=0,
-      SYSCTXT_VRSESSION=1,
-      SYSCTXT_MENU=2
-    };
-  
-    SystemContext() : mInternal(INVALID_ENUM)				{}
-    SystemContext(SystemContextInternal e) : mInternal(e)		{}
-  
-    SystemContextInternal get(void) const	{ return mInternal; }
-    void set(SystemContextInternal e)		{ mInternal=e; }
-  
-  private:
-    SystemContextInternal mInternal;
-    friend class SystemContextMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TBTState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TBTState.h
deleted file mode 100644
index 50549bf7d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TBTState.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_TBTSTATE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_TBTSTATE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Enumeration that describes possible states of turn-by-turn module.
-
-  class TBTState
-  {
-  public:
-    enum TBTStateInternal
-    {
-      INVALID_ENUM=-1,
-      ROUTE_UPDATE_REQUEST=0,
-      ROUTE_ACCEPTED=1,
-      ROUTE_REFUSED=2,
-      ROUTE_CANCELLED=3
-    };
-  
-    TBTState() : mInternal(INVALID_ENUM)				{}
-    TBTState(TBTStateInternal e) : mInternal(e)		{}
-  
-    TBTStateInternal get(void) const	{ return mInternal; }
-    void set(TBTStateInternal e)		{ mInternal=e; }
-  
-  private:
-    TBTStateInternal mInternal;
-    friend class TBTStateMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TTSChunk.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TTSChunk.h
deleted file mode 100644
index 1addf3df5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TTSChunk.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_TTSCHUNK_INCLUDE
-#define NSSMARTDEVICELINKKRPC_TTSCHUNK_INCLUDE
-
-#include <string>
-
-#include "SpeechCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  A TTS chunk, that consists of the text/phonemes to speak and the type (like text or SAPI)
-
-  class TTSChunk
-  {
-  public:
-  
-    TTSChunk(const TTSChunk& c);
-    TTSChunk(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const std::string& get_text(void) const;
-    const SpeechCapabilities& get_type(void) const;
-
-// setters
-
-    bool set_text(const std::string& text_);
-    bool set_type(const SpeechCapabilities& type_);
-
-  private:
-
-    friend class TTSChunkMarshaller;
-
-
-/**
-     The text or phonemes to speak.
-     May not be empty.
-*/
-      std::string text;	//!< (500)
-
-///  Describes, whether it is text or a specific phoneme set. See SpeechCapabilities
-      SpeechCapabilities type;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TextAlignment.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TextAlignment.h
deleted file mode 100644
index 52f51d66f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TextAlignment.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_TEXTALIGNMENT_INCLUDE
-#define NSSMARTDEVICELINKKRPC_TEXTALIGNMENT_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  The list of possible alignments, left, right, or centered
-
-  class TextAlignment
-  {
-  public:
-    enum TextAlignmentInternal
-    {
-      INVALID_ENUM=-1,
-      LEFT_ALIGNED=0,
-      RIGHT_ALIGNED=1,
-      CENTERED=2
-    };
-  
-    TextAlignment() : mInternal(INVALID_ENUM)				{}
-    TextAlignment(TextAlignmentInternal e) : mInternal(e)		{}
-  
-    TextAlignmentInternal get(void) const	{ return mInternal; }
-    void set(TextAlignmentInternal e)		{ mInternal=e; }
-  
-  private:
-    TextAlignmentInternal mInternal;
-    friend class TextAlignmentMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TextField.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TextField.h
deleted file mode 100644
index 421f7af70..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TextField.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_TEXTFIELD_INCLUDE
-#define NSSMARTDEVICELINKKRPC_TEXTFIELD_INCLUDE
-
-
-#include "CharacterSet.h"
-#include "TextFieldName.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  class TextField
-  {
-  public:
-  
-    TextField(const TextField& c);
-    TextField(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const CharacterSet& get_characterSet(void) const;
-    const TextFieldName& get_name(void) const;
-    unsigned int get_rows(void) const;
-    unsigned int get_width(void) const;
-
-// setters
-
-    bool set_characterSet(const CharacterSet& characterSet_);
-    bool set_name(const TextFieldName& name_);
-    bool set_rows(unsigned int rows_);
-    bool set_width(unsigned int width_);
-
-  private:
-
-    friend class TextFieldMarshaller;
-
-
-///  The character set that is supported in this field. See CharacterSet.
-      CharacterSet characterSet;
-
-///  The name that identifies the field. See TextFieldName.
-      TextFieldName name;
-
-///  The number of rows of this field.
-      unsigned int rows;	//!<  (1,3)
-
-///  The number of characters in one row of this field.
-      unsigned int width;	//!<  (1,40)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TextFieldName.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TextFieldName.h
deleted file mode 100644
index b49c4bdde..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TextFieldName.h
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_TEXTFIELDNAME_INCLUDE
-#define NSSMARTDEVICELINKKRPC_TEXTFIELDNAME_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  class TextFieldName
-  {
-  public:
-    enum TextFieldNameInternal
-    {
-      INVALID_ENUM=-1,
-
-/**
-     The first line of the main field of persistent display
-     Applies to "Show"
-*/
-      mainField1=0,
-
-/**
-     The second line of the main field of persistent display
-     Applies to "Show"
-*/
-      mainField2=1,
-
-/**
-     The status bar on Nav
-     Applies to "Show"
-*/
-      statusBar=2,
-
-/**
-     Text value for MediaClock field. Has to be properly formatted by Mobile App according to Sync capabilities.
-     Applies to "Show"
-*/
-      mediaClock=3,
-
-/**
-     The track field of NGN type ACMs.
-     This field is only available for media applications.
-     Applies to "Show"
-*/
-      mediaTrack=4,
-
-/**
-     The first line of the alert text field
-     Applies to "Alert"
-*/
-      alertText1=5,
-
-/**
-     The second line of the alert text field
-     Applies to "Alert"
-*/
-      alertText2=6
-    };
-  
-    TextFieldName() : mInternal(INVALID_ENUM)				{}
-    TextFieldName(TextFieldNameInternal e) : mInternal(e)		{}
-  
-    TextFieldNameInternal get(void) const	{ return mInternal; }
-    void set(TextFieldNameInternal e)		{ mInternal=e; }
-  
-  private:
-    TextFieldNameInternal mInternal;
-    friend class TextFieldNameMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TriggerSource.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TriggerSource.h
deleted file mode 100644
index a90107570..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/TriggerSource.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_TRIGGERSOURCE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_TRIGGERSOURCE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Indicates the source from where the command was triggered.
-
-  class TriggerSource
-  {
-  public:
-    enum TriggerSourceInternal
-    {
-      INVALID_ENUM=-1,
-      TS_MENU=0,
-      TS_VR=1
-    };
-  
-    TriggerSource() : mInternal(INVALID_ENUM)				{}
-    TriggerSource(TriggerSourceInternal e) : mInternal(e)		{}
-  
-    TriggerSourceInternal get(void) const	{ return mInternal; }
-    void set(TriggerSourceInternal e)		{ mInternal=e; }
-  
-  private:
-    TriggerSourceInternal mInternal;
-    friend class TriggerSourceMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_request.h
deleted file mode 100644
index 4fba9f498..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_request.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_UNREGISTERAPPINTERFACE_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_UNREGISTERAPPINTERFACE_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-/**
-     Closes an interface from a mobile application.
-     After unregisterAppInterface, no commands other than registerAppInterface will be accepted/executed.
-     Will fail, if no registerAppInterface was completed successfully before.
-*/
-
-  class UnregisterAppInterface_request : public SDLRPCRequest
-  {
-  public:
-  
-    UnregisterAppInterface_request(const UnregisterAppInterface_request& c);
-    UnregisterAppInterface_request(void);
-    
-    virtual ~UnregisterAppInterface_request(void);
-  
-    bool checkIntegrity(void);
-
-
-
-  private:
-  
-    friend class UnregisterAppInterface_requestMarshaller;
-
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_response.h
deleted file mode 100644
index 2d2ebde54..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_UNREGISTERAPPINTERFACE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_UNREGISTERAPPINTERFACE_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class UnregisterAppInterface_response : public SDLRPCResponse
-    {
-    public:
-        UnregisterAppInterface_response(const UnregisterAppInterface_response& c);
-        UnregisterAppInterface_response(void);
-
-        virtual ~UnregisterAppInterface_response(void);
-
-        UnregisterAppInterface_response& operator =(const UnregisterAppInterface_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class UnregisterAppInterface_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_request.h
deleted file mode 100644
index 4c718d75a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_request.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_UNSUBSCRIBEBUTTON_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPC_UNSUBSCRIBEBUTTON_REQUEST_INCLUDE
-
-
-#include "ButtonName.h"
-#include "JSONHandler/SDLRPCRequest.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Unsubscribes from built-in HMI buttons.
-
-  class UnsubscribeButton_request : public SDLRPCRequest
-  {
-  public:
-  
-    UnsubscribeButton_request(const UnsubscribeButton_request& c);
-    UnsubscribeButton_request(void);
-    
-    virtual ~UnsubscribeButton_request(void);
-  
-    bool checkIntegrity(void);
-
-    const ButtonName& get_buttonName(void) const;
-
-    bool set_buttonName(const ButtonName& buttonName_);
-
-  private:
-  
-    friend class UnsubscribeButton_requestMarshaller;
-
-
-///  Name of the button to unsubscribe.
-      ButtonName buttonName;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_response.h
deleted file mode 100644
index 9b221371a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_UNSUBSCRIBEBUTTON_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_UNSUBSCRIBEBUTTON_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-    class UnsubscribeButton_response : public SDLRPCResponse
-    {
-    public:
-        UnsubscribeButton_response(const UnsubscribeButton_response& c);
-        UnsubscribeButton_response(void);
-
-        virtual ~UnsubscribeButton_response(void);
-
-        UnsubscribeButton_response& operator =(const UnsubscribeButton_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class UnsubscribeButton_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UpdateMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UpdateMode.h
deleted file mode 100644
index 8ee65d9a7..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/UpdateMode.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_UPDATEMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPC_UPDATEMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-/**
-     Describes how the media clock timer should behave on the platform
-     Starts the media clock timer counting upwards, as in time elapsed.
-     Starts the media clock timer counting downwards, as in time remaining.
-     Pauses the media clock timer
-     Resume the media clock timer
-*/
-
-  class UpdateMode
-  {
-  public:
-    enum UpdateModeInternal
-    {
-      INVALID_ENUM=-1,
-      COUNTUP=0,
-      COUNTDOWN=1,
-      PAUSE=2,
-      RESUME=3
-    };
-  
-    UpdateMode() : mInternal(INVALID_ENUM)				{}
-    UpdateMode(UpdateModeInternal e) : mInternal(e)		{}
-  
-    UpdateModeInternal get(void) const	{ return mInternal; }
-    void set(UpdateModeInternal e)		{ mInternal=e; }
-  
-  private:
-    UpdateModeInternal mInternal;
-    friend class UpdateModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/VrCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/VrCapabilities.h
deleted file mode 100644
index d4ebdd12f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V1/VrCapabilities.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPC_VRCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPC_VRCAPABILITIES_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-///  Contains information about the VR capabilities.
-
-  class VrCapabilities
-  {
-  public:
-    enum VrCapabilitiesInternal
-    {
-      INVALID_ENUM=-1,
-      Text=0
-    };
-  
-    VrCapabilities() : mInternal(INVALID_ENUM)				{}
-    VrCapabilities(VrCapabilitiesInternal e) : mInternal(e)		{}
-  
-    VrCapabilitiesInternal get(void) const	{ return mInternal; }
-    void set(VrCapabilitiesInternal e)		{ mInternal=e; }
-  
-  private:
-    VrCapabilitiesInternal mInternal;
-    friend class VrCapabilitiesMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h
deleted file mode 100644
index ed961bfdb..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ADDCOMMAND_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ADDCOMMAND_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "Image.h"
-#include "MenuParams.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Adds a command to the in application menu.
-     Either menuParams or vrCommands must be provided.
-*/
-
-  class AddCommand_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    AddCommand_request(const AddCommand_request& c);
-    AddCommand_request(void);
-    
-    virtual ~AddCommand_request(void);
-  
-    AddCommand_request& operator =(const AddCommand_request&);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_cmdID(void) const;
-    const MenuParams* get_menuParams(void) const;
-    const std::vector<std::string>* get_vrCommands(void) const;
-    const Image* get_cmdIcon(void) const;
-
-    bool set_cmdID(unsigned int cmdID_);
-    void reset_menuParams(void);
-    bool set_menuParams(const MenuParams& menuParams_);
-    void reset_vrCommands(void);
-    bool set_vrCommands(const std::vector<std::string>& vrCommands_);
-    void reset_cmdIcon(void);
-    bool set_cmdIcon(const Image& cmdIcon_);
-
-  private:
-  
-    friend class AddCommand_requestMarshaller;
-
-
-///  unique ID of the command to add.
-      unsigned int cmdID;	//!<  (0,2000000000)
-
-///  Optional sub value containing menu parameters
-      MenuParams* menuParams;
-
-/**
-     An array of strings to be used as VR synonyms for this command.
-     If this array is provided, it may not be empty.
-*/
-      std::vector<std::string>* vrCommands;	//!<   [%s..%s] (99)
-
-/**
-     Image struct determining whether static or dynamic icon.
-     If omitted on supported displays, no (or the default if applicable) icon shall be displayed.
-*/
-      Image* cmdIcon;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h
deleted file mode 100644
index 7742971f1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ADDCOMMAND_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ADDCOMMAND_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class AddCommand_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        AddCommand_response(const AddCommand_response& c);
-        AddCommand_response(void);
-
-        virtual ~AddCommand_response(void);
-
-        AddCommand_response& operator =(const AddCommand_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class AddCommand_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h
deleted file mode 100644
index 1b98b766f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ADDSUBMENU_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ADDSUBMENU_REQUEST_INCLUDE
-
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Adds a sub menu to the in-application menu.
-
-  class AddSubMenu_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    AddSubMenu_request(const AddSubMenu_request& c);
-    AddSubMenu_request(void);
-    
-    virtual ~AddSubMenu_request(void);
-  
-    AddSubMenu_request& operator =(const AddSubMenu_request&);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_menuID(void) const;
-    const unsigned int* get_position(void) const;
-    const std::string& get_menuName(void) const;
-
-    bool set_menuID(unsigned int menuID_);
-    void reset_position(void);
-    bool set_position(unsigned int position_);
-    bool set_menuName(const std::string& menuName_);
-
-  private:
-  
-    friend class AddSubMenu_requestMarshaller;
-
-
-///  unique ID of the sub menu to add.
-      unsigned int menuID;	//!<  (0,2000000000)
-
-/**
-     Position within the items that are are at top level of the in application menu.
-     0 will insert at the front.
-     1 will insert at the second position.
-     If position is greater or equal than the number of items on top level, the sub menu will be appended to the end.
-     Position of any submenu will always be located before the return and exit options
-     If this param was omitted the entry will be added at the end.
-*/
-      unsigned int* position;	//!<  (0,1000)
-
-///  Text to show in the menu for this sub menu.
-      std::string menuName;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h
deleted file mode 100644
index 9fae3f7e9..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ADDSUBMENU_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ADDSUBMENU_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class AddSubMenu_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        AddSubMenu_response(const AddSubMenu_response& c);
-        AddSubMenu_response(void);
-
-        virtual ~AddSubMenu_response(void);
-
-        AddSubMenu_response& operator =(const AddSubMenu_response&);
-
-        bool checkIntegrity(void);
-    private:
-        friend class AddSubMenu_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h
deleted file mode 100644
index b90a77f4c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ALERTMANEUVER_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ALERTMANEUVER_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "SoftButton.h"
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class AlertManeuver_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    AlertManeuver_request(const AlertManeuver_request& c);
-    AlertManeuver_request(void);
-    
-    virtual ~AlertManeuver_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<TTSChunk>& get_ttsChunks(void) const;
-    const std::vector<SoftButton>& get_softButtons(void) const;
-
-    bool set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_);
-    bool set_softButtons(const std::vector<SoftButton>& softButtons_);
-
-  private:
-  
-    friend class AlertManeuver_requestMarshaller;
-
-
-///  An array of text chunks of type TTSChunk. See TTSChunk
-      std::vector<TTSChunk> ttsChunks;	//!<   [%s..%s] 
-
-///  If omitted on supported displays, only the system defined "Close" SoftButton shall be displayed.
-      std::vector<SoftButton> softButtons;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h
deleted file mode 100644
index cbcfbecd6..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ALERTMANEUVER_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ALERTMANEUVER_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class AlertManeuver_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        AlertManeuver_response(const AlertManeuver_response& c);
-        AlertManeuver_response(void);
-
-        virtual ~AlertManeuver_response(void);
-
-        AlertManeuver_response& operator =(const AlertManeuver_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class AlertManeuver_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Alert_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Alert_request.h
deleted file mode 100644
index fe622c808..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Alert_request.h
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ALERT_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ALERT_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "SoftButton.h"
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Shows an alert which typically consists of text-to-speech message and text on the display. At least either alertText1, alertText2 or TTSChunks need to be provided.
-
-  class Alert_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    Alert_request(const Alert_request& c);
-    Alert_request(void);
-    
-    virtual ~Alert_request(void);
-  
-    Alert_request& operator =(const Alert_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string* get_alertText1(void) const;
-    const std::string* get_alertText2(void) const;
-    const std::string* get_alertText3(void) const;
-    const std::vector<TTSChunk>* get_ttsChunks(void) const;
-    const unsigned int* get_duration(void) const;
-    const bool* get_playTone(void) const;
-    const std::vector<SoftButton>* get_softButtons(void) const;
-
-    void reset_alertText1(void);
-    bool set_alertText1(const std::string& alertText1_);
-    void reset_alertText2(void);
-    bool set_alertText2(const std::string& alertText2_);
-    void reset_alertText3(void);
-    bool set_alertText3(const std::string& alertText3_);
-    void reset_ttsChunks(void);
-    bool set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_);
-    void reset_duration(void);
-    bool set_duration(unsigned int duration_);
-    void reset_playTone(void);
-    bool set_playTone(bool playTone_);
-    void reset_softButtons(void);
-    bool set_softButtons(const std::vector<SoftButton>& softButtons_);
-
-  private:
-  
-    friend class Alert_requestMarshaller;
-
-
-///  The first line of the alert text field
-      std::string* alertText1;	//!< (500)
-
-///  The second line of the alert text field
-      std::string* alertText2;	//!< (500)
-
-///  The optional third line of the alert text field
-      std::string* alertText3;	//!< (500)
-
-/**
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* ttsChunks;	//!<   [%s..%s] 
-
-/**
-     Timeout in milliseconds.
-     Typical timeouts are 3-5 seconds
-     If omitted, timeout is set to 5s.
-*/
-      unsigned int* duration;	//!<  (3000,10000)
-
-/**
-     Defines if tone should be played. Tone is played before TTS.
-     If omitted, no tone is played.
-*/
-      bool* playTone;
-
-/**
-     App defined SoftButtons.
-     If omitted on supported displays, the displayed alert shall not have any SoftButtons.
-*/
-      std::vector<SoftButton>* softButtons;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Alert_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Alert_response.h
deleted file mode 100644
index 4f21d4dd7..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Alert_response.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ALERT_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ALERT_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class Alert_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        Alert_response(const Alert_response& c);
-        Alert_response(void);
-
-        virtual ~Alert_response(void);
-
-        Alert_response& operator =(const Alert_response&);
-
-        bool checkIntegrity(void);
-
-        unsigned int get_tryAgainTime(void) const;
-        bool set_tryAgainTime(unsigned int tryAgainTime_);
-
-    private:
-        friend class Alert_responseMarshaller;
-
-        /**
-             Amount of time (in seconds) that an app must wait before resending an alert.
-             If provided, another system event or overlay currently has a higher priority than this alert.
-             An app must not send an alert without waiting at least the amount of time dictated.
-        */
-        unsigned int tryAgainTime;    //!<  (0,2000000000)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AppInterfaceUnregisteredReason.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AppInterfaceUnregisteredReason.h
deleted file mode 100644
index 2c41d2976..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AppInterfaceUnregisteredReason.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_APPINTERFACEUNREGISTEREDREASON_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_APPINTERFACEUNREGISTEREDREASON_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Error code, which comes from sync side.
-
-  class AppInterfaceUnregisteredReason
-  {
-  public:
-    enum AppInterfaceUnregisteredReasonInternal
-    {
-      INVALID_ENUM=-1,
-      USER_EXIT=0,
-      IGNITION_OFF=1,
-      BLUETOOTH_OFF=2,
-      USB_DISCONNECTED=3,
-      REQUEST_WHILE_IN_NONE_HMI_LEVEL=4,
-      TOO_MANY_REQUESTS=5,
-      DRIVER_DISTRACTION_VIOLATION=6,
-      LANGUAGE_CHANGE=7,
-      MASTER_RESET=8,
-      FACTORY_DEFAULTS=9,
-      APP_UNAUTHORIZED=10
-    };
-  
-    AppInterfaceUnregisteredReason() : mInternal(INVALID_ENUM)				{}
-    AppInterfaceUnregisteredReason(AppInterfaceUnregisteredReasonInternal e) : mInternal(e)		{}
-  
-    AppInterfaceUnregisteredReasonInternal get(void) const	{ return mInternal; }
-    void set(AppInterfaceUnregisteredReasonInternal e)		{ mInternal=e; }
-  
-  private:
-    AppInterfaceUnregisteredReasonInternal mInternal;
-    friend class AppInterfaceUnregisteredReasonMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AppType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AppType.h
deleted file mode 100644
index e2ad534fc..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AppType.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_APPTYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_APPTYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration listing possible app types.
-
-  class AppType
-  {
-  public:
-    enum AppTypeInternal
-    {
-      INVALID_ENUM=-1,
-      DEFAULT=0,
-      COMMUNICATION=1,
-      MEDIA=2,
-      MESSAGING=3,
-      NAVIGATION=4,
-      INFORMATION=5,
-      SOCIAL=6,
-      BACKGROUND_PROCESS=7,
-      TESTING=8,
-      SYSTEM=9
-    };
-  
-    AppType() : mInternal(INVALID_ENUM)				{}
-    AppType(AppTypeInternal e) : mInternal(e)		{}
-  
-    AppTypeInternal get(void) const	{ return mInternal; }
-    void set(AppTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    AppTypeInternal mInternal;
-    friend class AppTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioCaptureQuality.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioCaptureQuality.h
deleted file mode 100644
index d0f450b5a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioCaptureQuality.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_AUDIOCAPTUREQUALITY_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_AUDIOCAPTUREQUALITY_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Describes different quality options for PerformAudioPassThru.
-
-  class AudioCaptureQuality
-  {
-  public:
-    enum AudioCaptureQualityInternal
-    {
-      INVALID_ENUM=-1,
-      FIX_8_BIT=0,
-      FIX_16_BIT=1
-    };
-  
-    AudioCaptureQuality() : mInternal(INVALID_ENUM)				{}
-    AudioCaptureQuality(AudioCaptureQualityInternal e) : mInternal(e)		{}
-  
-    AudioCaptureQualityInternal get(void) const	{ return mInternal; }
-    void set(AudioCaptureQualityInternal e)		{ mInternal=e; }
-  
-  private:
-    AudioCaptureQualityInternal mInternal;
-    friend class AudioCaptureQualityMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioStreamingState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioStreamingState.h
deleted file mode 100644
index ea38725f8..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioStreamingState.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_AUDIOSTREAMINGSTATE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_AUDIOSTREAMINGSTATE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeraction that describes possible states of audio streaming.
-
-  class AudioStreamingState
-  {
-  public:
-    enum AudioStreamingStateInternal
-    {
-      INVALID_ENUM=-1,
-      AUDIBLE=0,
-      NOT_AUDIBLE=1,
-      ATTENUATED=2
-    };
-  
-    AudioStreamingState() : mInternal(INVALID_ENUM)				{}
-    AudioStreamingState(AudioStreamingStateInternal e) : mInternal(e)		{}
-  
-    AudioStreamingStateInternal get(void) const	{ return mInternal; }
-    void set(AudioStreamingStateInternal e)		{ mInternal=e; }
-  
-  private:
-    AudioStreamingStateInternal mInternal;
-    friend class AudioStreamingStateMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioType.h
deleted file mode 100644
index af491c9a2..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioType.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_AUDIOTYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_AUDIOTYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Describes different audio type options for PerformAudioPassThru.
-
-  class AudioType
-  {
-  public:
-    enum AudioTypeInternal
-    {
-      INVALID_ENUM=-1,
-      PCM=0
-    };
-  
-    AudioType() : mInternal(INVALID_ENUM)				{}
-    AudioType(AudioTypeInternal e) : mInternal(e)		{}
-  
-    AudioTypeInternal get(void) const	{ return mInternal; }
-    void set(AudioTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    AudioTypeInternal mInternal;
-    friend class AudioTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h
deleted file mode 100644
index b586a534f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_BUTTONCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_BUTTONCAPABILITIES_INCLUDE
-
-
-#include "ButtonName.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about a button's capabilities.
-
-  class ButtonCapabilities
-  {
-  public:
-  
-    ButtonCapabilities(const ButtonCapabilities& c);
-    ButtonCapabilities(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    bool get_longPressAvailable(void) const;
-    const ButtonName& get_name(void) const;
-    bool get_shortPressAvailable(void) const;
-    bool get_upDownAvailable(void) const;
-
-// setters
-
-    bool set_longPressAvailable(bool longPressAvailable_);
-    bool set_name(const ButtonName& name_);
-    bool set_shortPressAvailable(bool shortPressAvailable_);
-    bool set_upDownAvailable(bool upDownAvailable_);
-
-  private:
-
-    friend class ButtonCapabilitiesMarshaller;
-
-
-/**
-     The button supports a LONG press.
-     Whenever the button is pressed long, onButtonPressed( LONG) will be invoked.
-*/
-      bool longPressAvailable;
-
-///  The name of the button. See ButtonName.
-      ButtonName name;
-
-/**
-     The button supports a short press.
-     Whenever the button is pressed short, onButtonPressed( SHORT) will be invoked.
-*/
-      bool shortPressAvailable;
-
-/**
-     The button supports "button down" and "button up".
-     Whenever the button is pressed, onButtonEvent( DOWN) will be invoked.
-     Whenever the button is released, onButtonEvent( UP) will be invoked.
-*/
-      bool upDownAvailable;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonEventMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonEventMode.h
deleted file mode 100644
index 6be407921..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonEventMode.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_BUTTONEVENTMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_BUTTONEVENTMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class ButtonEventMode
-  {
-  public:
-    enum ButtonEventModeInternal
-    {
-      INVALID_ENUM=-1,
-
-///  A button has been released up
-      BUTTONUP=0,
-
-///  A button has been pressed down
-      BUTTONDOWN=1
-    };
-  
-    ButtonEventMode() : mInternal(INVALID_ENUM)				{}
-    ButtonEventMode(ButtonEventModeInternal e) : mInternal(e)		{}
-  
-    ButtonEventModeInternal get(void) const	{ return mInternal; }
-    void set(ButtonEventModeInternal e)		{ mInternal=e; }
-  
-  private:
-    ButtonEventModeInternal mInternal;
-    friend class ButtonEventModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonName.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonName.h
deleted file mode 100644
index 457a1fc43..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonName.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_BUTTONNAME_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_BUTTONNAME_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Defines the hard (physical) and soft (touchscreen) buttons available from SYNC
-
-  class ButtonName
-  {
-  public:
-    enum ButtonNameInternal
-    {
-      INVALID_ENUM=-1,
-      OK=0,
-      SEEKLEFT=1,
-      SEEKRIGHT=2,
-      TUNEUP=3,
-      TUNEDOWN=4,
-      PRESET_0=5,
-      PRESET_1=6,
-      PRESET_2=7,
-      PRESET_3=8,
-      PRESET_4=9,
-      PRESET_5=10,
-      PRESET_6=11,
-      PRESET_7=12,
-      PRESET_8=13,
-      PRESET_9=14,
-      CUSTOM_BUTTON=15
-    };
-  
-    ButtonName() : mInternal(INVALID_ENUM)				{}
-    ButtonName(ButtonNameInternal e) : mInternal(e)		{}
-  
-    ButtonNameInternal get(void) const	{ return mInternal; }
-    void set(ButtonNameInternal e)		{ mInternal=e; }
-  
-  private:
-    ButtonNameInternal mInternal;
-    friend class ButtonNameMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonPressMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonPressMode.h
deleted file mode 100644
index cbafb96b1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonPressMode.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_BUTTONPRESSMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_BUTTONPRESSMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class ButtonPressMode
-  {
-  public:
-    enum ButtonPressModeInternal
-    {
-      INVALID_ENUM=-1,
-
-/**
-     A button was released, after it was pressed for a long time
-     Actual timing is defined by Sync and may vary
-*/
-      LONG=0,
-
-/**
-     A button was released, after it was pressed for a short time
-     Actual timing is defined by Sync and may vary
-*/
-      SHORT=1
-    };
-  
-    ButtonPressMode() : mInternal(INVALID_ENUM)				{}
-    ButtonPressMode(ButtonPressModeInternal e) : mInternal(e)		{}
-  
-    ButtonPressModeInternal get(void) const	{ return mInternal; }
-    void set(ButtonPressModeInternal e)		{ mInternal=e; }
-  
-  private:
-    ButtonPressModeInternal mInternal;
-    friend class ButtonPressModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h
deleted file mode 100644
index 820e1bedc..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_CHANGEREGISTRATION_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_CHANGEREGISTRATION_REQUEST_INCLUDE
-
-
-#include "Language.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class ChangeRegistration_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    ChangeRegistration_request(const ChangeRegistration_request& c);
-    ChangeRegistration_request(void);
-    
-    virtual ~ChangeRegistration_request(void);
-  
-    bool checkIntegrity(void);
-
-    const Language& get_language(void) const;
-    const Language& get_hmiDisplayLanguage(void) const;
-
-    bool set_language(const Language& language_);
-    bool set_hmiDisplayLanguage(const Language& hmiDisplayLanguage_);
-
-  private:
-  
-    friend class ChangeRegistration_requestMarshaller;
-
-
-///  Requested SYNC voice engine (VR+TTS) language registration
-      Language language;
-
-///  Request display language registration
-      Language hmiDisplayLanguage;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h
deleted file mode 100644
index 42f2596fd..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_CHANGEREGISTRATION_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_CHANGEREGISTRATION_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class ChangeRegistration_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        ChangeRegistration_response(const ChangeRegistration_response& c);
-        ChangeRegistration_response(void);
-
-        virtual ~ChangeRegistration_response(void);
-
-        ChangeRegistration_response& operator =(const ChangeRegistration_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class ChangeRegistration_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CharacterSet.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CharacterSet.h
deleted file mode 100644
index 8d3f54424..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CharacterSet.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_CHARACTERSET_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_CHARACTERSET_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The list of potential character sets
-
-  class CharacterSet
-  {
-  public:
-    enum CharacterSetInternal
-    {
-      INVALID_ENUM=-1,
-
-///  See [@TODO: create file ref]
-      TYPE2SET=0,
-
-///  See [@TODO: create file ref]
-      TYPE5SET=1,
-
-///  See [@TODO: create file ref]
-      CID1SET=2,
-
-///  See [@TODO: create file ref]
-      CID2SET=3
-    };
-  
-    CharacterSet() : mInternal(INVALID_ENUM)				{}
-    CharacterSet(CharacterSetInternal e) : mInternal(e)		{}
-  
-    CharacterSetInternal get(void) const	{ return mInternal; }
-    void set(CharacterSetInternal e)		{ mInternal=e; }
-  
-  private:
-    CharacterSetInternal mInternal;
-    friend class CharacterSetMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Choice.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Choice.h
deleted file mode 100644
index cb3121398..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Choice.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_CHOICE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_CHOICE_INCLUDE
-
-#include <string>
-#include <vector>
-
-#include "Image.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  A choice is an option given to the user, which can be selected either by menu, or through voice recognition system.
-
-  class Choice
-  {
-  public:
-  
-    Choice(const Choice& c);
-    Choice(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    unsigned int get_choiceID(void) const;
-    const Image& get_image(void) const;
-    const std::string& get_menuName(void) const;
-    const std::vector<std::string>& get_vrCommands(void) const;
-
-// setters
-
-    bool set_choiceID(unsigned int choiceID_);
-    bool set_image(const Image& image_);
-    bool set_menuName(const std::string& menuName_);
-    bool set_vrCommands(const std::vector<std::string>& vrCommands_);
-
-  private:
-
-    friend class ChoiceMarshaller;
-
-      unsigned int choiceID;	//!<  (0,65535)
-      Image image;
-      std::string menuName;	//!< (500)
-      std::vector<std::string> vrCommands;	//!<   [%s..%s] (99)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CompassDirection.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CompassDirection.h
deleted file mode 100644
index f420da0fe..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CompassDirection.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_COMPASSDIRECTION_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_COMPASSDIRECTION_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The list of potential compass directions
-
-  class CompassDirection
-  {
-  public:
-    enum CompassDirectionInternal
-    {
-      INVALID_ENUM=-1,
-      NORTH=0,
-      NORTHWEST=1,
-      WEST=2,
-      SOUTHWEST=3,
-      SOUTH=4,
-      SOUTHEAST=5,
-      EAST=6,
-      NORTHEAST=7
-    };
-  
-    CompassDirection() : mInternal(INVALID_ENUM)				{}
-    CompassDirection(CompassDirectionInternal e) : mInternal(e)		{}
-  
-    CompassDirectionInternal get(void) const	{ return mInternal; }
-    void set(CompassDirectionInternal e)		{ mInternal=e; }
-  
-  private:
-    CompassDirectionInternal mInternal;
-    friend class CompassDirectionMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h
deleted file mode 100644
index 2a50bb47f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_CREATEINTERACTIONCHOICESET_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_CREATEINTERACTIONCHOICESET_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "Choice.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  creates interaction choice set to be used later by performInteraction
-
-  class CreateInteractionChoiceSet_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    CreateInteractionChoiceSet_request(const CreateInteractionChoiceSet_request& c);
-    CreateInteractionChoiceSet_request(void);
-    
-    virtual ~CreateInteractionChoiceSet_request(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_interactionChoiceSetID(void) const;
-    const std::vector<Choice>& get_choiceSet(void) const;
-
-    bool set_interactionChoiceSetID(unsigned int interactionChoiceSetID_);
-    bool set_choiceSet(const std::vector<Choice>& choiceSet_);
-
-  private:
-  
-    friend class CreateInteractionChoiceSet_requestMarshaller;
-
-
-///  Unique ID used for this interaction choice set.
-      unsigned int interactionChoiceSetID;	//!<  (0,2000000000)
-      std::vector<Choice> choiceSet;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h
deleted file mode 100644
index 0ff5edb1d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_CREATEINTERACTIONCHOICESET_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_CREATEINTERACTIONCHOICESET_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class CreateInteractionChoiceSet_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        CreateInteractionChoiceSet_response(const CreateInteractionChoiceSet_response& c);
-        CreateInteractionChoiceSet_response(void);
-
-        virtual ~CreateInteractionChoiceSet_response(void);
-
-        CreateInteractionChoiceSet_response& operator =(const CreateInteractionChoiceSet_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class CreateInteractionChoiceSet_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DTC.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DTC.h
deleted file mode 100644
index 6f9a6f84b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DTC.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DTC_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DTC_INCLUDE
-
-#include <string>
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class DTC
-  {
-  public:
-  
-    DTC(const DTC& c);
-    DTC(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const std::string& get_identifier(void) const;
-    const std::string& get_statusByte(void) const;
-
-// setters
-
-    bool set_identifier(const std::string& identifier_);
-    bool set_statusByte(const std::string& statusByte_);
-
-  private:
-
-    friend class DTCMarshaller;
-
-
-///  String containing hexadecimal identifier as well as other common names.
-      std::string identifier;	//!< (500)
-
-///  Hexadecimal byte string.
-      std::string statusByte;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeactivateReason.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeactivateReason.h
deleted file mode 100644
index 37e975ffb..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeactivateReason.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DEACTIVATEREASON_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DEACTIVATEREASON_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enum of reasons of user navigating from application used by HMI.
-
-  class DeactivateReason
-  {
-  public:
-    enum DeactivateReasonInternal
-    {
-      INVALID_ENUM=-1,
-
-///  Navigated to audio(radio, etc)
-      AUDIO=0,
-
-///  Navigated to make a call.
-      PHONECALL=1,
-
-///  Navigated to navigation screen.
-      NAVIGATIONMAP=2,
-
-///  Navigated to phone menu.
-      PHONEMENU=3,
-
-///  Navigated to settings menu.
-      SYNCSETTINGS=4,
-
-///  Other screens navigation apart from other mobile app.
-      GENERAL=5
-    };
-  
-    DeactivateReason() : mInternal(INVALID_ENUM)				{}
-    DeactivateReason(DeactivateReasonInternal e) : mInternal(e)		{}
-  
-    DeactivateReasonInternal get(void) const	{ return mInternal; }
-    void set(DeactivateReasonInternal e)		{ mInternal=e; }
-  
-  private:
-    DeactivateReasonInternal mInternal;
-    friend class DeactivateReasonMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h
deleted file mode 100644
index 78b64d36f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETECOMMAND_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETECOMMAND_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Deletes all commands from the in-application menu with the specified command id.
-
-  class DeleteCommand_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    DeleteCommand_request(const DeleteCommand_request& c);
-    DeleteCommand_request(void);
-    
-    virtual ~DeleteCommand_request(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_cmdID(void) const;
-
-    bool set_cmdID(unsigned int cmdID_);
-
-  private:
-  
-    friend class DeleteCommand_requestMarshaller;
-
-
-///  ID of the command(s) to delete.
-      unsigned int cmdID;	//!<  (0,2000000000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h
deleted file mode 100644
index ba703bac8..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETECOMMAND_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETECOMMAND_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class DeleteCommand_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        DeleteCommand_response(const DeleteCommand_response& c);
-        DeleteCommand_response(void);
-
-        virtual ~DeleteCommand_response(void);
-
-        DeleteCommand_response& operator =(const DeleteCommand_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class DeleteCommand_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h
deleted file mode 100644
index 3d5f55f57..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETEFILE_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETEFILE_REQUEST_INCLUDE
-
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Used to delete a file resident on the SYNC module in the app's local cache.
-     Not supported on first generation SYNC vehicles. 
-*/
-
-  class DeleteFile_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    DeleteFile_request(const DeleteFile_request& c);
-    DeleteFile_request(void);
-    
-    virtual ~DeleteFile_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_syncFileName(void) const;
-
-    bool set_syncFileName(const std::string& syncFileName_);
-
-  private:
-  
-    friend class DeleteFile_requestMarshaller;
-
-
-///  File reference name.
-      std::string syncFileName;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h
deleted file mode 100644
index 3cd08d818..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETEFILE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETEFILE_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    /**
-         Response is sent, when the file data was deleted (success case). Or when an error occured.
-         Not supported on First generation SYNC vehicles.
-    */
-    class DeleteFile_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        DeleteFile_response(const DeleteFile_response& c);
-        DeleteFile_response(void);
-
-        virtual ~DeleteFile_response(void);
-
-        DeleteFile_response& operator =(const DeleteFile_response&);
-
-        bool checkIntegrity(void);
-
-        unsigned int get_spaceAvailable(void) const;
-        bool set_spaceAvailable(unsigned int spaceAvailable_);
-
-    private:
-        friend class DeleteFile_responseMarshaller;
-
-        ///  Provides the total local space available on SYNC for the registered app.
-        unsigned int spaceAvailable;  //!<  (0,2000000000)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h
deleted file mode 100644
index a94379166..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETEINTERACTIONCHOICESET_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETEINTERACTIONCHOICESET_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Deletes interaction choice set that has been created with "CreateInteractionChoiceSet".
-     The interaction may only be deleted when not currently in use by a "performInteraction".
-*/
-
-  class DeleteInteractionChoiceSet_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    DeleteInteractionChoiceSet_request(const DeleteInteractionChoiceSet_request& c);
-    DeleteInteractionChoiceSet_request(void);
-    
-    virtual ~DeleteInteractionChoiceSet_request(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_interactionChoiceSetID(void) const;
-
-    bool set_interactionChoiceSetID(unsigned int interactionChoiceSetID_);
-
-  private:
-  
-    friend class DeleteInteractionChoiceSet_requestMarshaller;
-
-
-///  ID of the interaction choice set to delete.
-      unsigned int interactionChoiceSetID;	//!<  (0,2000000000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h
deleted file mode 100644
index 814b34139..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETEINTERACTIONCHOICESET_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETEINTERACTIONCHOICESET_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class DeleteInteractionChoiceSet_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        DeleteInteractionChoiceSet_response(const DeleteInteractionChoiceSet_response& c);
-        DeleteInteractionChoiceSet_response(void);
-
-        virtual ~DeleteInteractionChoiceSet_response(void);
-
-        DeleteInteractionChoiceSet_response& operator =(const DeleteInteractionChoiceSet_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class DeleteInteractionChoiceSet_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h
deleted file mode 100644
index 4cca49b0a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETESUBMENU_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETESUBMENU_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Deletes a submenu from the in-application menu.
-
-  class DeleteSubMenu_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    DeleteSubMenu_request(const DeleteSubMenu_request& c);
-    DeleteSubMenu_request(void);
-    
-    virtual ~DeleteSubMenu_request(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_menuID(void) const;
-
-    bool set_menuID(unsigned int menuID_);
-
-  private:
-  
-    friend class DeleteSubMenu_requestMarshaller;
-
-
-///  The "menuID" of the submenu to delete. (See addSubMenu.menuID)
-      unsigned int menuID;	//!<  (0,2000000000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h
deleted file mode 100644
index 585da435a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETESUBMENU_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETESUBMENU_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class DeleteSubMenu_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        DeleteSubMenu_response(const DeleteSubMenu_response& c);
-        DeleteSubMenu_response(void);
-
-        virtual ~DeleteSubMenu_response(void);
-
-        DeleteSubMenu_response& operator =(const DeleteSubMenu_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class DeleteSubMenu_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h
deleted file mode 100644
index 329369979..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DIALNUMBER_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DIALNUMBER_REQUEST_INCLUDE
-
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Dials a phone number and switches to phone application.
-
-  class DialNumber_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    DialNumber_request(const DialNumber_request& c);
-    DialNumber_request(void);
-    
-    virtual ~DialNumber_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_number(void) const;
-
-    bool set_number(const std::string& number_);
-
-  private:
-  
-    friend class DialNumber_requestMarshaller;
-
-
-///  Phone number is a string consisting of only the digits and "+", which can be up to 40 chars.
-      std::string number;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h
deleted file mode 100644
index 30f9756d4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DIALNUMBER_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DIALNUMBER_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class DialNumber_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        DialNumber_response(const DialNumber_response& c);
-        DialNumber_response(void);
-
-        virtual ~DialNumber_response(void);
-
-        DialNumber_response& operator =(const DialNumber_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class DialNumber_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Dimension.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Dimension.h
deleted file mode 100644
index 6780ae042..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Dimension.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DIMENSION_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DIMENSION_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The supported dimensions of the GPS
-
-  class Dimension
-  {
-  public:
-    enum DimensionInternal
-    {
-      INVALID_ENUM=-1,
-
-///  No GPS at all
-      NO_FIX=0,
-
-///  Longitude and lattitude
-      FIX_2D=1,
-
-///  Longitude and lattitude and altitude
-      FIX_3D=2
-    };
-  
-    Dimension() : mInternal(INVALID_ENUM)				{}
-    Dimension(DimensionInternal e) : mInternal(e)		{}
-  
-    DimensionInternal get(void) const	{ return mInternal; }
-    void set(DimensionInternal e)		{ mInternal=e; }
-  
-  private:
-    DimensionInternal mInternal;
-    friend class DimensionMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h
deleted file mode 100644
index 65864a766..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DISPLAYCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DISPLAYCAPABILITIES_INCLUDE
-
-#include <vector>
-
-#include "DisplayType.h"
-#include "MediaClockFormat.h"
-#include "TextField.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about the display capabilities.
-
-  class DisplayCapabilities
-  {
-  public:
-  
-    DisplayCapabilities(const DisplayCapabilities& c);
-    DisplayCapabilities(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const DisplayType& get_displayType(void) const;
-    const std::vector<MediaClockFormat>& get_mediaClockFormats(void) const;
-    const std::vector<TextField>& get_textFields(void) const;
-
-// setters
-
-    bool set_displayType(const DisplayType& displayType_);
-    bool set_mediaClockFormats(const std::vector<MediaClockFormat>& mediaClockFormats_);
-    bool set_textFields(const std::vector<TextField>& textFields_);
-
-  private:
-
-    friend class DisplayCapabilitiesMarshaller;
-
-
-///  The type of the display. See DisplayType
-      DisplayType displayType;
-
-///  A set of all supported formats of the media clock. See MediaClockFormat
-      std::vector<MediaClockFormat> mediaClockFormats;	//!<   [%s..%s] 
-
-///  A set of all fields that support text data. See TextField
-      std::vector<TextField> textFields;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DisplayType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DisplayType.h
deleted file mode 100644
index fd5578e8c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DisplayType.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DISPLAYTYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DISPLAYTYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  See DAES for further infos regarding the displays
-
-  class DisplayType
-  {
-  public:
-    enum DisplayTypeInternal
-    {
-      INVALID_ENUM=-1,
-      CID=0,
-      TYPE2=1,
-      TYPE5=2,
-      NGN=3,
-      GEN2_8_DMA=4,
-      GEN2_6_DMA=5,
-      MFD3=6,
-      MFD4=7,
-      MFD5=8
-    };
-  
-    DisplayType() : mInternal(INVALID_ENUM)				{}
-    DisplayType(DisplayTypeInternal e) : mInternal(e)		{}
-  
-    DisplayTypeInternal get(void) const	{ return mInternal; }
-    void set(DisplayTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    DisplayTypeInternal mInternal;
-    friend class DisplayTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DriverDistractionState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DriverDistractionState.h
deleted file mode 100644
index 6f399db6f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DriverDistractionState.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DRIVERDISTRACTIONSTATE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DRIVERDISTRACTIONSTATE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration that describes possible states of driver distraction.
-
-  class DriverDistractionState
-  {
-  public:
-    enum DriverDistractionStateInternal
-    {
-      INVALID_ENUM=-1,
-      DD_ON=0,
-      DD_OFF=1
-    };
-  
-    DriverDistractionState() : mInternal(INVALID_ENUM)				{}
-    DriverDistractionState(DriverDistractionStateInternal e) : mInternal(e)		{}
-  
-    DriverDistractionStateInternal get(void) const	{ return mInternal; }
-    void set(DriverDistractionStateInternal e)		{ mInternal=e; }
-  
-  private:
-    DriverDistractionStateInternal mInternal;
-    friend class DriverDistractionStateMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h
deleted file mode 100644
index 895e91505..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ENCODEDSYNCPDATA_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ENCODEDSYNCPDATA_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Allows encoded data in the form of SyncP packets to be sent to the SYNC module
-
-  class EncodedSyncPData_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    EncodedSyncPData_request(const EncodedSyncPData_request& c);
-    EncodedSyncPData_request(void);
-    
-    virtual ~EncodedSyncPData_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<std::string>& get_data(void) const;
-
-    bool set_data(const std::vector<std::string>& data_);
-
-  private:
-  
-    friend class EncodedSyncPData_requestMarshaller;
-
-
-///  Contains base64 encoded string of SyncP packets.
-      std::vector<std::string> data;	//!<   [%s..%s] (10000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h
deleted file mode 100644
index a305c30e9..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ENCODEDSYNCPDATA_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ENCODEDSYNCPDATA_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class EncodedSyncPData_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        EncodedSyncPData_response(const EncodedSyncPData_response& c);
-        EncodedSyncPData_response(void);
-
-        virtual ~EncodedSyncPData_response(void);
-
-        EncodedSyncPData_response& operator =(const EncodedSyncPData_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class EncodedSyncPData_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h
deleted file mode 100644
index 4c66659ef..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ENDAUDIOPASSTHRU_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ENDAUDIOPASSTHRU_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  When this request is invoked, the audio capture stops.
-
-  class EndAudioPassThru_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    EndAudioPassThru_request(const EndAudioPassThru_request& c);
-    EndAudioPassThru_request(void);
-    
-    virtual ~EndAudioPassThru_request(void);
-  
-    bool checkIntegrity(void);
-
-
-
-  private:
-  
-    friend class EndAudioPassThru_requestMarshaller;
-
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h
deleted file mode 100644
index 59cab5d4d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ENDAUDIOPASSTHRU_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ENDAUDIOPASSTHRU_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class EndAudioPassThru_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        EndAudioPassThru_response(const EndAudioPassThru_response& c);
-        EndAudioPassThru_response(void);
-
-        virtual ~EndAudioPassThru_response(void);
-
-        EndAudioPassThru_response& operator =(const EndAudioPassThru_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class EndAudioPassThru_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/FileType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/FileType.h
deleted file mode 100644
index c03a36273..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/FileType.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_FILETYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_FILETYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration listing possible file types.
-
-  class FileType
-  {
-  public:
-    enum FileTypeInternal
-    {
-      INVALID_ENUM=-1,
-      GRAPHIC_BMP=0,
-      GRAPHIC_JPEG=1,
-      GRAPHIC_PNG=2,
-      AUDIO_WAVE=3,
-      AUDIO_MP3=4
-    };
-  
-    FileType() : mInternal(INVALID_ENUM)				{}
-    FileType(FileTypeInternal e) : mInternal(e)		{}
-  
-    FileTypeInternal get(void) const	{ return mInternal; }
-    void set(FileTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    FileTypeInternal mInternal;
-    friend class FileTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/FunctionID.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/FunctionID.h
deleted file mode 100644
index c10a23942..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/FunctionID.h
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_FUNCTIONID_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_FUNCTIONID_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Enumeration linking function names with function IDs in WiPro protocol.
-     Assumes enumeration starts at value 0.
-*/
-
-  class FunctionID
-  {
-  public:
-    enum FunctionIDInternal
-    {
-      INVALID_ENUM=-1,
-      RESERVED=0,
-      RegisterAppInterfaceID=1,
-      UnregisterAppInterfaceID=2,
-      SetGlobalPropertiesID=3,
-      ResetGlobalPropertiesID=4,
-      AddCommandID=5,
-      DeleteCommandID=6,
-      AddSubMenuID=7,
-      DeleteSubMenuID=8,
-      CreateInteractionChoiceSetID=9,
-      PerformInteractionID=10,
-      DeleteInteractionChoiceSetID=11,
-      AlertID=12,
-      ShowID=13,
-      SpeakID=14,
-      SetMediaClockTimerID=15,
-      EncodedSyncPDataID=16,
-      DialNumberID=17,
-      PerformAudioPassThruID=18,
-      EndAudioPassThruID=19,
-      SubscribeButtonID=20,
-      UnsubscribeButtonID=21,
-      SubscribeVehicleDataID=22,
-      UnsubscribeVehicleDataID=23,
-      GetVehicleDataID=24,
-      ReadDIDID=25,
-      GetDTCsID=26,
-      ScrollableMessageID=27,
-      SliderID=28,
-      ShowConstantTBTID=29,
-      AlertManeuverID=30,
-      UpdateTurnListID=31,
-      ChangeRegistrationID=32,
-      GenericResponseID=33,
-      PutFileID=34,
-      DeleteFileID=35,
-      ListFilesID=36,
-      SetAppIconID=37,
-      SetDisplayLayoutID=38,
-      OnHMIStatusID=39,
-      OnAppInterfaceUnregisteredID=40,
-      OnButtonEventID=41,
-      OnButtonPressID=42,
-      OnVehicleDataID=43,
-      OnCommandID=44,
-      OnEncodedSyncPDataID=45,
-      OnTBTClientStateID=46,
-      OnDriverDistractionID=47,
-      OnPermissionsChangeID=48,
-      OnAudioPassThruID=49,
-      OnLanguageChangeID=50
-    };
-  
-    FunctionID() : mInternal(INVALID_ENUM)				{}
-    FunctionID(FunctionIDInternal e) : mInternal(e)		{}
-  
-    FunctionIDInternal get(void) const	{ return mInternal; }
-    void set(FunctionIDInternal e)		{ mInternal=e; }
-  
-  private:
-    FunctionIDInternal mInternal;
-    friend class FunctionIDMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GPSData.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GPSData.h
deleted file mode 100644
index 6540b05eb..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GPSData.h
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GPSDATA_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GPSDATA_INCLUDE
-
-
-#include "CompassDirection.h"
-#include "Dimension.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Struct with the GPS data.
-
-  class GPSData
-  {
-  public:
-  
-    GPSData(const GPSData& c);
-    GPSData(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    bool get_actual(void) const;
-    int get_altitude(void) const;
-    const CompassDirection& get_compassDirection(void) const;
-    const Dimension& get_dimension(void) const;
-    unsigned int get_hdop(void) const;
-    unsigned int get_heading(void) const;
-    int get_latitudeDegrees(void) const;
-    int get_longitudeDegrees(void) const;
-    unsigned int get_pdop(void) const;
-    unsigned int get_satellites(void) const;
-    unsigned int get_speed(void) const;
-    unsigned int get_utcDay(void) const;
-    unsigned int get_utcHours(void) const;
-    unsigned int get_utcMinutes(void) const;
-    unsigned int get_utcMonth(void) const;
-    unsigned int get_utcSeconds(void) const;
-    unsigned int get_utcYear(void) const;
-    unsigned int get_vdop(void) const;
-
-// setters
-
-    bool set_actual(bool actual_);
-    bool set_altitude(int altitude_);
-    bool set_compassDirection(const CompassDirection& compassDirection_);
-    bool set_dimension(const Dimension& dimension_);
-    bool set_hdop(unsigned int hdop_);
-    bool set_heading(unsigned int heading_);
-    bool set_latitudeDegrees(int latitudeDegrees_);
-    bool set_longitudeDegrees(int longitudeDegrees_);
-    bool set_pdop(unsigned int pdop_);
-    bool set_satellites(unsigned int satellites_);
-    bool set_speed(unsigned int speed_);
-    bool set_utcDay(unsigned int utcDay_);
-    bool set_utcHours(unsigned int utcHours_);
-    bool set_utcMinutes(unsigned int utcMinutes_);
-    bool set_utcMonth(unsigned int utcMonth_);
-    bool set_utcSeconds(unsigned int utcSeconds_);
-    bool set_utcYear(unsigned int utcYear_);
-    bool set_vdop(unsigned int vdop_);
-
-  private:
-
-    friend class GPSDataMarshaller;
-
-
-/**
-     True, if actual.
-     False, if infered.
-*/
-      bool actual;
-
-///  Altitude in meters
-      int altitude;	//!<  (-10000,10000)
-
-///  See CompassDirection.
-      CompassDirection compassDirection;
-
-///  See Dimension
-      Dimension dimension;
-
-///  HDOP.
-      unsigned int hdop;	//!<  (0,31)
-
-///  The heading. North is 0
-      unsigned int heading;	//!<  (0,360)
-      int latitudeDegrees;	//!<  (-1000000000,1000000000)
-      int longitudeDegrees;	//!<  (-1000000000,1000000000)
-
-///  PDOP.
-      unsigned int pdop;	//!<  (0,31)
-
-///  Number of satellites in view
-      unsigned int satellites;	//!<  (0,31)
-
-///  The speed in KPH
-      unsigned int speed;	//!<  (0,400)
-
-///  The current UTC day.
-      unsigned int utcDay;	//!<  (1,31)
-
-///  The current UTC hour.
-      unsigned int utcHours;	//!<  (0,23)
-
-///  The current UTC minute.
-      unsigned int utcMinutes;	//!<  (0,59)
-
-///  The current UTC month.
-      unsigned int utcMonth;	//!<  (1,12)
-
-///  The current UTC second.
-      unsigned int utcSeconds;	//!<  (0,59)
-
-///  The current UTC year.
-      unsigned int utcYear;	//!<  (2010,2100)
-
-///  VDOP.
-      unsigned int vdop;	//!<  (0,31)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h
deleted file mode 100644
index ed58236d2..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GENERICRESPONSE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GENERICRESPONSE_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    /**
-         Generic Response is sent, when the name of a received msg cannot be retrieved. Only used in case of an error.
-         Currently, only resultCode INVALID_DATA is used.
-    */
-    class GenericResponse_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        GenericResponse_response(const GenericResponse_response& c);
-        GenericResponse_response(void);
-
-        virtual ~GenericResponse_response(void);
-
-        GenericResponse_response& operator =(const GenericResponse_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class GenericResponse_responseMarshaller;
-    };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h
deleted file mode 100644
index 895dbc7b2..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GETDTCS_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GETDTCS_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Vehicle module diagnostic trouble code request.
-
-  class GetDTCs_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    GetDTCs_request(const GetDTCs_request& c);
-    GetDTCs_request(void);
-    
-    virtual ~GetDTCs_request(void);
-  
-    GetDTCs_request& operator =(const GetDTCs_request&);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_ecuName(void) const;
-    const bool* get_encrypted(void) const;
-
-    bool set_ecuName(unsigned int ecuName_);
-    void reset_encrypted(void);
-    bool set_encrypted(bool encrypted_);
-
-  private:
-  
-    friend class GetDTCs_requestMarshaller;
-
-
-///  Name of ECU.
-      unsigned int ecuName;	//!<  (0,65535)
-
-/**
-     If not provided, the default is equal to False"
-     Indicates if the DTC data requested should be returned as encrypted through an OnEncodedSYNCPData response.
-     If set to true, the data will return instead through OnEncodedSYNCPData and be passed through the proxy to the designated server URL.
-*/
-      bool* encrypted;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h
deleted file mode 100644
index 8034f82d5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GETDTCS_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GETDTCS_RESPONSE_INCLUDE
-
-#include <vector>
-
-#include "DTC.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class GetDTCs_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        GetDTCs_response(const GetDTCs_response& c);
-        GetDTCs_response(void);
-
-        virtual ~GetDTCs_response(void);
-
-        GetDTCs_response& operator =(const GetDTCs_response&);
-
-        bool checkIntegrity(void);
-
-        const std::vector<DTC>* get_dtcList(void) const;
-        void reset_dtcList(void);
-        bool set_dtcList(const std::vector<DTC>& dtcList_);
-
-    private:
-        friend class GetDTCs_responseMarshaller;
-
-        ///  Array of all reported DTCs on module.
-        std::vector<DTC>* dtcList;    //!<   [%s..%s]
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h
deleted file mode 100644
index e1d8598a5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GETVEHICLEDATA_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GETVEHICLEDATA_REQUEST_INCLUDE
-
-
-#include "VehicleDataType.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Non periodic vehicle data read request.
-
-  class GetVehicleData_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    GetVehicleData_request(const GetVehicleData_request& c);
-    GetVehicleData_request(void);
-    
-    virtual ~GetVehicleData_request(void);
-  
-    bool checkIntegrity(void);
-
-    const VehicleDataType& get_dataType(void) const;
-
-    bool set_dataType(const VehicleDataType& dataType_);
-
-  private:
-  
-    friend class GetVehicleData_requestMarshaller;
-
-
-///  Complex signals like "GPS" should not be transferred as separate notifications, but all together in one notification.
-      VehicleDataType dataType;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h
deleted file mode 100644
index 90a8747cf..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h
+++ /dev/null
@@ -1,193 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GETVEHICLEDATA_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GETVEHICLEDATA_RESPONSE_INCLUDE
-
-#include <string>
-
-#include "GPSData.h"
-#include "PRNDL.h"
-#include "TireStatus.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class GetVehicleData_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        GetVehicleData_response(const GetVehicleData_response& c);
-        GetVehicleData_response(void);
-
-        virtual ~GetVehicleData_response(void);
-
-        GetVehicleData_response& operator =(const GetVehicleData_response&);
-
-        bool checkIntegrity(void);
-
-        const GPSData* get_gps(void) const;
-        const float* get_speed(void) const;
-        const unsigned int* get_rpm(void) const;
-        const float* get_fuelLevel(void) const;
-        const float* get_avgFuelEconomy(void) const;
-        const float* get_batteryVoltage(void) const;
-        const float* get_externalTemperature(void) const;
-        const std::string* get_vin(void) const;
-        const PRNDL* get_prndl(void) const;
-        const TireStatus* get_tirePressure(void) const;
-        const float* get_batteryPackVoltage(void) const;
-        const float* get_batteryPackCurrent(void) const;
-        const int* get_batteryPackTemperature(void) const;
-        const int* get_engineTorque(void) const;
-        const unsigned int* get_odometer(void) const;
-        const unsigned int* get_tripOdometer(void) const;
-        const std::string* get_satRadioESN(void) const;
-
-        void reset_gps(void);
-        bool set_gps(const GPSData& gps_);
-        void reset_speed(void);
-        bool set_speed(float speed_);
-        void reset_rpm(void);
-        bool set_rpm(unsigned int rpm_);
-        void reset_fuelLevel(void);
-        bool set_fuelLevel(float fuelLevel_);
-        void reset_avgFuelEconomy(void);
-        bool set_avgFuelEconomy(float avgFuelEconomy_);
-        void reset_batteryVoltage(void);
-        bool set_batteryVoltage(float batteryVoltage_);
-        void reset_externalTemperature(void);
-        bool set_externalTemperature(float externalTemperature_);
-        void reset_vin(void);
-        bool set_vin(const std::string& vin_);
-        void reset_prndl(void);
-        bool set_prndl(const PRNDL& prndl_);
-        void reset_tirePressure(void);
-        bool set_tirePressure(const TireStatus& tirePressure_);
-        void reset_batteryPackVoltage(void);
-        bool set_batteryPackVoltage(float batteryPackVoltage_);
-        void reset_batteryPackCurrent(void);
-        bool set_batteryPackCurrent(float batteryPackCurrent_);
-        void reset_batteryPackTemperature(void);
-        bool set_batteryPackTemperature(int batteryPackTemperature_);
-        void reset_engineTorque(void);
-        bool set_engineTorque(int engineTorque_);
-        void reset_odometer(void);
-        bool set_odometer(unsigned int odometer_);
-        void reset_tripOdometer(void);
-        bool set_tripOdometer(unsigned int tripOdometer_);
-        void reset_satRadioESN(void);
-        bool set_satRadioESN(const std::string& satRadioESN_);
-
-    private:
-        friend class GetVehicleData_responseMarshaller;
-
-        /**
-             See GPSData
-             Subscribable
-        */
-        GPSData* gps;
-
-        /**
-             The vehicle speed in kilometers per hour
-             Subscribable
-        */
-        float* speed; //!<  (-100,500)
-
-        /**
-             The number of revolutions per minute of the engine
-             Subscribable
-        */
-        unsigned int* rpm;    //!<  (0,20000)
-
-        ///  The fuel level
-        float* fuelLevel; //!<  (0,100)
-
-        ///  The average fuel economy in litres/100km
-        float* avgFuelEconomy;    //!<  (0,7000)
-
-        ///  The voltage in Volts
-        float* batteryVoltage;    //!<  (0,26)
-
-        ///  The external temperature in degrees celsius.
-        float* externalTemperature;   //!<  (-40,100)
-
-        ///  Vehicle identification number.
-        std::string* vin; //!< (17)
-
-        /**
-             See PRNDL.
-             Subscribable
-        */
-        PRNDL* prndl;
-
-        /**
-             See TireStatus.
-             Subscribable
-        */
-        TireStatus* tirePressure;
-
-        ///  Battery pack voltage of hybrid and electrical vehicles in volts
-        float* batteryPackVoltage;    //!<  (-1000,1000)
-
-        ///  Battery current of hybrid and electrical vehicles in amperes
-        float* batteryPackCurrent;    //!<  (-1000,1000)
-
-        ///  Battery temperature of hybrid and electrical vehicles in degrees celsius
-        int* batteryPackTemperature;  //!<  (-50,250)
-
-        /**
-             Engine torque in Nm
-             Subscribable
-        */
-        int* engineTorque;    //!<  (-10000,55000)
-
-        ///  Odometer in km
-        unsigned int* odometer;   //!<  (0,2000000)
-
-        ///  Odometer of trip in km
-        unsigned int* tripOdometer;   //!<  (0,2000000)
-
-        ///  The hexadecimal ESN of the satellite radio (if supported).
-        std::string* satRadioESN; //!< (500)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GlobalProperty.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GlobalProperty.h
deleted file mode 100644
index 2d61c2105..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GlobalProperty.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GLOBALPROPERTY_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GLOBALPROPERTY_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The different global properties.
-
-  class GlobalProperty
-  {
-  public:
-    enum GlobalPropertyInternal
-    {
-      INVALID_ENUM=-1,
-
-///  The property helpPrompt of setGlobalProperties
-      HELPPROMPT=0,
-
-///  The property timeoutPrompt of setGlobalProperties
-      TIMEOUTPROMPT=1,
-
-///  The property vrHelpTitle of setGlobalProperties
-      VRHELPTITLE=2,
-
-///  The property array of vrHelp of setGlobalProperties
-      VRHELPITEMS=3
-    };
-  
-    GlobalProperty() : mInternal(INVALID_ENUM)				{}
-    GlobalProperty(GlobalPropertyInternal e) : mInternal(e)		{}
-  
-    GlobalPropertyInternal get(void) const	{ return mInternal; }
-    void set(GlobalPropertyInternal e)		{ mInternal=e; }
-  
-  private:
-    GlobalPropertyInternal mInternal;
-    friend class GlobalPropertyMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h
deleted file mode 100644
index 455d6eb19..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_HMIAPPLICATION_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_HMIAPPLICATION_INCLUDE
-
-#include <string>
-#include <vector>
-
-#include "AppType.h"
-#include "Language.h"
-#include "Language.h"
-#include "TTSChunk.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Data type containing information about application needed by HMI.
-
-  class HMIApplication
-  {
-  public:
-  
-    HMIApplication(const HMIApplication& c);
-    HMIApplication(void);
-  
-    bool checkIntegrity(void);
-  
-    ~HMIApplication(void);
-    HMIApplication& operator =(const HMIApplication&);
-
-// getters
-
-    int get_appId(void) const;
-    const std::string& get_appName(void) const;
-    const std::vector<AppType>* get_appType(void) const;
-    const std::string& get_deviceName(void) const;
-    const Language& get_hmiDisplayLanguageDesired(void) const;
-    const std::string* get_icon(void) const;
-    bool get_isMediaApplication(void) const;
-    const Language& get_languageDesired(void) const;
-    const std::string* get_ngnMediaScreenAppName(void) const;
-    const std::vector<TTSChunk>* get_ttsName(void) const;
-    const std::vector<std::string>* get_vrSynonyms(void) const;
-
-// setters
-
-    bool set_appId(int appId_);
-    bool set_appName(const std::string& appName_);
-    void reset_appType(void);
-    bool set_appType(const std::vector<AppType>& appType_);
-    bool set_deviceName(const std::string& deviceName_);
-    bool set_hmiDisplayLanguageDesired(const Language& hmiDisplayLanguageDesired_);
-    void reset_icon(void);
-    bool set_icon(const std::string& icon_);
-    bool set_isMediaApplication(bool isMediaApplication_);
-    bool set_languageDesired(const Language& languageDesired_);
-    void reset_ngnMediaScreenAppName(void);
-    bool set_ngnMediaScreenAppName(const std::string& ngnMediaScreenAppName_);
-    void reset_ttsName(void);
-    bool set_ttsName(const std::vector<TTSChunk>& ttsName_);
-    void reset_vrSynonyms(void);
-    bool set_vrSynonyms(const std::vector<std::string>& vrSynonyms_);
-
-  private:
-
-    friend class HMIApplicationMarshaller;
-
-      int appId;
-      std::string appName;	//!< (100)
-      std::vector<AppType>* appType;	//!<   [%s..%s] 
-      std::string deviceName;
-      Language hmiDisplayLanguageDesired;
-      std::string* icon;
-      bool isMediaApplication;
-      Language languageDesired;
-      std::string* ngnMediaScreenAppName;	//!< (100)
-      std::vector<TTSChunk>* ttsName;	//!<   [%s..%s] 
-      std::vector<std::string>* vrSynonyms;	//!<   [%s..%s] (40)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMILevel.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMILevel.h
deleted file mode 100644
index 1ce22f15e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMILevel.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_HMILEVEL_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_HMILEVEL_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeraction that describes current levels of HMI.
-
-  class HMILevel
-  {
-  public:
-    enum HMILevelInternal
-    {
-      INVALID_ENUM=-1,
-      HMI_FULL=0,
-      HMI_LIMITED=1,
-      HMI_BACKGROUND=2,
-      HMI_NONE=3
-    };
-  
-    HMILevel() : mInternal(INVALID_ENUM)				{}
-    HMILevel(HMILevelInternal e) : mInternal(e)		{}
-  
-    HMILevelInternal get(void) const	{ return mInternal; }
-    void set(HMILevelInternal e)		{ mInternal=e; }
-  
-  private:
-    HMILevelInternal mInternal;
-    friend class HMILevelMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMIPermissions.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMIPermissions.h
deleted file mode 100644
index 4726b4e9e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMIPermissions.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_HMIPERMISSIONS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_HMIPERMISSIONS_INCLUDE
-
-#include <vector>
-
-#include "HMILevel.h"
-#include "HMILevel.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class HMIPermissions
-  {
-  public:
-  
-    HMIPermissions(const HMIPermissions& c);
-    HMIPermissions(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const std::vector<HMILevel>& get_allowed(void) const;
-    const std::vector<HMILevel>& get_userDisallowed(void) const;
-
-// setters
-
-    bool set_allowed(const std::vector<HMILevel>& allowed_);
-    bool set_userDisallowed(const std::vector<HMILevel>& userDisallowed_);
-
-  private:
-
-    friend class HMIPermissionsMarshaller;
-
-
-///  A set of all HMI levels that are permitted for this given RPC.
-      std::vector<HMILevel> allowed;	//!<   [%s..%s] 
-
-///  A set of all HMI levels that are prohibited for this given RPC.
-      std::vector<HMILevel> userDisallowed;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HmiZoneCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HmiZoneCapabilities.h
deleted file mode 100644
index d297ba5ff..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HmiZoneCapabilities.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_HMIZONECAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_HMIZONECAPABILITIES_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Contains information about the HMI zone capabilities.
-     For future use.
-*/
-
-  class HmiZoneCapabilities
-  {
-  public:
-    enum HmiZoneCapabilitiesInternal
-    {
-      INVALID_ENUM=-1,
-      FRONT=0,
-      BACK=1
-    };
-  
-    HmiZoneCapabilities() : mInternal(INVALID_ENUM)				{}
-    HmiZoneCapabilities(HmiZoneCapabilitiesInternal e) : mInternal(e)		{}
-  
-    HmiZoneCapabilitiesInternal get(void) const	{ return mInternal; }
-    void set(HmiZoneCapabilitiesInternal e)		{ mInternal=e; }
-  
-  private:
-    HmiZoneCapabilitiesInternal mInternal;
-    friend class HmiZoneCapabilitiesMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Image.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Image.h
deleted file mode 100644
index 36b112480..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Image.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_IMAGE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_IMAGE_INCLUDE
-
-#include <string>
-
-#include "ImageType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class Image
-  {
-  public:
-  
-    Image(const Image& c);
-    Image(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const ImageType& get_imageType(void) const;
-    const std::string& get_value(void) const;
-
-// setters
-
-    bool set_imageType(const ImageType& imageType_);
-    bool set_value(const std::string& value_);
-
-  private:
-
-    friend class ImageMarshaller;
-
-
-///  Describes, whether it is a static or dynamic image.
-      ImageType imageType;
-
-///  Either the static hex icon value or the binary image file name identifier (sent by PutFile).
-      std::string value;	//!< (65535)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ImageType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ImageType.h
deleted file mode 100644
index b82242c61..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ImageType.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_IMAGETYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_IMAGETYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about the type of image.
-
-  class ImageType
-  {
-  public:
-    enum ImageTypeInternal
-    {
-      INVALID_ENUM=-1,
-      STATIC=0,
-      DYNAMIC=1
-    };
-  
-    ImageType() : mInternal(INVALID_ENUM)				{}
-    ImageType(ImageTypeInternal e) : mInternal(e)		{}
-  
-    ImageTypeInternal get(void) const	{ return mInternal; }
-    void set(ImageTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    ImageTypeInternal mInternal;
-    friend class ImageTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/InteractionMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/InteractionMode.h
deleted file mode 100644
index 38f0d9b0e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/InteractionMode.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_INTERACTIONMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_INTERACTIONMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     For application-requested interactions, this mode indicates the method in which the user is notified and uses the interaction.
-     This mode causes the interaction to only occur on the display, meaning the choices are provided only via the display.
-     Selections are made with the OK and Seek Right and Left, Tune Up and Down buttons.
-     This mode causes the interaction to only occur using V4.
-     Selections are made by saying the command.
-     This mode causes both a VR and display selection option for an interaction.
-     Selections can be made either from the menu display or by speaking the command.
-*/
-
-  class InteractionMode
-  {
-  public:
-    enum InteractionModeInternal
-    {
-      INVALID_ENUM=-1,
-      MANUAL_ONLY=0,
-      VR_ONLY=1,
-      BOTH=2
-    };
-  
-    InteractionMode() : mInternal(INVALID_ENUM)				{}
-    InteractionMode(InteractionModeInternal e) : mInternal(e)		{}
-  
-    InteractionModeInternal get(void) const	{ return mInternal; }
-    void set(InteractionModeInternal e)		{ mInternal=e; }
-  
-  private:
-    InteractionModeInternal mInternal;
-    friend class InteractionModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Language.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Language.h
deleted file mode 100644
index 629cee579..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Language.h
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_LANGUAGE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_LANGUAGE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class Language
-  {
-  public:
-    enum LanguageInternal
-    {
-      INVALID_ENUM=-1,
-
-///  US English
-      EN_US=0,
-
-///  Mexican Spanish
-      ES_MX=1,
-
-///  Canadian French
-      FR_CA=2,
-
-///  EU German
-      DE_EU=3,
-
-///  EU Spanish
-      ES_EU=4,
-
-///  UK English
-      EN_EU=5,
-
-///  Russian
-      RU_RU=6,
-
-///  Turkish
-      TR_TR=7,
-
-///  EU Polish
-      PL_EU=8,
-
-///  French
-      FR_EU=9,
-
-///  Italian
-      IT_EU=10,
-
-///  Swedish
-      SV_EU=11,
-
-///  Portuguese
-      PT_EU=12,
-
-///  Dutch (Standard)
-      NL_EU=13,
-
-///  Australian English
-      EN_AU=14,
-
-///  Chinese (Mandarin)
-      ZH_CN=15,
-
-///  Taiwanese (Mandarin)
-      ZH_TW=16,
-
-///  Japanese
-      JA_JP=17,
-
-///  Arabic
-      AR=18,
-
-///  Korean
-      KO_KR=19
-    };
-
-    Language() : mInternal(INVALID_ENUM)				{}
-    Language(LanguageInternal e) : mInternal(e)		{}
-    Language& operator=(const Language& lng) { set(lng.get()); return *this; }
-
-    bool operator== (const Language& lng) { return mInternal == lng.get(); }
-
-    LanguageInternal get(void) const	{ return mInternal; }
-    void set(LanguageInternal e)		{ mInternal=e; }
-
-  private:
-    LanguageInternal mInternal;
-    friend class LanguageMarshaller;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h
deleted file mode 100644
index 821366603..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_LISTFILES_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_LISTFILES_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Requests the current list of resident filenames for the registered app
-     Not supported on first generation SYNC vehicles. 
-*/
-
-  class ListFiles_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    ListFiles_request(const ListFiles_request& c);
-    ListFiles_request(void);
-    
-    virtual ~ListFiles_request(void);
-  
-    bool checkIntegrity(void);
-
-
-
-  private:
-  
-    friend class ListFiles_requestMarshaller;
-
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h
deleted file mode 100644
index 92ee97a8a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_LISTFILES_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_LISTFILES_RESPONSE_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    /**
-         Returns the current list of resident filenames for the registered app along with the current space available
-         Not supported on First generation SYNC vehicles.
-    */
-    class ListFiles_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        ListFiles_response(const ListFiles_response& c);
-        ListFiles_response(void);
-
-        virtual ~ListFiles_response(void);
-
-        ListFiles_response& operator =(const ListFiles_response&);
-
-        bool checkIntegrity(void);
-
-        const std::vector<std::string>* get_filenames(void) const;
-        unsigned int get_spaceAvailable(void) const;
-
-        void reset_filenames(void);
-        bool set_filenames(const std::vector<std::string>& filenames_);
-        bool set_spaceAvailable(unsigned int spaceAvailable_);
-
-    private:
-        friend class ListFiles_responseMarshaller;
-
-        /**
-             An array of all filenames resident on SYNC for the given registered app.
-             If omitted, then no files currently reside on the system.
-        */
-        std::vector<std::string>* filenames;  //!<   [%s..%s] (500)
-
-        ///  Provides the total local space available on SYNC for the registered app.
-        unsigned int spaceAvailable;  //!<  (0,2000000000)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Marshaller.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Marshaller.h
deleted file mode 100644
index 9a8d62819..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Marshaller.h
+++ /dev/null
@@ -1,1211 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_MARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_MARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "FunctionID.h"
-#include "messageType.h"
-
-#include "JSONHandler/SDLRPCMessage.h"
-#include "../src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-  class Marshaller
-  {
-  public:
-
-    Marshaller()					{}
-    ~Marshaller()					{}
-    
-    static NsSmartDeviceLinkRPC::SDLRPCMessage* fromString(const std::string&,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt);
-    static std::string toString(const NsSmartDeviceLinkRPC::SDLRPCMessage* msg,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt);
-
-    static NsSmartDeviceLinkRPC::SDLRPCMessage* fromJSON(const Json::Value&,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt);
-    static Json::Value toJSON(const NsSmartDeviceLinkRPC::SDLRPCMessage* msg,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt);
-  
-  protected:
-    
-
-// RegisterAppInterface_request
-    static bool fromString(const std::string& str, RegisterAppInterface_request& res)
-    {
-      return mRegisterAppInterface_request.fromString(str, res);
-    }
-
-    static std::string toString(const RegisterAppInterface_request& res)
-    {
-      return mRegisterAppInterface_request.toString(res);
-    }
-
-// RegisterAppInterface_response
-    static bool fromString(const std::string& str, RegisterAppInterface_response& res)
-    {
-      return mRegisterAppInterface_response.fromString(str, res);
-    }
-
-    static std::string toString(const RegisterAppInterface_response& res)
-    {
-      return mRegisterAppInterface_response.toString(res);
-    }
-
-// UnregisterAppInterface_request
-    static bool fromString(const std::string& str, UnregisterAppInterface_request& res)
-    {
-      return mUnregisterAppInterface_request.fromString(str, res);
-    }
-
-    static std::string toString(const UnregisterAppInterface_request& res)
-    {
-      return mUnregisterAppInterface_request.toString(res);
-    }
-
-// UnregisterAppInterface_response
-    static bool fromString(const std::string& str, UnregisterAppInterface_response& res)
-    {
-      return mUnregisterAppInterface_response.fromString(str, res);
-    }
-
-    static std::string toString(const UnregisterAppInterface_response& res)
-    {
-      return mUnregisterAppInterface_response.toString(res);
-    }
-
-// SetGlobalProperties_request
-    static bool fromString(const std::string& str, SetGlobalProperties_request& res)
-    {
-      return mSetGlobalProperties_request.fromString(str, res);
-    }
-
-    static std::string toString(const SetGlobalProperties_request& res)
-    {
-      return mSetGlobalProperties_request.toString(res);
-    }
-
-// SetGlobalProperties_response
-    static bool fromString(const std::string& str, SetGlobalProperties_response& res)
-    {
-      return mSetGlobalProperties_response.fromString(str, res);
-    }
-
-    static std::string toString(const SetGlobalProperties_response& res)
-    {
-      return mSetGlobalProperties_response.toString(res);
-    }
-
-// ResetGlobalProperties_request
-    static bool fromString(const std::string& str, ResetGlobalProperties_request& res)
-    {
-      return mResetGlobalProperties_request.fromString(str, res);
-    }
-
-    static std::string toString(const ResetGlobalProperties_request& res)
-    {
-      return mResetGlobalProperties_request.toString(res);
-    }
-
-// ResetGlobalProperties_response
-    static bool fromString(const std::string& str, ResetGlobalProperties_response& res)
-    {
-      return mResetGlobalProperties_response.fromString(str, res);
-    }
-
-    static std::string toString(const ResetGlobalProperties_response& res)
-    {
-      return mResetGlobalProperties_response.toString(res);
-    }
-
-// AddCommand_request
-    static bool fromString(const std::string& str, AddCommand_request& res)
-    {
-      return mAddCommand_request.fromString(str, res);
-    }
-
-    static std::string toString(const AddCommand_request& res)
-    {
-      return mAddCommand_request.toString(res);
-    }
-
-// AddCommand_response
-    static bool fromString(const std::string& str, AddCommand_response& res)
-    {
-      return mAddCommand_response.fromString(str, res);
-    }
-
-    static std::string toString(const AddCommand_response& res)
-    {
-      return mAddCommand_response.toString(res);
-    }
-
-// DeleteCommand_request
-    static bool fromString(const std::string& str, DeleteCommand_request& res)
-    {
-      return mDeleteCommand_request.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteCommand_request& res)
-    {
-      return mDeleteCommand_request.toString(res);
-    }
-
-// DeleteCommand_response
-    static bool fromString(const std::string& str, DeleteCommand_response& res)
-    {
-      return mDeleteCommand_response.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteCommand_response& res)
-    {
-      return mDeleteCommand_response.toString(res);
-    }
-
-// AddSubMenu_request
-    static bool fromString(const std::string& str, AddSubMenu_request& res)
-    {
-      return mAddSubMenu_request.fromString(str, res);
-    }
-
-    static std::string toString(const AddSubMenu_request& res)
-    {
-      return mAddSubMenu_request.toString(res);
-    }
-
-// AddSubMenu_response
-    static bool fromString(const std::string& str, AddSubMenu_response& res)
-    {
-      return mAddSubMenu_response.fromString(str, res);
-    }
-
-    static std::string toString(const AddSubMenu_response& res)
-    {
-      return mAddSubMenu_response.toString(res);
-    }
-
-// DeleteSubMenu_request
-    static bool fromString(const std::string& str, DeleteSubMenu_request& res)
-    {
-      return mDeleteSubMenu_request.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteSubMenu_request& res)
-    {
-      return mDeleteSubMenu_request.toString(res);
-    }
-
-// DeleteSubMenu_response
-    static bool fromString(const std::string& str, DeleteSubMenu_response& res)
-    {
-      return mDeleteSubMenu_response.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteSubMenu_response& res)
-    {
-      return mDeleteSubMenu_response.toString(res);
-    }
-
-// CreateInteractionChoiceSet_request
-    static bool fromString(const std::string& str, CreateInteractionChoiceSet_request& res)
-    {
-      return mCreateInteractionChoiceSet_request.fromString(str, res);
-    }
-
-    static std::string toString(const CreateInteractionChoiceSet_request& res)
-    {
-      return mCreateInteractionChoiceSet_request.toString(res);
-    }
-
-// CreateInteractionChoiceSet_response
-    static bool fromString(const std::string& str, CreateInteractionChoiceSet_response& res)
-    {
-      return mCreateInteractionChoiceSet_response.fromString(str, res);
-    }
-
-    static std::string toString(const CreateInteractionChoiceSet_response& res)
-    {
-      return mCreateInteractionChoiceSet_response.toString(res);
-    }
-
-// PerformInteraction_request
-    static bool fromString(const std::string& str, PerformInteraction_request& res)
-    {
-      return mPerformInteraction_request.fromString(str, res);
-    }
-
-    static std::string toString(const PerformInteraction_request& res)
-    {
-      return mPerformInteraction_request.toString(res);
-    }
-
-// PerformInteraction_response
-    static bool fromString(const std::string& str, PerformInteraction_response& res)
-    {
-      return mPerformInteraction_response.fromString(str, res);
-    }
-
-    static std::string toString(const PerformInteraction_response& res)
-    {
-      return mPerformInteraction_response.toString(res);
-    }
-
-// DeleteInteractionChoiceSet_request
-    static bool fromString(const std::string& str, DeleteInteractionChoiceSet_request& res)
-    {
-      return mDeleteInteractionChoiceSet_request.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteInteractionChoiceSet_request& res)
-    {
-      return mDeleteInteractionChoiceSet_request.toString(res);
-    }
-
-// DeleteInteractionChoiceSet_response
-    static bool fromString(const std::string& str, DeleteInteractionChoiceSet_response& res)
-    {
-      return mDeleteInteractionChoiceSet_response.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteInteractionChoiceSet_response& res)
-    {
-      return mDeleteInteractionChoiceSet_response.toString(res);
-    }
-
-// Alert_request
-    static bool fromString(const std::string& str, Alert_request& res)
-    {
-      return mAlert_request.fromString(str, res);
-    }
-
-    static std::string toString(const Alert_request& res)
-    {
-      return mAlert_request.toString(res);
-    }
-
-// Alert_response
-    static bool fromString(const std::string& str, Alert_response& res)
-    {
-      return mAlert_response.fromString(str, res);
-    }
-
-    static std::string toString(const Alert_response& res)
-    {
-      return mAlert_response.toString(res);
-    }
-
-// Show_request
-    static bool fromString(const std::string& str, Show_request& res)
-    {
-      return mShow_request.fromString(str, res);
-    }
-
-    static std::string toString(const Show_request& res)
-    {
-      return mShow_request.toString(res);
-    }
-
-// Show_response
-    static bool fromString(const std::string& str, Show_response& res)
-    {
-      return mShow_response.fromString(str, res);
-    }
-
-    static std::string toString(const Show_response& res)
-    {
-      return mShow_response.toString(res);
-    }
-
-// Speak_request
-    static bool fromString(const std::string& str, Speak_request& res)
-    {
-      return mSpeak_request.fromString(str, res);
-    }
-
-    static std::string toString(const Speak_request& res)
-    {
-      return mSpeak_request.toString(res);
-    }
-
-// Speak_response
-    static bool fromString(const std::string& str, Speak_response& res)
-    {
-      return mSpeak_response.fromString(str, res);
-    }
-
-    static std::string toString(const Speak_response& res)
-    {
-      return mSpeak_response.toString(res);
-    }
-
-// SetMediaClockTimer_request
-    static bool fromString(const std::string& str, SetMediaClockTimer_request& res)
-    {
-      return mSetMediaClockTimer_request.fromString(str, res);
-    }
-
-    static std::string toString(const SetMediaClockTimer_request& res)
-    {
-      return mSetMediaClockTimer_request.toString(res);
-    }
-
-// SetMediaClockTimer_response
-    static bool fromString(const std::string& str, SetMediaClockTimer_response& res)
-    {
-      return mSetMediaClockTimer_response.fromString(str, res);
-    }
-
-    static std::string toString(const SetMediaClockTimer_response& res)
-    {
-      return mSetMediaClockTimer_response.toString(res);
-    }
-
-// EncodedSyncPData_request
-    static bool fromString(const std::string& str, EncodedSyncPData_request& res)
-    {
-      return mEncodedSyncPData_request.fromString(str, res);
-    }
-
-    static std::string toString(const EncodedSyncPData_request& res)
-    {
-      return mEncodedSyncPData_request.toString(res);
-    }
-
-// EncodedSyncPData_response
-    static bool fromString(const std::string& str, EncodedSyncPData_response& res)
-    {
-      return mEncodedSyncPData_response.fromString(str, res);
-    }
-
-    static std::string toString(const EncodedSyncPData_response& res)
-    {
-      return mEncodedSyncPData_response.toString(res);
-    }
-
-// DialNumber_request
-    static bool fromString(const std::string& str, DialNumber_request& res)
-    {
-      return mDialNumber_request.fromString(str, res);
-    }
-
-    static std::string toString(const DialNumber_request& res)
-    {
-      return mDialNumber_request.toString(res);
-    }
-
-// DialNumber_response
-    static bool fromString(const std::string& str, DialNumber_response& res)
-    {
-      return mDialNumber_response.fromString(str, res);
-    }
-
-    static std::string toString(const DialNumber_response& res)
-    {
-      return mDialNumber_response.toString(res);
-    }
-
-// PerformAudioPassThru_request
-    static bool fromString(const std::string& str, PerformAudioPassThru_request& res)
-    {
-      return mPerformAudioPassThru_request.fromString(str, res);
-    }
-
-    static std::string toString(const PerformAudioPassThru_request& res)
-    {
-      return mPerformAudioPassThru_request.toString(res);
-    }
-
-// PerformAudioPassThru_response
-    static bool fromString(const std::string& str, PerformAudioPassThru_response& res)
-    {
-      return mPerformAudioPassThru_response.fromString(str, res);
-    }
-
-    static std::string toString(const PerformAudioPassThru_response& res)
-    {
-      return mPerformAudioPassThru_response.toString(res);
-    }
-
-// EndAudioPassThru_request
-    static bool fromString(const std::string& str, EndAudioPassThru_request& res)
-    {
-      return mEndAudioPassThru_request.fromString(str, res);
-    }
-
-    static std::string toString(const EndAudioPassThru_request& res)
-    {
-      return mEndAudioPassThru_request.toString(res);
-    }
-
-// EndAudioPassThru_response
-    static bool fromString(const std::string& str, EndAudioPassThru_response& res)
-    {
-      return mEndAudioPassThru_response.fromString(str, res);
-    }
-
-    static std::string toString(const EndAudioPassThru_response& res)
-    {
-      return mEndAudioPassThru_response.toString(res);
-    }
-
-// SubscribeButton_request
-    static bool fromString(const std::string& str, SubscribeButton_request& res)
-    {
-      return mSubscribeButton_request.fromString(str, res);
-    }
-
-    static std::string toString(const SubscribeButton_request& res)
-    {
-      return mSubscribeButton_request.toString(res);
-    }
-
-// SubscribeButton_response
-    static bool fromString(const std::string& str, SubscribeButton_response& res)
-    {
-      return mSubscribeButton_response.fromString(str, res);
-    }
-
-    static std::string toString(const SubscribeButton_response& res)
-    {
-      return mSubscribeButton_response.toString(res);
-    }
-
-// UnsubscribeButton_request
-    static bool fromString(const std::string& str, UnsubscribeButton_request& res)
-    {
-      return mUnsubscribeButton_request.fromString(str, res);
-    }
-
-    static std::string toString(const UnsubscribeButton_request& res)
-    {
-      return mUnsubscribeButton_request.toString(res);
-    }
-
-// UnsubscribeButton_response
-    static bool fromString(const std::string& str, UnsubscribeButton_response& res)
-    {
-      return mUnsubscribeButton_response.fromString(str, res);
-    }
-
-    static std::string toString(const UnsubscribeButton_response& res)
-    {
-      return mUnsubscribeButton_response.toString(res);
-    }
-
-// SubscribeVehicleData_request
-    static bool fromString(const std::string& str, SubscribeVehicleData_request& res)
-    {
-      return mSubscribeVehicleData_request.fromString(str, res);
-    }
-
-    static std::string toString(const SubscribeVehicleData_request& res)
-    {
-      return mSubscribeVehicleData_request.toString(res);
-    }
-
-// SubscribeVehicleData_response
-    static bool fromString(const std::string& str, SubscribeVehicleData_response& res)
-    {
-      return mSubscribeVehicleData_response.fromString(str, res);
-    }
-
-    static std::string toString(const SubscribeVehicleData_response& res)
-    {
-      return mSubscribeVehicleData_response.toString(res);
-    }
-
-// UnsubscribeVehicleData_request
-    static bool fromString(const std::string& str, UnsubscribeVehicleData_request& res)
-    {
-      return mUnsubscribeVehicleData_request.fromString(str, res);
-    }
-
-    static std::string toString(const UnsubscribeVehicleData_request& res)
-    {
-      return mUnsubscribeVehicleData_request.toString(res);
-    }
-
-// UnsubscribeVehicleData_response
-    static bool fromString(const std::string& str, UnsubscribeVehicleData_response& res)
-    {
-      return mUnsubscribeVehicleData_response.fromString(str, res);
-    }
-
-    static std::string toString(const UnsubscribeVehicleData_response& res)
-    {
-      return mUnsubscribeVehicleData_response.toString(res);
-    }
-
-// GetVehicleData_request
-    static bool fromString(const std::string& str, GetVehicleData_request& res)
-    {
-      return mGetVehicleData_request.fromString(str, res);
-    }
-
-    static std::string toString(const GetVehicleData_request& res)
-    {
-      return mGetVehicleData_request.toString(res);
-    }
-
-// GetVehicleData_response
-    static bool fromString(const std::string& str, GetVehicleData_response& res)
-    {
-      return mGetVehicleData_response.fromString(str, res);
-    }
-
-    static std::string toString(const GetVehicleData_response& res)
-    {
-      return mGetVehicleData_response.toString(res);
-    }
-
-// ReadDID_request
-    static bool fromString(const std::string& str, ReadDID_request& res)
-    {
-      return mReadDID_request.fromString(str, res);
-    }
-
-    static std::string toString(const ReadDID_request& res)
-    {
-      return mReadDID_request.toString(res);
-    }
-
-// ReadDID_response
-    static bool fromString(const std::string& str, ReadDID_response& res)
-    {
-      return mReadDID_response.fromString(str, res);
-    }
-
-    static std::string toString(const ReadDID_response& res)
-    {
-      return mReadDID_response.toString(res);
-    }
-
-// GetDTCs_request
-    static bool fromString(const std::string& str, GetDTCs_request& res)
-    {
-      return mGetDTCs_request.fromString(str, res);
-    }
-
-    static std::string toString(const GetDTCs_request& res)
-    {
-      return mGetDTCs_request.toString(res);
-    }
-
-// GetDTCs_response
-    static bool fromString(const std::string& str, GetDTCs_response& res)
-    {
-      return mGetDTCs_response.fromString(str, res);
-    }
-
-    static std::string toString(const GetDTCs_response& res)
-    {
-      return mGetDTCs_response.toString(res);
-    }
-
-// ScrollableMessage_request
-    static bool fromString(const std::string& str, ScrollableMessage_request& res)
-    {
-      return mScrollableMessage_request.fromString(str, res);
-    }
-
-    static std::string toString(const ScrollableMessage_request& res)
-    {
-      return mScrollableMessage_request.toString(res);
-    }
-
-// ScrollableMessage_response
-    static bool fromString(const std::string& str, ScrollableMessage_response& res)
-    {
-      return mScrollableMessage_response.fromString(str, res);
-    }
-
-    static std::string toString(const ScrollableMessage_response& res)
-    {
-      return mScrollableMessage_response.toString(res);
-    }
-
-// Slider_request
-    static bool fromString(const std::string& str, Slider_request& res)
-    {
-      return mSlider_request.fromString(str, res);
-    }
-
-    static std::string toString(const Slider_request& res)
-    {
-      return mSlider_request.toString(res);
-    }
-
-// Slider_response
-    static bool fromString(const std::string& str, Slider_response& res)
-    {
-      return mSlider_response.fromString(str, res);
-    }
-
-    static std::string toString(const Slider_response& res)
-    {
-      return mSlider_response.toString(res);
-    }
-
-// ShowConstantTBT_request
-    static bool fromString(const std::string& str, ShowConstantTBT_request& res)
-    {
-      return mShowConstantTBT_request.fromString(str, res);
-    }
-
-    static std::string toString(const ShowConstantTBT_request& res)
-    {
-      return mShowConstantTBT_request.toString(res);
-    }
-
-// ShowConstantTBT_response
-    static bool fromString(const std::string& str, ShowConstantTBT_response& res)
-    {
-      return mShowConstantTBT_response.fromString(str, res);
-    }
-
-    static std::string toString(const ShowConstantTBT_response& res)
-    {
-      return mShowConstantTBT_response.toString(res);
-    }
-
-// AlertManeuver_request
-    static bool fromString(const std::string& str, AlertManeuver_request& res)
-    {
-      return mAlertManeuver_request.fromString(str, res);
-    }
-
-    static std::string toString(const AlertManeuver_request& res)
-    {
-      return mAlertManeuver_request.toString(res);
-    }
-
-// AlertManeuver_response
-    static bool fromString(const std::string& str, AlertManeuver_response& res)
-    {
-      return mAlertManeuver_response.fromString(str, res);
-    }
-
-    static std::string toString(const AlertManeuver_response& res)
-    {
-      return mAlertManeuver_response.toString(res);
-    }
-
-// UpdateTurnList_request
-    static bool fromString(const std::string& str, UpdateTurnList_request& res)
-    {
-      return mUpdateTurnList_request.fromString(str, res);
-    }
-
-    static std::string toString(const UpdateTurnList_request& res)
-    {
-      return mUpdateTurnList_request.toString(res);
-    }
-
-// UpdateTurnList_response
-    static bool fromString(const std::string& str, UpdateTurnList_response& res)
-    {
-      return mUpdateTurnList_response.fromString(str, res);
-    }
-
-    static std::string toString(const UpdateTurnList_response& res)
-    {
-      return mUpdateTurnList_response.toString(res);
-    }
-
-// ChangeRegistration_request
-    static bool fromString(const std::string& str, ChangeRegistration_request& res)
-    {
-      return mChangeRegistration_request.fromString(str, res);
-    }
-
-    static std::string toString(const ChangeRegistration_request& res)
-    {
-      return mChangeRegistration_request.toString(res);
-    }
-
-// ChangeRegistration_response
-    static bool fromString(const std::string& str, ChangeRegistration_response& res)
-    {
-      return mChangeRegistration_response.fromString(str, res);
-    }
-
-    static std::string toString(const ChangeRegistration_response& res)
-    {
-      return mChangeRegistration_response.toString(res);
-    }
-
-// GenericResponse_response
-    static bool fromString(const std::string& str, GenericResponse_response& res)
-    {
-      return mGenericResponse_response.fromString(str, res);
-    }
-
-    static std::string toString(const GenericResponse_response& res)
-    {
-      return mGenericResponse_response.toString(res);
-    }
-
-// PutFile_request
-    static bool fromString(const std::string& str, PutFile_request& res)
-    {
-      return mPutFile_request.fromString(str, res);
-    }
-
-    static std::string toString(const PutFile_request& res)
-    {
-      return mPutFile_request.toString(res);
-    }
-
-// PutFile_response
-    static bool fromString(const std::string& str, PutFile_response& res)
-    {
-      return mPutFile_response.fromString(str, res);
-    }
-
-    static std::string toString(const PutFile_response& res)
-    {
-      return mPutFile_response.toString(res);
-    }
-
-// DeleteFile_request
-    static bool fromString(const std::string& str, DeleteFile_request& res)
-    {
-      return mDeleteFile_request.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteFile_request& res)
-    {
-      return mDeleteFile_request.toString(res);
-    }
-
-// DeleteFile_response
-    static bool fromString(const std::string& str, DeleteFile_response& res)
-    {
-      return mDeleteFile_response.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteFile_response& res)
-    {
-      return mDeleteFile_response.toString(res);
-    }
-
-// ListFiles_request
-    static bool fromString(const std::string& str, ListFiles_request& res)
-    {
-      return mListFiles_request.fromString(str, res);
-    }
-
-    static std::string toString(const ListFiles_request& res)
-    {
-      return mListFiles_request.toString(res);
-    }
-
-// ListFiles_response
-    static bool fromString(const std::string& str, ListFiles_response& res)
-    {
-      return mListFiles_response.fromString(str, res);
-    }
-
-    static std::string toString(const ListFiles_response& res)
-    {
-      return mListFiles_response.toString(res);
-    }
-
-// SetAppIcon_request
-    static bool fromString(const std::string& str, SetAppIcon_request& res)
-    {
-      return mSetAppIcon_request.fromString(str, res);
-    }
-
-    static std::string toString(const SetAppIcon_request& res)
-    {
-      return mSetAppIcon_request.toString(res);
-    }
-
-// SetAppIcon_response
-    static bool fromString(const std::string& str, SetAppIcon_response& res)
-    {
-      return mSetAppIcon_response.fromString(str, res);
-    }
-
-    static std::string toString(const SetAppIcon_response& res)
-    {
-      return mSetAppIcon_response.toString(res);
-    }
-
-// SetDisplayLayout_request
-    static bool fromString(const std::string& str, SetDisplayLayout_request& res)
-    {
-      return mSetDisplayLayout_request.fromString(str, res);
-    }
-
-    static std::string toString(const SetDisplayLayout_request& res)
-    {
-      return mSetDisplayLayout_request.toString(res);
-    }
-
-// SetDisplayLayout_response
-    static bool fromString(const std::string& str, SetDisplayLayout_response& res)
-    {
-      return mSetDisplayLayout_response.fromString(str, res);
-    }
-
-    static std::string toString(const SetDisplayLayout_response& res)
-    {
-      return mSetDisplayLayout_response.toString(res);
-    }
-
-// OnHMIStatus
-    static bool fromString(const std::string& str, OnHMIStatus& res)
-    {
-      return mOnHMIStatus.fromString(str, res);
-    }
-
-    static std::string toString(const OnHMIStatus& res)
-    {
-      return mOnHMIStatus.toString(res);
-    }
-
-// OnAppInterfaceUnregistered
-    static bool fromString(const std::string& str, OnAppInterfaceUnregistered& res)
-    {
-      return mOnAppInterfaceUnregistered.fromString(str, res);
-    }
-
-    static std::string toString(const OnAppInterfaceUnregistered& res)
-    {
-      return mOnAppInterfaceUnregistered.toString(res);
-    }
-
-// OnButtonEvent
-    static bool fromString(const std::string& str, OnButtonEvent& res)
-    {
-      return mOnButtonEvent.fromString(str, res);
-    }
-
-    static std::string toString(const OnButtonEvent& res)
-    {
-      return mOnButtonEvent.toString(res);
-    }
-
-// OnButtonPress
-    static bool fromString(const std::string& str, OnButtonPress& res)
-    {
-      return mOnButtonPress.fromString(str, res);
-    }
-
-    static std::string toString(const OnButtonPress& res)
-    {
-      return mOnButtonPress.toString(res);
-    }
-
-// OnVehicleData
-    static bool fromString(const std::string& str, OnVehicleData& res)
-    {
-      return mOnVehicleData.fromString(str, res);
-    }
-
-    static std::string toString(const OnVehicleData& res)
-    {
-      return mOnVehicleData.toString(res);
-    }
-
-// OnCommand
-    static bool fromString(const std::string& str, OnCommand& res)
-    {
-      return mOnCommand.fromString(str, res);
-    }
-
-    static std::string toString(const OnCommand& res)
-    {
-      return mOnCommand.toString(res);
-    }
-
-// OnEncodedSyncPData
-    static bool fromString(const std::string& str, OnEncodedSyncPData& res)
-    {
-      return mOnEncodedSyncPData.fromString(str, res);
-    }
-
-    static std::string toString(const OnEncodedSyncPData& res)
-    {
-      return mOnEncodedSyncPData.toString(res);
-    }
-
-// OnTBTClientState
-    static bool fromString(const std::string& str, OnTBTClientState& res)
-    {
-      return mOnTBTClientState.fromString(str, res);
-    }
-
-    static std::string toString(const OnTBTClientState& res)
-    {
-      return mOnTBTClientState.toString(res);
-    }
-
-// OnDriverDistraction
-    static bool fromString(const std::string& str, OnDriverDistraction& res)
-    {
-      return mOnDriverDistraction.fromString(str, res);
-    }
-
-    static std::string toString(const OnDriverDistraction& res)
-    {
-      return mOnDriverDistraction.toString(res);
-    }
-
-// OnPermissionsChange
-    static bool fromString(const std::string& str, OnPermissionsChange& res)
-    {
-      return mOnPermissionsChange.fromString(str, res);
-    }
-
-    static std::string toString(const OnPermissionsChange& res)
-    {
-      return mOnPermissionsChange.toString(res);
-    }
-
-// OnAudioPassThru
-    static bool fromString(const std::string& str, OnAudioPassThru& res)
-    {
-      return mOnAudioPassThru.fromString(str, res);
-    }
-
-    static std::string toString(const OnAudioPassThru& res)
-    {
-      return mOnAudioPassThru.toString(res);
-    }
-
-// OnLanguageChange
-    static bool fromString(const std::string& str, OnLanguageChange& res)
-    {
-      return mOnLanguageChange.fromString(str, res);
-    }
-
-    static std::string toString(const OnLanguageChange& res)
-    {
-      return mOnLanguageChange.toString(res);
-    }
-
-    static RegisterAppInterface_requestMarshaller mRegisterAppInterface_request;
-    static RegisterAppInterface_responseMarshaller mRegisterAppInterface_response;
-    static UnregisterAppInterface_requestMarshaller mUnregisterAppInterface_request;
-    static UnregisterAppInterface_responseMarshaller mUnregisterAppInterface_response;
-    static SetGlobalProperties_requestMarshaller mSetGlobalProperties_request;
-    static SetGlobalProperties_responseMarshaller mSetGlobalProperties_response;
-    static ResetGlobalProperties_requestMarshaller mResetGlobalProperties_request;
-    static ResetGlobalProperties_responseMarshaller mResetGlobalProperties_response;
-    static AddCommand_requestMarshaller mAddCommand_request;
-    static AddCommand_responseMarshaller mAddCommand_response;
-    static DeleteCommand_requestMarshaller mDeleteCommand_request;
-    static DeleteCommand_responseMarshaller mDeleteCommand_response;
-    static AddSubMenu_requestMarshaller mAddSubMenu_request;
-    static AddSubMenu_responseMarshaller mAddSubMenu_response;
-    static DeleteSubMenu_requestMarshaller mDeleteSubMenu_request;
-    static DeleteSubMenu_responseMarshaller mDeleteSubMenu_response;
-    static CreateInteractionChoiceSet_requestMarshaller mCreateInteractionChoiceSet_request;
-    static CreateInteractionChoiceSet_responseMarshaller mCreateInteractionChoiceSet_response;
-    static PerformInteraction_requestMarshaller mPerformInteraction_request;
-    static PerformInteraction_responseMarshaller mPerformInteraction_response;
-    static DeleteInteractionChoiceSet_requestMarshaller mDeleteInteractionChoiceSet_request;
-    static DeleteInteractionChoiceSet_responseMarshaller mDeleteInteractionChoiceSet_response;
-    static Alert_requestMarshaller mAlert_request;
-    static Alert_responseMarshaller mAlert_response;
-    static Show_requestMarshaller mShow_request;
-    static Show_responseMarshaller mShow_response;
-    static Speak_requestMarshaller mSpeak_request;
-    static Speak_responseMarshaller mSpeak_response;
-    static SetMediaClockTimer_requestMarshaller mSetMediaClockTimer_request;
-    static SetMediaClockTimer_responseMarshaller mSetMediaClockTimer_response;
-    static EncodedSyncPData_requestMarshaller mEncodedSyncPData_request;
-    static EncodedSyncPData_responseMarshaller mEncodedSyncPData_response;
-    static DialNumber_requestMarshaller mDialNumber_request;
-    static DialNumber_responseMarshaller mDialNumber_response;
-    static PerformAudioPassThru_requestMarshaller mPerformAudioPassThru_request;
-    static PerformAudioPassThru_responseMarshaller mPerformAudioPassThru_response;
-    static EndAudioPassThru_requestMarshaller mEndAudioPassThru_request;
-    static EndAudioPassThru_responseMarshaller mEndAudioPassThru_response;
-    static SubscribeButton_requestMarshaller mSubscribeButton_request;
-    static SubscribeButton_responseMarshaller mSubscribeButton_response;
-    static UnsubscribeButton_requestMarshaller mUnsubscribeButton_request;
-    static UnsubscribeButton_responseMarshaller mUnsubscribeButton_response;
-    static SubscribeVehicleData_requestMarshaller mSubscribeVehicleData_request;
-    static SubscribeVehicleData_responseMarshaller mSubscribeVehicleData_response;
-    static UnsubscribeVehicleData_requestMarshaller mUnsubscribeVehicleData_request;
-    static UnsubscribeVehicleData_responseMarshaller mUnsubscribeVehicleData_response;
-    static GetVehicleData_requestMarshaller mGetVehicleData_request;
-    static GetVehicleData_responseMarshaller mGetVehicleData_response;
-    static ReadDID_requestMarshaller mReadDID_request;
-    static ReadDID_responseMarshaller mReadDID_response;
-    static GetDTCs_requestMarshaller mGetDTCs_request;
-    static GetDTCs_responseMarshaller mGetDTCs_response;
-    static ScrollableMessage_requestMarshaller mScrollableMessage_request;
-    static ScrollableMessage_responseMarshaller mScrollableMessage_response;
-    static Slider_requestMarshaller mSlider_request;
-    static Slider_responseMarshaller mSlider_response;
-    static ShowConstantTBT_requestMarshaller mShowConstantTBT_request;
-    static ShowConstantTBT_responseMarshaller mShowConstantTBT_response;
-    static AlertManeuver_requestMarshaller mAlertManeuver_request;
-    static AlertManeuver_responseMarshaller mAlertManeuver_response;
-    static UpdateTurnList_requestMarshaller mUpdateTurnList_request;
-    static UpdateTurnList_responseMarshaller mUpdateTurnList_response;
-    static ChangeRegistration_requestMarshaller mChangeRegistration_request;
-    static ChangeRegistration_responseMarshaller mChangeRegistration_response;
-    static GenericResponse_responseMarshaller mGenericResponse_response;
-    static PutFile_requestMarshaller mPutFile_request;
-    static PutFile_responseMarshaller mPutFile_response;
-    static DeleteFile_requestMarshaller mDeleteFile_request;
-    static DeleteFile_responseMarshaller mDeleteFile_response;
-    static ListFiles_requestMarshaller mListFiles_request;
-    static ListFiles_responseMarshaller mListFiles_response;
-    static SetAppIcon_requestMarshaller mSetAppIcon_request;
-    static SetAppIcon_responseMarshaller mSetAppIcon_response;
-    static SetDisplayLayout_requestMarshaller mSetDisplayLayout_request;
-    static SetDisplayLayout_responseMarshaller mSetDisplayLayout_response;
-    static OnHMIStatusMarshaller mOnHMIStatus;
-    static OnAppInterfaceUnregisteredMarshaller mOnAppInterfaceUnregistered;
-    static OnButtonEventMarshaller mOnButtonEvent;
-    static OnButtonPressMarshaller mOnButtonPress;
-    static OnVehicleDataMarshaller mOnVehicleData;
-    static OnCommandMarshaller mOnCommand;
-    static OnEncodedSyncPDataMarshaller mOnEncodedSyncPData;
-    static OnTBTClientStateMarshaller mOnTBTClientState;
-    static OnDriverDistractionMarshaller mOnDriverDistraction;
-    static OnPermissionsChangeMarshaller mOnPermissionsChange;
-    static OnAudioPassThruMarshaller mOnAudioPassThru;
-    static OnLanguageChangeMarshaller mOnLanguageChange;
-
-private:
-
-    static Json::Value toJSONparam(const NsSmartDeviceLinkRPC::SDLRPCMessage* msg,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt);
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/MediaClockFormat.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/MediaClockFormat.h
deleted file mode 100644
index 895208e2e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/MediaClockFormat.h
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_MEDIACLOCKFORMAT_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_MEDIACLOCKFORMAT_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class MediaClockFormat
-  {
-  public:
-    enum MediaClockFormatInternal
-    {
-      INVALID_ENUM=-1,
-
-/**
-     minutesFieldWidth = 2;minutesFieldMax = 19;secondsFieldWidth = 2;secondsFieldMax = 99;maxHours = 19;maxMinutes = 59;maxSeconds = 59;
-     used for Type II and CID headunits
-*/
-      CLOCK1=0,
-
-/**
-     minutesFieldWidth = 3;minutesFieldMax = 199;secondsFieldWidth = 2;secondsFieldMax = 99;maxHours = 59;maxMinutes = 59;maxSeconds = 59;
-     used for Type V headunit
-*/
-      CLOCK2=1,
-
-/**
-     5 characters possible
-     Format:      1|sp   c   :|sp   c   c
-     1|sp : digit "1" or space
-     c    : character out of following character set: sp|0-9|[letters, see TypeII column in XLS. See [@TODO: create file ref]]
-     :|sp : colon or space
-     used for Type II headunit
-*/
-      CLOCKTEXT1=2,
-
-/**
-     5 chars possible
-     Format:      1|sp   c   :|sp   c   c
-     1|sp : digit "1" or space
-     c    : character out of following character set: sp|0-9|[letters, see CID column in XLS. See [@TODO: create file ref]]
-     :|sp : colon or space
-     used for CID headunit
-     NOTE: difference between CLOCKTEXT1 and CLOCKTEXT2 is the supported character set
-*/
-      CLOCKTEXT2=3,
-
-/**
-     6 chars possible
-     Format:      1|sp   c   c   :|sp   c   c
-     1|sp : digit "1" or space
-     c    : character out of following character set: sp|0-9|[letters, see Type 5 column in XLS]. See [@TODO: create file ref]
-     :|sp : colon or space
-     used for Type V headunit
-*/
-      CLOCKTEXT3=4
-    };
-  
-    MediaClockFormat() : mInternal(INVALID_ENUM)				{}
-    MediaClockFormat(MediaClockFormatInternal e) : mInternal(e)		{}
-  
-    MediaClockFormatInternal get(void) const	{ return mInternal; }
-    void set(MediaClockFormatInternal e)		{ mInternal=e; }
-  
-  private:
-    MediaClockFormatInternal mInternal;
-    friend class MediaClockFormatMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/MenuParams.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/MenuParams.h
deleted file mode 100644
index ae9e24688..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/MenuParams.h
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_MENUPARAMS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_MENUPARAMS_INCLUDE
-
-#include <string>
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class MenuParams
-  {
-  public:
-  
-    MenuParams(const MenuParams& c);
-    MenuParams(void);
-  
-    bool checkIntegrity(void);
-  
-    ~MenuParams(void);
-    MenuParams& operator =(const MenuParams&);
-
-// getters
-
-    const std::string& get_menuName(void) const;
-    const unsigned int* get_parentID(void) const;
-    const unsigned int* get_position(void) const;
-
-// setters
-
-    bool set_menuName(const std::string& menuName_);
-    void reset_parentID(void);
-    bool set_parentID(unsigned int parentID_);
-    void reset_position(void);
-    bool set_position(unsigned int position_);
-
-  private:
-
-    friend class MenuParamsMarshaller;
-
-
-///  Text to show in the menu for this sub menu.
-      std::string menuName;	//!< (500)
-
-/**
-     unique ID of the sub menu, the command will be added to.
-     If not provided, it will be provided to the top level of the in application menu.
-*/
-      unsigned int* parentID;	//!<  (0,2000000000)
-
-/**
-     Position within the items that are are at top level of the in application menu.
-     0 will insert at the front.
-     1 will insert at the second position.
-     if position is greater or equal than the number of items on top level, the sub menu will be appended to the end.
-     If this param was omitted the entry will be added at the end.
-*/
-      unsigned int* position;	//!<  (0,1000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h
deleted file mode 100644
index 51b2f1650..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONAPPINTERFACEUNREGISTERED_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONAPPINTERFACEUNREGISTERED_INCLUDE
-
-
-#include "AppInterfaceUnregisteredReason.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class OnAppInterfaceUnregistered : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnAppInterfaceUnregistered(const OnAppInterfaceUnregistered& c);
-    OnAppInterfaceUnregistered(void);
-    
-    virtual ~OnAppInterfaceUnregistered(void);
-  
-    bool checkIntegrity(void);
-
-    const AppInterfaceUnregisteredReason& get_reason(void) const;
-
-    bool set_reason(const AppInterfaceUnregisteredReason& reason_);
-
-  private:
-  
-    friend class OnAppInterfaceUnregisteredMarshaller;
-
-
-///  See AppInterfaceUnregisteredReason
-      AppInterfaceUnregisteredReason reason;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h
deleted file mode 100644
index 536ea98b0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONAUDIOPASSTHRU_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONAUDIOPASSTHRU_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class OnAudioPassThru : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnAudioPassThru(const OnAudioPassThru& c);
-    OnAudioPassThru(void);
-    
-    virtual ~OnAudioPassThru(void);
-  
-    bool checkIntegrity(void);
-
-
-
-  private:
-  
-    friend class OnAudioPassThruMarshaller;
-
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h
deleted file mode 100644
index 74405a312..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONBUTTONEVENT_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONBUTTONEVENT_INCLUDE
-
-
-#include "ButtonEventMode.h"
-#include "ButtonName.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Notifies application of UP/DOWN events for buttons to which the application is subscribed.
-
-  class OnButtonEvent : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnButtonEvent(const OnButtonEvent& c);
-    OnButtonEvent(void);
-    
-    virtual ~OnButtonEvent(void);
-  
-    bool checkIntegrity(void);
-
-    const ButtonName& get_buttonName(void) const;
-    const ButtonEventMode& get_buttonEventMode(void) const;
-    unsigned int get_customButtonID(void) const;
-
-    bool set_buttonName(const ButtonName& buttonName_);
-    bool set_buttonEventMode(const ButtonEventMode& buttonEventMode_);
-    bool set_customButtonID(unsigned int customButtonID_);
-
-  private:
-  
-    friend class OnButtonEventMarshaller;
-
-      ButtonName buttonName;
-
-///  Indicates whether this is an UP or DOWN event.
-      ButtonEventMode buttonEventMode;
-
-///  If ButtonName is “CUSTOM_BUTTON", this references the integer ID passed by a custom button. (e.g. softButton ID)
-      unsigned int customButtonID;	//!<  (0,65536)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h
deleted file mode 100644
index ff79e2bdd..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONBUTTONPRESS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONBUTTONPRESS_INCLUDE
-
-
-#include "ButtonName.h"
-#include "ButtonPressMode.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Notifies application of LONG/SHORT press events for buttons to which the application is subscribed.
-
-  class OnButtonPress : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnButtonPress(const OnButtonPress& c);
-    OnButtonPress(void);
-    
-    virtual ~OnButtonPress(void);
-  
-    bool checkIntegrity(void);
-
-    const ButtonName& get_buttonName(void) const;
-    const ButtonPressMode& get_buttonPressMode(void) const;
-    unsigned int get_customButtonID(void) const;
-
-    bool set_buttonName(const ButtonName& buttonName_);
-    bool set_buttonPressMode(const ButtonPressMode& buttonPressMode_);
-    bool set_customButtonID(unsigned int customButtonID_);
-
-  private:
-  
-    friend class OnButtonPressMarshaller;
-
-      ButtonName buttonName;
-
-///  Indicates whether this is a LONG or SHORT button press event.
-      ButtonPressMode buttonPressMode;
-
-///  If ButtonName is “CUSTOM_BUTTON", this references the integer ID passed by a custom button. (e.g. softButton ID)
-      unsigned int customButtonID;	//!<  (0,65536)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnCommand.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnCommand.h
deleted file mode 100644
index 884933325..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnCommand.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONCOMMAND_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONCOMMAND_INCLUDE
-
-
-#include "TriggerSource.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class OnCommand : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnCommand(const OnCommand& c);
-    OnCommand(void);
-    
-    virtual ~OnCommand(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_cmdID(void) const;
-    const TriggerSource& get_triggerSource(void) const;
-
-    bool set_cmdID(unsigned int cmdID_);
-    bool set_triggerSource(const TriggerSource& triggerSource_);
-
-  private:
-  
-    friend class OnCommandMarshaller;
-
-
-///  Command ID, which is related to a specific menu entry.
-      unsigned int cmdID;	//!<  (0,2000000000)
-
-///  See TriggerSource
-      TriggerSource triggerSource;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h
deleted file mode 100644
index ecb09bd3f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONDRIVERDISTRACTION_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONDRIVERDISTRACTION_INCLUDE
-
-
-#include "DriverDistractionState.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Provides driver distraction state to mobile applications
-
-  class OnDriverDistraction : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnDriverDistraction(const OnDriverDistraction& c);
-    OnDriverDistraction(void);
-    
-    virtual ~OnDriverDistraction(void);
-  
-    bool checkIntegrity(void);
-
-    const DriverDistractionState& get_state(void) const;
-
-    bool set_state(const DriverDistractionState& state_);
-
-  private:
-  
-    friend class OnDriverDistractionMarshaller;
-
-
-///  Current State of Driver Distraction
-      DriverDistractionState state;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h
deleted file mode 100644
index 0669b2eb5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONENCODEDSYNCPDATA_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONENCODEDSYNCPDATA_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Callback including encoded data of any SyncP packets that SYNC needs to send back to the mobile device.
-
-  class OnEncodedSyncPData : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnEncodedSyncPData(const OnEncodedSyncPData& c);
-    OnEncodedSyncPData(void);
-    
-    virtual ~OnEncodedSyncPData(void);
-  
-    OnEncodedSyncPData& operator =(const OnEncodedSyncPData&);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<std::string>& get_data(void) const;
-    const std::string* get_URL(void) const;
-    const int* get_Timeout(void) const;
-
-    bool set_data(const std::vector<std::string>& data_);
-    void reset_URL(void);
-    bool set_URL(const std::string& URL_);
-    void reset_Timeout(void);
-    bool set_Timeout(int Timeout_);
-
-  private:
-  
-    friend class OnEncodedSyncPDataMarshaller;
-
-
-///  Contains base64 encoded string of SyncP packets.
-      std::vector<std::string> data;	//!<   [%s..%s] (10000)
-
-/**
-     If blank, the SyncP data shall be forwarded to the app.
-     If not blank, the SyncP data shall be forwarded to the provided URL.
-*/
-      std::string* URL;	//!< (1000)
-
-/**
-     If blank, the SyncP data shall be forwarded to the app.
-     If not blank, the SyncP data shall be forwarded with the provided timeout in seconds.
-*/
-      int* Timeout;	//!<  (-2000000000,2000000000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h
deleted file mode 100644
index 7ae9c4369..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONHMISTATUS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONHMISTATUS_INCLUDE
-
-
-#include "AudioStreamingState.h"
-#include "HMILevel.h"
-#include "SystemContext.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class OnHMIStatus : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnHMIStatus(const OnHMIStatus& c);
-    OnHMIStatus(void);
-    
-    virtual ~OnHMIStatus(void);
-  
-    bool checkIntegrity(void);
-
-    const HMILevel& get_hmiLevel(void) const;
-    const AudioStreamingState& get_audioStreamingState(void) const;
-    const SystemContext& get_systemContext(void) const;
-
-    bool set_hmiLevel(const HMILevel& hmiLevel_);
-    bool set_audioStreamingState(const AudioStreamingState& audioStreamingState_);
-    bool set_systemContext(const SystemContext& systemContext_);
-
-  private:
-  
-    friend class OnHMIStatusMarshaller;
-
-
-///  See HMILevel
-      HMILevel hmiLevel;
-
-///  See AudioStreamingState
-      AudioStreamingState audioStreamingState;
-
-///  See SystemContext
-      SystemContext systemContext;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h
deleted file mode 100644
index 3b51b5df7..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONLANGUAGECHANGE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONLANGUAGECHANGE_INCLUDE
-
-
-#include "Language.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class OnLanguageChange : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnLanguageChange(const OnLanguageChange& c);
-    OnLanguageChange(void);
-    
-    virtual ~OnLanguageChange(void);
-  
-    bool checkIntegrity(void);
-
-    const Language& get_language(void) const;
-    const Language& get_hmiDisplayLanguage(void) const;
-
-    bool set_language(const Language& language_);
-    bool set_hmiDisplayLanguage(const Language& hmiDisplayLanguage_);
-
-  private:
-  
-    friend class OnLanguageChangeMarshaller;
-
-
-///  Current SYNC voice engine (VR+TTS) language
-      Language language;
-
-///  Current display language
-      Language hmiDisplayLanguage;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h
deleted file mode 100644
index 57d0f0d10..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONPERMISSIONSCHANGE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONPERMISSIONSCHANGE_INCLUDE
-
-#include <vector>
-
-#include "PermissionItem.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Provides update to app of which policy-table-enabled functions are available
-
-  class OnPermissionsChange : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnPermissionsChange(const OnPermissionsChange& c);
-    OnPermissionsChange(void);
-    
-    virtual ~OnPermissionsChange(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<PermissionItem>& get_permissionItem(void) const;
-
-    bool set_permissionItem(const std::vector<PermissionItem>& permissionItem_);
-
-  private:
-  
-    friend class OnPermissionsChangeMarshaller;
-
-
-///  Change in permissions for a given set of RPCs.
-      std::vector<PermissionItem> permissionItem;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h
deleted file mode 100644
index 7e7b87788..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONTBTCLIENTSTATE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONTBTCLIENTSTATE_INCLUDE
-
-
-#include "TBTState.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Provides applications with notifications specific to the current TBT client status on the module
-
-  class OnTBTClientState : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnTBTClientState(const OnTBTClientState& c);
-    OnTBTClientState(void);
-    
-    virtual ~OnTBTClientState(void);
-  
-    bool checkIntegrity(void);
-
-    const TBTState& get_state(void) const;
-
-    bool set_state(const TBTState& state_);
-
-  private:
-  
-    friend class OnTBTClientStateMarshaller;
-
-
-///  Current State of TBT client
-      TBTState state;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h
deleted file mode 100644
index 3be2abed0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONVEHICLEDATA_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONVEHICLEDATA_INCLUDE
-
-#include <string>
-
-#include "GPSData.h"
-#include "PRNDL.h"
-#include "TireStatus.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Callback for the periodic and non periodic vehicle data read function.
-
-  class OnVehicleData : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnVehicleData(const OnVehicleData& c);
-    OnVehicleData(void);
-    
-    virtual ~OnVehicleData(void);
-  
-    OnVehicleData& operator =(const OnVehicleData&);
-  
-    bool checkIntegrity(void);
-
-    const GPSData* get_gps(void) const;
-    const float* get_speed(void) const;
-    const unsigned int* get_rpm(void) const;
-    const float* get_fuelLevel(void) const;
-    const float* get_avgFuelEconomy(void) const;
-    const float* get_batteryVoltage(void) const;
-    const float* get_externalTemperature(void) const;
-    const std::string* get_vin(void) const;
-    const PRNDL* get_prndl(void) const;
-    const TireStatus* get_tirePressure(void) const;
-    const float* get_batteryPackVoltage(void) const;
-    const float* get_batteryPackCurrent(void) const;
-    const int* get_batteryPackTemperature(void) const;
-    const int* get_engineTorque(void) const;
-    const unsigned int* get_odometer(void) const;
-    const unsigned int* get_tripOdometer(void) const;
-    const std::string* get_genericbinary(void) const;
-
-    void reset_gps(void);
-    bool set_gps(const GPSData& gps_);
-    void reset_speed(void);
-    bool set_speed(float speed_);
-    void reset_rpm(void);
-    bool set_rpm(unsigned int rpm_);
-    void reset_fuelLevel(void);
-    bool set_fuelLevel(float fuelLevel_);
-    void reset_avgFuelEconomy(void);
-    bool set_avgFuelEconomy(float avgFuelEconomy_);
-    void reset_batteryVoltage(void);
-    bool set_batteryVoltage(float batteryVoltage_);
-    void reset_externalTemperature(void);
-    bool set_externalTemperature(float externalTemperature_);
-    void reset_vin(void);
-    bool set_vin(const std::string& vin_);
-    void reset_prndl(void);
-    bool set_prndl(const PRNDL& prndl_);
-    void reset_tirePressure(void);
-    bool set_tirePressure(const TireStatus& tirePressure_);
-    void reset_batteryPackVoltage(void);
-    bool set_batteryPackVoltage(float batteryPackVoltage_);
-    void reset_batteryPackCurrent(void);
-    bool set_batteryPackCurrent(float batteryPackCurrent_);
-    void reset_batteryPackTemperature(void);
-    bool set_batteryPackTemperature(int batteryPackTemperature_);
-    void reset_engineTorque(void);
-    bool set_engineTorque(int engineTorque_);
-    void reset_odometer(void);
-    bool set_odometer(unsigned int odometer_);
-    void reset_tripOdometer(void);
-    bool set_tripOdometer(unsigned int tripOdometer_);
-    void reset_genericbinary(void);
-    bool set_genericbinary(const std::string& genericbinary_);
-
-  private:
-  
-    friend class OnVehicleDataMarshaller;
-
-
-/**
-     See GPSData
-     Subscribable
-*/
-      GPSData* gps;
-
-/**
-     The vehicle speed in kilometers per hour
-     Subscribable
-*/
-      float* speed;	//!<  (-100,500)
-
-/**
-     The number of revolutions per minute of the engine
-     Subscribable
-*/
-      unsigned int* rpm;	//!<  (0,20000)
-
-///  The fuel level
-      float* fuelLevel;	//!<  (0,100)
-
-///  The average fuel economy in litres/100km
-      float* avgFuelEconomy;	//!<  (0,7000)
-
-///  The voltage in Volts
-      float* batteryVoltage;	//!<  (0,26)
-
-///  The external temperature in degrees celsius.
-      float* externalTemperature;	//!<  (-40,100)
-
-///  Vehicle identification number.
-      std::string* vin;	//!< (17)
-
-/**
-     See PRNDL.
-     Subscribable
-*/
-      PRNDL* prndl;
-
-/**
-     See TireStatus.
-     Subscribable
-*/
-      TireStatus* tirePressure;
-
-///  Battery pack voltage of hybrid and electrical vehicles in volts
-      float* batteryPackVoltage;	//!<  (-1000,1000)
-
-///  Battery current of hybrid and electrical vehicles in amperes
-      float* batteryPackCurrent;	//!<  (-1000,1000)
-
-///  Battery temperature of hybrid and electrical vehicles in degrees celsius
-      int* batteryPackTemperature;	//!<  (-50,250)
-
-/**
-     Engine torque in Nm
-     Subscribable
-*/
-      int* engineTorque;	//!<  (-10000,55000)
-
-///  Odometer in km
-      unsigned int* odometer;	//!<  (0,2000000)
-
-///  Odometer of trip in km
-      unsigned int* tripOdometer;	//!<  (0,2000000)
-
-///  The hex value string is a string of hexadecimal chars, for example "FE12" or "1234ABCD".
-      std::string* genericbinary;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PRNDL.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PRNDL.h
deleted file mode 100644
index dfad49589..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PRNDL.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PRNDL_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PRNDL_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The selected gear.
-
-  class PRNDL
-  {
-  public:
-    enum PRNDLInternal
-    {
-      INVALID_ENUM=-1,
-
-///  Parking
-      PARK=0,
-
-///  Reverse gear
-      REVERSE=1,
-
-///  No gear
-      NEUTRAL=2,
-
-///  1st gear hold
-      LOWGEAR=3,
-      FORWARD_DRIVE_2=4,
-      FORWARD_DRIVE_3=5,
-
-///  Or Overdrive
-      FORWARD_DRIVE_4=6,
-
-///  Or Overdrive
-      FORWARD_DRIVE_5=7,
-
-///  Or Overdrive
-      FORWARD_DRIVE_6=8,
-      SECOND_GEAR_HOLD=9,
-      THIRD_GEAR_HOLD=10,
-      FOURTH_GEAR_HOLD=11,
-      FIFTH_GEAR_HOLD=12,
-      SIXTH_GEAR_HOLD=13
-    };
-  
-    PRNDL() : mInternal(INVALID_ENUM)				{}
-    PRNDL(PRNDLInternal e) : mInternal(e)		{}
-  
-    PRNDLInternal get(void) const	{ return mInternal; }
-    void set(PRNDLInternal e)		{ mInternal=e; }
-  
-  private:
-    PRNDLInternal mInternal;
-    friend class PRNDLMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ParameterPermissions.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ParameterPermissions.h
deleted file mode 100644
index 1c9ca9927..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ParameterPermissions.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PARAMETERPERMISSIONS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PARAMETERPERMISSIONS_INCLUDE
-
-#include <string>
-#include <vector>
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class ParameterPermissions
-  {
-  public:
-  
-    ParameterPermissions(const ParameterPermissions& c);
-    ParameterPermissions(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const std::vector<std::string>& get_allowed(void) const;
-    const std::vector<std::string>& get_userDisallowed(void) const;
-
-// setters
-
-    bool set_allowed(const std::vector<std::string>& allowed_);
-    bool set_userDisallowed(const std::vector<std::string>& userDisallowed_);
-
-  private:
-
-    friend class ParameterPermissionsMarshaller;
-
-
-///  A set of all parameters that are permitted for this given RPC.
-      std::vector<std::string> allowed;	//!<   [%s..%s] (100)
-
-///  A set of all parameters that are prohibited for this given RPC.
-      std::vector<std::string> userDisallowed;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h
deleted file mode 100644
index 1505da6a5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PERFORMAUDIOPASSTHRU_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PERFORMAUDIOPASSTHRU_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "AudioCaptureQuality.h"
-#include "AudioType.h"
-#include "SamplingRate.h"
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Starts audio pass thru session 
-
-  class PerformAudioPassThru_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    PerformAudioPassThru_request(const PerformAudioPassThru_request& c);
-    PerformAudioPassThru_request(void);
-    
-    virtual ~PerformAudioPassThru_request(void);
-  
-    PerformAudioPassThru_request& operator =(const PerformAudioPassThru_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<TTSChunk>& get_initialPrompt(void) const;
-    const std::string* get_audioPassThruDisplayText1(void) const;
-    const std::string* get_audioPassThruDisplayText2(void) const;
-    const SamplingRate& get_samplingRate(void) const;
-    unsigned int get_maxDuration(void) const;
-    const AudioCaptureQuality& get_bitsPerSample(void) const;
-    const AudioType& get_audioType(void) const;
-
-    bool set_initialPrompt(const std::vector<TTSChunk>& initialPrompt_);
-    void reset_audioPassThruDisplayText1(void);
-    bool set_audioPassThruDisplayText1(const std::string& audioPassThruDisplayText1_);
-    void reset_audioPassThruDisplayText2(void);
-    bool set_audioPassThruDisplayText2(const std::string& audioPassThruDisplayText2_);
-    bool set_samplingRate(const SamplingRate& samplingRate_);
-    bool set_maxDuration(unsigned int maxDuration_);
-    bool set_bitsPerSample(const AudioCaptureQuality& bitsPerSample_);
-    bool set_audioType(const AudioType& audioType_);
-
-  private:
-  
-    friend class PerformAudioPassThru_requestMarshaller;
-
-
-/**
-     SYNC will speak this prompt before opening the audio pass thru session
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk> initialPrompt;	//!<   [%s..%s] 
-
-///  First line of text displayed during audio capture.
-      std::string* audioPassThruDisplayText1;	//!< (500)
-
-///  Second line of text displayed during audio capture.
-      std::string* audioPassThruDisplayText2;	//!< (500)
-
-///   This value shall be allowed at 8 khz or 16 or 22 or 44 khz.
-      SamplingRate samplingRate;
-
-///  The maximum duration of audio recording in milliseconds. 
-      unsigned int maxDuration;	//!<  (0,1000000)
-
-///  Specifies the quality the audio is recorded. Currently 8 bit or 16 bit.
-      AudioCaptureQuality bitsPerSample;
-
-///  Specifies the type of audio data being requested.
-      AudioType audioType;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h
deleted file mode 100644
index 802e54ff4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PERFORMAUDIOPASSTHRU_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PERFORMAUDIOPASSTHRU_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class PerformAudioPassThru_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        PerformAudioPassThru_response(const PerformAudioPassThru_response& c);
-        PerformAudioPassThru_response(void);
-
-        virtual ~PerformAudioPassThru_response(void);
-
-        PerformAudioPassThru_response& operator =(const PerformAudioPassThru_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class PerformAudioPassThru_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h
deleted file mode 100644
index a44bf50f4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PERFORMINTERACTION_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PERFORMINTERACTION_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "InteractionMode.h"
-#include "TTSChunk.h"
-#include "VrHelpItem.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Triggers an interaction (e.g. "Permit GPS?" - Yes, no, Always Allow).
-
-  class PerformInteraction_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    PerformInteraction_request(const PerformInteraction_request& c);
-    PerformInteraction_request(void);
-    
-    virtual ~PerformInteraction_request(void);
-  
-    PerformInteraction_request& operator =(const PerformInteraction_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_initialText(void) const;
-    const std::vector<TTSChunk>& get_initialPrompt(void) const;
-    const InteractionMode& get_interactionMode(void) const;
-    const std::vector<unsigned int>& get_interactionChoiceSetIDList(void) const;
-    const std::vector<TTSChunk>* get_helpPrompt(void) const;
-    const std::vector<TTSChunk>* get_timeoutPrompt(void) const;
-    const unsigned int* get_timeout(void) const;
-    const std::vector<VrHelpItem>* get_vrHelp(void) const;
-
-    bool set_initialText(const std::string& initialText_);
-    bool set_initialPrompt(const std::vector<TTSChunk>& initialPrompt_);
-    bool set_interactionMode(const InteractionMode& interactionMode_);
-    bool set_interactionChoiceSetIDList(const std::vector<unsigned int>& interactionChoiceSetIDList_);
-    void reset_helpPrompt(void);
-    bool set_helpPrompt(const std::vector<TTSChunk>& helpPrompt_);
-    void reset_timeoutPrompt(void);
-    bool set_timeoutPrompt(const std::vector<TTSChunk>& timeoutPrompt_);
-    void reset_timeout(void);
-    bool set_timeout(unsigned int timeout_);
-    void reset_vrHelp(void);
-    bool set_vrHelp(const std::vector<VrHelpItem>& vrHelp_);
-
-  private:
-  
-    friend class PerformInteraction_requestMarshaller;
-
-
-///  Text to be displayed first.
-      std::string initialText;	//!< (500)
-
-/**
-     This is the intial prompt spoken to the user at the start of an interaction
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk> initialPrompt;	//!<   [%s..%s] 
-
-///  See InteractionMode.
-      InteractionMode interactionMode;
-
-///  List of interaction choice set IDs to use with an interaction.
-      std::vector<unsigned int> interactionChoiceSetIDList;	//!<   [%s..%s]  (0,2000000000)
-
-/**
-     Help text. This is the spoken string when a user speaks "help" when the interaction is occuring.
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* helpPrompt;	//!<   [%s..%s] 
-
-/**
-     Timeout text. This text is spoken when a VR interaction times out.
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* timeoutPrompt;	//!<   [%s..%s] 
-
-/**
-     Timeout in milliseconds.
-     If omitted a standard value of 10000 milliseconds is used.
-*/
-      unsigned int* timeout;	//!<  (5000,100000)
-
-/**
-     Ability to send suggested VR Help Items to display on-screen during Perform Interaction.
-     If omitted on supported displays, the default SYNC generated list of suggested choices shall be displayed.
-*/
-      std::vector<VrHelpItem>* vrHelp;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h
deleted file mode 100644
index dedbcd738..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PERFORMINTERACTION_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PERFORMINTERACTION_RESPONSE_INCLUDE
-
-#include "TriggerSource.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class PerformInteraction_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        PerformInteraction_response(const PerformInteraction_response& c);
-        PerformInteraction_response(void);
-
-        virtual ~PerformInteraction_response(void);
-
-        PerformInteraction_response& operator =(const PerformInteraction_response&);
-
-        bool checkIntegrity(void);
-
-        const unsigned int* get_choiceID(void) const;
-        const TriggerSource* get_triggerSource(void) const;
-
-        void reset_choiceID(void);
-        bool set_choiceID(unsigned int choiceID_);
-        void reset_triggerSource(void);
-        bool set_triggerSource(const TriggerSource& triggerSource_);
-
-    private:
-        friend class PerformInteraction_responseMarshaller;
-
-        ///  ID of the choice that was selected in response to PerformInteraction.
-        unsigned int* choiceID;   //!<  (0,2000000000)
-
-        ///  See TriggerSource
-        TriggerSource* triggerSource;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PermissionItem.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PermissionItem.h
deleted file mode 100644
index 9dc9634e2..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PermissionItem.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PERMISSIONITEM_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PERMISSIONITEM_INCLUDE
-
-#include <string>
-
-#include "HMIPermissions.h"
-#include "ParameterPermissions.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class PermissionItem
-  {
-  public:
-  
-    PermissionItem(const PermissionItem& c);
-    PermissionItem(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const HMIPermissions& get_hmiPermissions(void) const;
-    const ParameterPermissions& get_parameterPermissions(void) const;
-    const std::string& get_rpcName(void) const;
-
-// setters
-
-    bool set_hmiPermissions(const HMIPermissions& hmiPermissions_);
-    bool set_parameterPermissions(const ParameterPermissions& parameterPermissions_);
-    bool set_rpcName(const std::string& rpcName_);
-
-  private:
-
-    friend class PermissionItemMarshaller;
-
-      HMIPermissions hmiPermissions;
-      ParameterPermissions parameterPermissions;
-
-///  Name of the individual RPC in the policy table.
-      std::string rpcName;	//!< (100)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PermissionStatus.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PermissionStatus.h
deleted file mode 100644
index bf2106b80..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PermissionStatus.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PERMISSIONSTATUS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PERMISSIONSTATUS_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration that describes possible permission states of a policy table entry.
-
-  class PermissionStatus
-  {
-  public:
-    enum PermissionStatusInternal
-    {
-      INVALID_ENUM=-1,
-      PS_ALLOWED=0,
-      PS_DISALLOWED=1,
-      PS_USER_DISALLOWED=2,
-      PS_USER_CONSENT_PENDING=3
-    };
-  
-    PermissionStatus() : mInternal(INVALID_ENUM)				{}
-    PermissionStatus(PermissionStatusInternal e) : mInternal(e)		{}
-  
-    PermissionStatusInternal get(void) const	{ return mInternal; }
-    void set(PermissionStatusInternal e)		{ mInternal=e; }
-  
-  private:
-    PermissionStatusInternal mInternal;
-    friend class PermissionStatusMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h
deleted file mode 100644
index e03c772fd..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PRESETBANKCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PRESETBANKCAPABILITIES_INCLUDE
-
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about on-screen preset capabilities.
-
-  class PresetBankCapabilities
-  {
-  public:
-  
-    PresetBankCapabilities(const PresetBankCapabilities& c);
-    PresetBankCapabilities(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    bool get_onScreenPresetsAvailable(void) const;
-
-// setters
-
-    bool set_onScreenPresetsAvailable(bool onScreenPresetsAvailable_);
-
-  private:
-
-    friend class PresetBankCapabilitiesMarshaller;
-
-
-///  Onscreen custom presets are available.
-      bool onScreenPresetsAvailable;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h
deleted file mode 100644
index 3e5894778..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PUTFILE_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PUTFILE_REQUEST_INCLUDE
-
-#include <string>
-
-#include "FileType.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Used to push a binary data onto the SYNC module from a mobile device, such as icons and album art
-     Not supported on first generation SYNC vehicles. 
-*/
-
-  class PutFile_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    PutFile_request(const PutFile_request& c);
-    PutFile_request(void);
-    
-    virtual ~PutFile_request(void);
-  
-    PutFile_request& operator =(const PutFile_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_syncFileName(void) const;
-    const FileType& get_fileType(void) const;
-    const bool* get_persistentFile(void) const;
-    const std::string* get_fileData(void) const;
-
-    bool set_syncFileName(const std::string& syncFileName_);
-    bool set_fileType(const FileType& fileType_);
-    void reset_persistentFile(void);
-    bool set_persistentFile(bool persistentFile_);
-    void reset_fileData(void);
-    bool set_fileData(const std::string& fileData_);
-
-  private:
-  
-    friend class PutFile_requestMarshaller;
-
-
-///  File reference name.
-      std::string syncFileName;	//!< (500)
-
-///  Selected file type.
-      FileType fileType;
-
-/**
-     Indicates if the file is meant to persist between sessions / ignition cycles.
-     If set to TRUE, then the system will aim to persist this file through session / cycles.
-     While files with this designation will have priority over others, they are subject to deletion by the system at any time.
-     In the event of automatic deletion by the system, the app will receive a rejection and have to resend the file.
-     If omitted, the value will be set to false.
-*/
-      bool* persistentFile;
-
-///  Binary data.
-      std::string* fileData;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h
deleted file mode 100644
index 3f3750574..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PUTFILE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PUTFILE_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    /**
-         Response is sent, when the file data was copied (success case). Or when an error occured.
-         Not supported on First generation SYNC vehicles.
-    */
-
-    class PutFile_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        PutFile_response(const PutFile_response& c);
-        PutFile_response(void);
-
-        virtual ~PutFile_response(void);
-
-        PutFile_response& operator =(const PutFile_response&);
-
-        bool checkIntegrity(void);
-
-        unsigned int get_spaceAvailable(void) const;
-        bool set_spaceAvailable(unsigned int spaceAvailable_);
-
-    private:
-        friend class PutFile_responseMarshaller;
-
-        ///  Provides the total local space available on SYNC for the registered app.
-        unsigned int spaceAvailable;  //!<  (0,2000000000)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RPC.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RPC.h
deleted file mode 100644
index 77c7b73f5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RPC.h
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_RPC_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_RPC_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "AppInterfaceUnregisteredReason.h"
-#include "AppType.h"
-#include "AudioCaptureQuality.h"
-#include "AudioStreamingState.h"
-#include "AudioType.h"
-#include "ButtonCapabilities.h"
-#include "ButtonEventMode.h"
-#include "ButtonName.h"
-#include "ButtonPressMode.h"
-#include "CharacterSet.h"
-#include "Choice.h"
-#include "CompassDirection.h"
-#include "DTC.h"
-#include "DeactivateReason.h"
-#include "Dimension.h"
-#include "DisplayCapabilities.h"
-#include "DisplayType.h"
-#include "DriverDistractionState.h"
-#include "FileType.h"
-#include "FunctionID.h"
-#include "GPSData.h"
-#include "GlobalProperty.h"
-#include "HMIApplication.h"
-#include "HMILevel.h"
-#include "HMIPermissions.h"
-#include "HmiZoneCapabilities.h"
-#include "Image.h"
-#include "ImageType.h"
-#include "InteractionMode.h"
-#include "Language.h"
-#include "MediaClockFormat.h"
-#include "MenuParams.h"
-#include "PRNDL.h"
-#include "ParameterPermissions.h"
-#include "PermissionItem.h"
-#include "PermissionStatus.h"
-#include "PresetBankCapabilities.h"
-#include "Result.h"
-#include "SamplingRate.h"
-#include "SingleTirePressureStatus.h"
-#include "SingleTireStatus.h"
-#include "SoftButton.h"
-#include "SoftButtonCapabilities.h"
-#include "SoftButtonType.h"
-#include "SpeechCapabilities.h"
-#include "StartTime.h"
-#include "SyncMsgVersion.h"
-#include "SystemAction.h"
-#include "SystemContext.h"
-#include "TBTState.h"
-#include "TTSChunk.h"
-#include "TextAlignment.h"
-#include "TextField.h"
-#include "TextFieldName.h"
-#include "TimerMode.h"
-#include "TirePressureTellTale.h"
-#include "TireStatus.h"
-#include "TriggerSource.h"
-#include "Turn.h"
-#include "UpdateMode.h"
-#include "VehicleDataResult.h"
-#include "VehicleDataResultCode.h"
-#include "VehicleDataType.h"
-#include "VehicleType.h"
-#include "VrCapabilities.h"
-#include "VrHelpItem.h"
-#include "messageType.h"
-#include "RegisterAppInterface_request.h"
-#include "RegisterAppInterface_response.h"
-#include "UnregisterAppInterface_request.h"
-#include "UnregisterAppInterface_response.h"
-#include "SetGlobalProperties_request.h"
-#include "SetGlobalProperties_response.h"
-#include "ResetGlobalProperties_request.h"
-#include "ResetGlobalProperties_response.h"
-#include "AddCommand_request.h"
-#include "AddCommand_response.h"
-#include "DeleteCommand_request.h"
-#include "DeleteCommand_response.h"
-#include "AddSubMenu_request.h"
-#include "AddSubMenu_response.h"
-#include "DeleteSubMenu_request.h"
-#include "DeleteSubMenu_response.h"
-#include "CreateInteractionChoiceSet_request.h"
-#include "CreateInteractionChoiceSet_response.h"
-#include "PerformInteraction_request.h"
-#include "PerformInteraction_response.h"
-#include "DeleteInteractionChoiceSet_request.h"
-#include "DeleteInteractionChoiceSet_response.h"
-#include "Alert_request.h"
-#include "Alert_response.h"
-#include "Show_request.h"
-#include "Show_response.h"
-#include "Speak_request.h"
-#include "Speak_response.h"
-#include "SetMediaClockTimer_request.h"
-#include "SetMediaClockTimer_response.h"
-#include "EncodedSyncPData_request.h"
-#include "EncodedSyncPData_response.h"
-#include "DialNumber_request.h"
-#include "DialNumber_response.h"
-#include "PerformAudioPassThru_request.h"
-#include "PerformAudioPassThru_response.h"
-#include "EndAudioPassThru_request.h"
-#include "EndAudioPassThru_response.h"
-#include "SubscribeButton_request.h"
-#include "SubscribeButton_response.h"
-#include "UnsubscribeButton_request.h"
-#include "UnsubscribeButton_response.h"
-#include "SubscribeVehicleData_request.h"
-#include "SubscribeVehicleData_response.h"
-#include "UnsubscribeVehicleData_request.h"
-#include "UnsubscribeVehicleData_response.h"
-#include "GetVehicleData_request.h"
-#include "GetVehicleData_response.h"
-#include "ReadDID_request.h"
-#include "ReadDID_response.h"
-#include "GetDTCs_request.h"
-#include "GetDTCs_response.h"
-#include "ScrollableMessage_request.h"
-#include "ScrollableMessage_response.h"
-#include "Slider_request.h"
-#include "Slider_response.h"
-#include "ShowConstantTBT_request.h"
-#include "ShowConstantTBT_response.h"
-#include "AlertManeuver_request.h"
-#include "AlertManeuver_response.h"
-#include "UpdateTurnList_request.h"
-#include "UpdateTurnList_response.h"
-#include "ChangeRegistration_request.h"
-#include "ChangeRegistration_response.h"
-#include "GenericResponse_response.h"
-#include "PutFile_request.h"
-#include "PutFile_response.h"
-#include "DeleteFile_request.h"
-#include "DeleteFile_response.h"
-#include "ListFiles_request.h"
-#include "ListFiles_response.h"
-#include "SetAppIcon_request.h"
-#include "SetAppIcon_response.h"
-#include "SetDisplayLayout_request.h"
-#include "SetDisplayLayout_response.h"
-#include "OnHMIStatus.h"
-#include "OnAppInterfaceUnregistered.h"
-#include "OnButtonEvent.h"
-#include "OnButtonPress.h"
-#include "OnVehicleData.h"
-#include "OnCommand.h"
-#include "OnEncodedSyncPData.h"
-#include "OnTBTClientState.h"
-#include "OnDriverDistraction.h"
-#include "OnPermissionsChange.h"
-#include "OnAudioPassThru.h"
-#include "OnLanguageChange.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h
deleted file mode 100644
index 3ef61d928..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_READDID_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_READDID_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Non periodic vehicle data read request.
-
-  class ReadDID_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    ReadDID_request(const ReadDID_request& c);
-    ReadDID_request(void);
-    
-    virtual ~ReadDID_request(void);
-  
-    ReadDID_request& operator =(const ReadDID_request&);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_ecuName(void) const;
-    const std::vector<unsigned int>& get_didLocation(void) const;
-    const bool* get_encrypted(void) const;
-
-    bool set_ecuName(unsigned int ecuName_);
-    bool set_didLocation(const std::vector<unsigned int>& didLocation_);
-    void reset_encrypted(void);
-    bool set_encrypted(bool encrypted_);
-
-  private:
-  
-    friend class ReadDID_requestMarshaller;
-
-
-///  Name of ECU.
-      unsigned int ecuName;	//!<  (0,65535)
-
-///  Get raw data from vehicle data DID location(s).
-      std::vector<unsigned int> didLocation;	//!<   [%s..%s]  (0,65535)
-
-/**
-     If not provided, the default is equal to False"
-     Indicates if the DID data requested should be returned as encrypted through an OnEncodedSYNCPData response.
-     If set to true, the data will return instead through OnEncodedSYNCPData and be passed through the proxy to the designated server URL.
-*/
-      bool* encrypted;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h
deleted file mode 100644
index db7dc33f6..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_READDID_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_READDID_RESPONSE_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "VehicleDataResultCode.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class ReadDID_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        ReadDID_response(const ReadDID_response& c);
-        ReadDID_response(void);
-
-        virtual ~ReadDID_response(void);
-
-        ReadDID_response& operator =(const ReadDID_response&);
-
-        bool checkIntegrity(void);
-
-        const std::vector<VehicleDataResultCode>* get_dataResult(void) const;
-        const std::vector<std::string>* get_data(void) const;
-
-        void reset_dataResult(void);
-        bool set_dataResult(const std::vector<VehicleDataResultCode>& dataResult_);
-        void reset_data(void);
-        bool set_data(const std::vector<std::string>& data_);
-
-    private:
-        friend class ReadDID_responseMarshaller;
-
-        ///  Permission status of data element.
-        std::vector<VehicleDataResultCode>* dataResult;   //!<   [%s..%s]
-
-        ///  Raw DID-based data returned for requested element.
-        std::vector<std::string>* data;   //!<   [%s..%s] (5000)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h
deleted file mode 100644
index 931b5f2dc..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_REGISTERAPPINTERFACE_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_REGISTERAPPINTERFACE_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "AppType.h"
-#include "Language.h"
-#include "SyncMsgVersion.h"
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Establishes an interface with a mobile application.
-     Before registerAppInterface no other commands will be accepted/executed.
-*/
-
-  class RegisterAppInterface_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    RegisterAppInterface_request(const RegisterAppInterface_request& c);
-    RegisterAppInterface_request(void);
-    
-    virtual ~RegisterAppInterface_request(void);
-  
-    RegisterAppInterface_request& operator =(const RegisterAppInterface_request&);
-  
-    bool checkIntegrity(void);
-
-    const SyncMsgVersion& get_syncMsgVersion(void) const;
-    const std::string& get_appName(void) const;
-    const std::vector<TTSChunk>* get_ttsName(void) const;
-    const std::string* get_ngnMediaScreenAppName(void) const;
-    const std::vector<std::string>* get_vrSynonyms(void) const;
-    bool get_isMediaApplication(void) const;
-    const Language& get_languageDesired(void) const;
-    const Language& get_hmiDisplayLanguageDesired(void) const;
-    const std::vector<AppType>* get_appType(void) const;
-    const std::string& get_appID(void) const;
-
-    bool set_syncMsgVersion(const SyncMsgVersion& syncMsgVersion_);
-    bool set_appName(const std::string& appName_);
-    void reset_ttsName(void);
-    bool set_ttsName(const std::vector<TTSChunk>& ttsName_);
-    void reset_ngnMediaScreenAppName(void);
-    bool set_ngnMediaScreenAppName(const std::string& ngnMediaScreenAppName_);
-    void reset_vrSynonyms(void);
-    bool set_vrSynonyms(const std::vector<std::string>& vrSynonyms_);
-    bool set_isMediaApplication(bool isMediaApplication_);
-    bool set_languageDesired(const Language& languageDesired_);
-    bool set_hmiDisplayLanguageDesired(const Language& hmiDisplayLanguageDesired_);
-    void reset_appType(void);
-    bool set_appType(const std::vector<AppType>& appType_);
-    bool set_appID(const std::string& appID_);
-
-  private:
-  
-    friend class RegisterAppInterface_requestMarshaller;
-
-
-///  See SyncMsgVersion
-      SyncMsgVersion syncMsgVersion;
-
-/**
-     The mobile application name, e.g. "Ford Drive Green".
-     Needs to be unique over all applications.
-     May not be empty.
-     May not start with a new line character.
-     May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)
-     Needs to be unique over all applications. Applications with the same name will be rejected.
-     Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.
-*/
-      std::string appName;	//!< (100)
-
-/**
-     TTS string for VR recognition of the mobile application name, e.g. "Ford Drive Green".
-     Meant to overcome any failing on speech engine in properly pronouncing / understanding app name.
-     Needs to be unique over all applications.
-     May not be empty.
-     May not start with a new line character.
-     May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)
-     Needs to be unique over all applications. Applications with the same name will be rejected.
-     Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.
-*/
-      std::vector<TTSChunk>* ttsName;	//!<   [%s..%s] 
-
-/**
-     Provides an abbreviated version of the app name (if needed), that will be displayed on the NGN media screen.
-     If not provided, the appName is used instead (and will be truncated if too long)
-     Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.
-*/
-      std::string* ngnMediaScreenAppName;	//!< (100)
-
-/**
-     Defines an additional voice recognition command.
-     May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)
-     Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.
-*/
-      std::vector<std::string>* vrSynonyms;	//!<   [%s..%s] (40)
-
-/**
-     Indicates if the application is a media or a non-media application.
-     Only media applications will be able to stream audio to Sync that is audible outside of the BT media source.
-*/
-      bool isMediaApplication;
-
-/**
-     See Language
-     Current app’s expected VR+TTS language
-     If there is a mismatch with SYNC, the app will be able to change this registration with changeRegistration prior to app being brought into focus.
-*/
-      Language languageDesired;
-
-/**
-     See Language
-     Current app’s expected display language
-     If there is a mismatch with SYNC, the app will be able to change this registration with changeRegistration prior to app being brought into focus.
-*/
-      Language hmiDisplayLanguageDesired;
-
-/**
-     See AppType
-     List of all applicable app types stating which classifications to be given to the app.
-     e.g. for platforms like GEN2, this will determine which "corner(s)" the app can populate.
-*/
-      std::vector<AppType>* appType;	//!<   [%s..%s] 
-
-///  ID used to validate app with policy table entries
-      std::string appID;	//!< (100)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h
deleted file mode 100644
index a2d310528..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h
+++ /dev/null
@@ -1,154 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_REGISTERAPPINTERFACE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_REGISTERAPPINTERFACE_RESPONSE_INCLUDE
-
-#include <vector>
-
-#include "ButtonCapabilities.h"
-#include "DisplayCapabilities.h"
-#include "HmiZoneCapabilities.h"
-#include "Language.h"
-#include "PresetBankCapabilities.h"
-#include "SoftButtonCapabilities.h"
-#include "SpeechCapabilities.h"
-#include "SyncMsgVersion.h"
-#include "VehicleType.h"
-#include "VrCapabilities.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    ///  The response to registerAppInterface
-    class RegisterAppInterface_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        RegisterAppInterface_response(const RegisterAppInterface_response& c);
-        RegisterAppInterface_response(void);
-
-        virtual ~RegisterAppInterface_response(void);
-
-        RegisterAppInterface_response& operator =(const RegisterAppInterface_response&);
-
-        bool checkIntegrity(void);
-
-        const SyncMsgVersion* get_syncMsgVersion(void) const;
-        const Language* get_language(void) const;
-        const Language* get_hmiDisplayLanguage(void) const;
-        const DisplayCapabilities* get_displayCapabilities(void) const;
-        const std::vector<ButtonCapabilities>* get_buttonCapabilities(void) const;
-        const std::vector<SoftButtonCapabilities>* get_softButtonCapabilities(void) const;
-        const PresetBankCapabilities* get_presetBankCapabilities(void) const;
-        const std::vector<HmiZoneCapabilities>* get_hmiZoneCapabilities(void) const;
-        const std::vector<SpeechCapabilities>* get_speechCapabilities(void) const;
-        const std::vector<VrCapabilities>* get_vrCapabilities(void) const;
-        const VehicleType* get_vehicleType(void) const;
-
-        void reset_syncMsgVersion(void);
-        bool set_syncMsgVersion(const SyncMsgVersion& syncMsgVersion_);
-        void reset_language(void);
-        bool set_language(const Language& language_);
-        void reset_hmiDisplayLanguage(void);
-        bool set_hmiDisplayLanguage(const Language& hmiDisplayLanguage_);
-        void reset_displayCapabilities(void);
-        bool set_displayCapabilities(const DisplayCapabilities& displayCapabilities_);
-        void reset_buttonCapabilities(void);
-        bool set_buttonCapabilities(const std::vector<ButtonCapabilities>& buttonCapabilities_);
-        void reset_softButtonCapabilities(void);
-        bool set_softButtonCapabilities(const std::vector<SoftButtonCapabilities>& softButtonCapabilities_);
-        void reset_presetBankCapabilities(void);
-        bool set_presetBankCapabilities(const PresetBankCapabilities& presetBankCapabilities_);
-        void reset_hmiZoneCapabilities(void);
-        bool set_hmiZoneCapabilities(const std::vector<HmiZoneCapabilities>& hmiZoneCapabilities_);
-        void reset_speechCapabilities(void);
-        bool set_speechCapabilities(const std::vector<SpeechCapabilities>& speechCapabilities_);
-        void reset_vrCapabilities(void);
-        bool set_vrCapabilities(const std::vector<VrCapabilities>& vrCapabilities_);
-        void reset_vehicleType(void);
-        bool set_vehicleType(const VehicleType& vehicleType_);
-
-    private:
-        friend class RegisterAppInterface_responseMarshaller;
-
-        ///  See SyncMsgVersion
-        SyncMsgVersion* syncMsgVersion;
-
-        ///  The currently active VR+TTS language on Sync. See "Language" for options.
-        Language* language;
-
-        ///  The currently active display language on Sync. See "Language" for       options.
-        Language* hmiDisplayLanguage;
-
-        ///  See DisplayCapabilities
-        DisplayCapabilities* displayCapabilities;
-
-        ///  See ButtonCapabilities
-        std::vector<ButtonCapabilities>* buttonCapabilities;  //!<   [%s..%s]
-
-        /**
-             If returned, the platform supports on-screen SoftButtons.
-             See SoftButtonCapabilities
-        */
-        std::vector<SoftButtonCapabilities>* softButtonCapabilities;  //!<   [%s..%s]
-
-        /**
-             If returned, the platform supports custom on-screen Presets.
-             See PresetBankCapabilities
-        */
-        PresetBankCapabilities* presetBankCapabilities;
-
-        ///  See HmiZoneCapabilities
-        std::vector<HmiZoneCapabilities>* hmiZoneCapabilities;    //!<   [%s..%s]
-
-        ///  See SpeechCapabilities
-        std::vector<SpeechCapabilities>* speechCapabilities;  //!<   [%s..%s]
-
-        ///  See VrCapabilities
-        std::vector<VrCapabilities>* vrCapabilities;  //!<   [%s..%s]
-
-        ///  Specifies the vehicle's type. See VehicleType.
-        VehicleType* vehicleType;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h
deleted file mode 100644
index 5e42e66c4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_RESETGLOBALPROPERTIES_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_RESETGLOBALPROPERTIES_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "GlobalProperty.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Allows resetting global properties.
-
-  class ResetGlobalProperties_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    ResetGlobalProperties_request(const ResetGlobalProperties_request& c);
-    ResetGlobalProperties_request(void);
-    
-    virtual ~ResetGlobalProperties_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<GlobalProperty>& get_properties(void) const;
-
-    bool set_properties(const std::vector<GlobalProperty>& properties_);
-
-  private:
-  
-    friend class ResetGlobalProperties_requestMarshaller;
-
-
-///  Contains the names of all global properties (like timeoutPrompt) that should be unset. Resetting means, that they have the same value as at start up (default)
-      std::vector<GlobalProperty> properties;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h
deleted file mode 100644
index a38d6d262..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_RESETGLOBALPROPERTIES_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_RESETGLOBALPROPERTIES_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class ResetGlobalProperties_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        ResetGlobalProperties_response(const ResetGlobalProperties_response& c);
-        ResetGlobalProperties_response(void);
-
-        virtual ~ResetGlobalProperties_response(void);
-
-        ResetGlobalProperties_response& operator =(const ResetGlobalProperties_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class ResetGlobalProperties_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Result.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Result.h
deleted file mode 100644
index 2f2f2e8b9..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Result.h
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_RESULT_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_RESULT_INCLUDE
-
-namespace NsSmartDeviceLinkRPC
-{
-    class Result;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-    class Result
-    {
-    public:
-        enum ResultInternal
-        {
-            INVALID_ENUM = -1,
-
-            ///  The request succeeded
-            SUCCESS = 0,
-
-            /**
-                 The data sent is invalid. For example
-                 Invalid Json syntax
-                 Parameters out of bounds (number or enum range)
-                 Mandatory parameters not provided
-                 Parameter provided with wrong type
-                 Invalid characters
-                 Empty string
-            */
-            INVALID_DATA = 1,
-
-            ///  The request is not supported by Sync
-            UNSUPPORTED_REQUEST = 2,
-
-            ///  The system could not process the request because the necessary memory couldn't be allocated
-            OUT_OF_MEMORY = 3,
-
-            ///  There are too many requests pending (means, that the response has not been delivered, yet).
-            TOO_MANY_PENDING_REQUESTS = 4,
-
-            /**
-                 One of the provided IDs is not valid. For example
-                 This applies to CorrelationID, SubscriptionID [@TODO if SubscriptionID is used], CommandID, MenuID, [@TODO: missed one?]
-            */
-            INVALID_ID = 5,
-
-            ///  There was a conflict with an registered name (application or menu item) or vr command
-            DUPLICATE_NAME = 6,
-
-            ///  There are already too many registered applications
-            TOO_MANY_APPLICATIONS = 7,
-
-            ///  RegisterApplication has been called again, after a RegisterApplication was successful before.
-            APPLICATION_REGISTERED_ALREADY = 8,
-
-            ///  Sync doesn't support the protocol that is requested by the mobile application
-            UNSUPPORTED_VERSION = 9,
-
-            /**
-                 The requested language is currently not supported.
-                 Might be because of a mismatch of the currently active language on Sync and the requested language
-            */
-            WRONG_LANGUAGE = 10,
-
-            ///  An command can not be executed because no application has been registered with RegisterApplication.
-            APPLICATION_NOT_REGISTERED = 11,
-
-            /**
-                 The data may not be changed, because it is currently in use.
-                 For example when trying to delete a command set that is currently involved in an interaction.
-            */
-            IN_USE = 12,
-
-            ///  The item to subscribe to is already subscribed to.
-            SUBSCRIBED_ALREADY = 13,
-
-            /**
-                 The requested command was rejected, e.g. because mobile app is in background and cannot perform any HMI commands.
-                 Or an HMI command (e.g. Speak) is rejected because a higher priority HMI command (e.g. Alert) is playing.
-            */
-            REJECTED = 14,
-
-            /**
-                 A command was aborted, for example due to user interaction (e.g. user pressed button).
-                 Or an HMI command (e.g. Speak) is aborted because a higher priority HMI command (e.g. Alert) was requested.
-            */
-            ABORTED = 15,
-
-            /**
-                 A command was ignored, because the intended result is already in effect.
-                 For example, SetMediaClockTimer was used to pause the media clock although the clock is paused already.
-                 NOTE: potentially replaces SUBSCRIBED_ALREADY
-            */
-            IGNORED = 16,
-
-            /**
-                 A button that was requested for subscription is not supported under the current system.
-                 NOTE: could become a more generic UNSUPPORTED_RESOURCE by merging with VEHIVLE_DATA_NOT_AVAILABLE.
-            */
-            UNSUPPORTED_BUTTON = 17,
-
-            ///  A specified file could not be found on Sync.
-            FILE_NOT_FOUND = 18,
-
-            ///  Provided data is valid but something went wrong in the lower layers.
-            GENERIC_ERROR = 19,
-
-            ///  The user has turned off access to vehicle data, and it is globally unavailable to mobile applications.
-            VEHICLE_DATA_NOT_ALLOWED = 20,
-
-            ///  The requested vehicle data is not available on this vehicle or is not published.
-            VEHICLE_DATA_NOT_AVAILABLE = 21,
-
-            ///  RPC is not authorized in local policy table.
-            DISALLOWED = 22,
-
-            ///  RPC is included in a functional group explicitly blocked by the user.
-            USER_DISALLOWED = 23,
-
-            ///  Overlay reached the maximum timeout and closed.
-            TIMED_OUT = 24,
-
-            ///  User selected to Cancel Route.
-            CANCEL_ROUTE = 25,
-
-            ///  User chose a Close command for the overlay.
-            CLOSED = 26,
-
-            /**
-                 The data is being returned through an OnEncodedSYNCPData notification.
-                 The data is intended to be passed by the proxy to the designated server URL.
-            */
-            ENCRYPTED = 27,
-
-            ///  The RPC (e.g. SubscribeVehicleData) executed successfully but one or more items have a warning or failure.
-            WARNINGS = 28,
-
-            RETRY = 29 // PerformAudioPassThru
-        };
-
-        Result();
-        Result(ResultInternal e);
-        Result(const Result& r);
-
-        ResultInternal get(void) const;
-        void set(ResultInternal e);
-
-        // TODO(AK): remove this after new code generation
-        operator NsSmartDeviceLinkRPC::Result();
-        Result& operator= (const Result& result);
-
-    private:
-        ResultInternal mInternal;
-        friend class ResultMarshaller;
-    };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SamplingRate.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SamplingRate.h
deleted file mode 100644
index e01cd2891..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SamplingRate.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SAMPLINGRATE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SAMPLINGRATE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Describes different sampling options for PerformAudioPassThru.
-
-  class SamplingRate
-  {
-  public:
-    enum SamplingRateInternal
-    {
-      INVALID_ENUM=-1,
-      FIX_8KHZ=0,
-      FIX_16KHZ=1,
-      FIX_22KHZ=2,
-      FIX_44KHZ=3
-    };
-  
-    SamplingRate() : mInternal(INVALID_ENUM)				{}
-    SamplingRate(SamplingRateInternal e) : mInternal(e)		{}
-  
-    SamplingRateInternal get(void) const	{ return mInternal; }
-    void set(SamplingRateInternal e)		{ mInternal=e; }
-  
-  private:
-    SamplingRateInternal mInternal;
-    friend class SamplingRateMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h
deleted file mode 100644
index b2b33f80f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SCROLLABLEMESSAGE_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SCROLLABLEMESSAGE_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "SoftButton.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Creates a full screen overlay containing a large block of formatted text that can be scrolled with up to 8 SoftButtons defined
-
-  class ScrollableMessage_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    ScrollableMessage_request(const ScrollableMessage_request& c);
-    ScrollableMessage_request(void);
-    
-    virtual ~ScrollableMessage_request(void);
-  
-    ScrollableMessage_request& operator =(const ScrollableMessage_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_scrollableMessageBody(void) const;
-    const unsigned int* get_timeout(void) const;
-    const std::vector<SoftButton>* get_softButtons(void) const;
-
-    bool set_scrollableMessageBody(const std::string& scrollableMessageBody_);
-    void reset_timeout(void);
-    bool set_timeout(unsigned int timeout_);
-    void reset_softButtons(void);
-    bool set_softButtons(const std::vector<SoftButton>& softButtons_);
-
-  private:
-  
-    friend class ScrollableMessage_requestMarshaller;
-
-
-///  Body of text that can include newlines and tabs.
-      std::string scrollableMessageBody;	//!< (500)
-
-///  App defined timeout.
-      unsigned int* timeout;	//!<  (0,65535)
-
-/**
-     App defined SoftButtons.
-     If omitted on supported displays, only the system defined "Close" SoftButton will be displayed.
-*/
-      std::vector<SoftButton>* softButtons;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h
deleted file mode 100644
index 643be3761..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SCROLLABLEMESSAGE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SCROLLABLEMESSAGE_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class ScrollableMessage_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        ScrollableMessage_response(const ScrollableMessage_response& c);
-        ScrollableMessage_response(void);
-
-        virtual ~ScrollableMessage_response(void);
-
-        ScrollableMessage_response& operator =(const ScrollableMessage_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class ScrollableMessage_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h
deleted file mode 100644
index c1838018f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETAPPICON_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETAPPICON_REQUEST_INCLUDE
-
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Used to set existing local file on SYNC as the app's icon
-     Not supported on first generation SYNC vehicles. 
-*/
-
-  class SetAppIcon_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    SetAppIcon_request(const SetAppIcon_request& c);
-    SetAppIcon_request(void);
-    
-    virtual ~SetAppIcon_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_syncFileName(void) const;
-
-    bool set_syncFileName(const std::string& syncFileName_);
-
-  private:
-  
-    friend class SetAppIcon_requestMarshaller;
-
-
-///  File reference name.
-      std::string syncFileName;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h
deleted file mode 100644
index a31c4705a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETAPPICON_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETAPPICON_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    /**
-         Response is sent, when the file data was copied (success case). Or when an error occured.
-         Not supported on First generation SYNC vehicles.
-         Response is sent, when the file data was copied (success case). Or when an error occured.
-         Not supported on First generation SYNC vehicles.
-    */
-    class SetAppIcon_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        SetAppIcon_response(const SetAppIcon_response& c);
-        SetAppIcon_response(void);
-
-        virtual ~SetAppIcon_response(void);
-
-        SetAppIcon_response& operator =(const SetAppIcon_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SetAppIcon_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h
deleted file mode 100644
index 2fbb4190a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETDISPLAYLAYOUT_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETDISPLAYLAYOUT_REQUEST_INCLUDE
-
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Used to set an alternate display layout.
-     If not sent, default screen for given platform will be shown.
-*/
-
-  class SetDisplayLayout_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    SetDisplayLayout_request(const SetDisplayLayout_request& c);
-    SetDisplayLayout_request(void);
-    
-    virtual ~SetDisplayLayout_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_displayLayout(void) const;
-
-    bool set_displayLayout(const std::string& displayLayout_);
-
-  private:
-  
-    friend class SetDisplayLayout_requestMarshaller;
-
-
-/**
-     Predefined or dynamically created screen layout.
-     Currently only predefined screen layouts are defined.
-     Predefined layouts include:
-       "ONSCREEN_PRESETS"
-         Custom screen containing app-defined onscreen presets.  Currently defined for GEN2.
-*/
-      std::string displayLayout;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h
deleted file mode 100644
index 137687cc5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETDISPLAYLAYOUT_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETDISPLAYLAYOUT_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class SetDisplayLayout_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        SetDisplayLayout_response(const SetDisplayLayout_response& c);
-        SetDisplayLayout_response(void);
-
-        virtual ~SetDisplayLayout_response(void);
-
-        SetDisplayLayout_response& operator =(const SetDisplayLayout_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SetDisplayLayout_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h
deleted file mode 100644
index bf87ef030..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETGLOBALPROPERTIES_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETGLOBALPROPERTIES_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "TTSChunk.h"
-#include "VrHelpItem.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Allows setting global properties.
-
-  class SetGlobalProperties_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    SetGlobalProperties_request(const SetGlobalProperties_request& c);
-    SetGlobalProperties_request(void);
-    
-    virtual ~SetGlobalProperties_request(void);
-  
-    SetGlobalProperties_request& operator =(const SetGlobalProperties_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<TTSChunk>* get_helpPrompt(void) const;
-    const std::vector<TTSChunk>* get_timeoutPrompt(void) const;
-    const std::string* get_vrHelpTitle(void) const;
-    const std::vector<VrHelpItem>* get_vrHelp(void) const;
-
-    void reset_helpPrompt(void);
-    bool set_helpPrompt(const std::vector<TTSChunk>& helpPrompt_);
-    void reset_timeoutPrompt(void);
-    bool set_timeoutPrompt(const std::vector<TTSChunk>& timeoutPrompt_);
-    void reset_vrHelpTitle(void);
-    bool set_vrHelpTitle(const std::string& vrHelpTitle_);
-    void reset_vrHelp(void);
-    bool set_vrHelp(const std::vector<VrHelpItem>& vrHelp_);
-
-  private:
-  
-    friend class SetGlobalProperties_requestMarshaller;
-
-
-/**
-     The help prompt.
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* helpPrompt;	//!<   [%s..%s] 
-
-/**
-     Help text for a wait timeout.
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* timeoutPrompt;	//!<   [%s..%s] 
-
-/**
-     VR Help Title text.
-     If omitted on supported displays, the default SYNC help title shall be used.
-*/
-      std::string* vrHelpTitle;	//!< (500)
-
-/**
-     VR Help Items.
-     If omitted on supported displays, the default SYNC generated help items shall be used.
-     If the list of VR Help Items contains nonsequential positions (e.g. [1,2,4]), the RPC shall be rejected.
-*/
-      std::vector<VrHelpItem>* vrHelp;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h
deleted file mode 100644
index fcaafff97..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETGLOBALPROPERTIES_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETGLOBALPROPERTIES_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class SetGlobalProperties_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        SetGlobalProperties_response(const SetGlobalProperties_response& c);
-        SetGlobalProperties_response(void);
-
-        virtual ~SetGlobalProperties_response(void);
-
-        SetGlobalProperties_response& operator =(const SetGlobalProperties_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SetGlobalProperties_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h
deleted file mode 100644
index 4f126a4f8..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETMEDIACLOCKTIMER_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETMEDIACLOCKTIMER_REQUEST_INCLUDE
-
-
-#include "StartTime.h"
-#include "UpdateMode.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Sets the initial media clock value and automatic update method.
-
-  class SetMediaClockTimer_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    SetMediaClockTimer_request(const SetMediaClockTimer_request& c);
-    SetMediaClockTimer_request(void);
-    
-    virtual ~SetMediaClockTimer_request(void);
-  
-    SetMediaClockTimer_request& operator =(const SetMediaClockTimer_request&);
-  
-    bool checkIntegrity(void);
-
-    const StartTime* get_startTime(void) const;
-    const UpdateMode& get_updateMode(void) const;
-
-    void reset_startTime(void);
-    bool set_startTime(const StartTime& startTime_);
-    bool set_updateMode(const UpdateMode& updateMode_);
-
-  private:
-  
-    friend class SetMediaClockTimer_requestMarshaller;
-
-
-/**
-     See StartTime
-     startTime must be provided for "COUNTUP" and "COUNTDOWN"
-     startTime will be ignored for "PAUSE", "RESUME", and "CLEAR"
-*/
-      StartTime* startTime;
-
-/**
-     Enumeration to control the media clock.
-     In case of pause, resume, or clear, the start time value is ignored and shall be left out.  For resume, the time continues with the same value as it was when paused.
-*/
-      UpdateMode updateMode;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h
deleted file mode 100644
index 9058c2a56..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETMEDIACLOCKTIMER_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETMEDIACLOCKTIMER_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class SetMediaClockTimer_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        SetMediaClockTimer_response(const SetMediaClockTimer_response& c);
-        SetMediaClockTimer_response(void);
-
-        virtual ~SetMediaClockTimer_response(void);
-
-        SetMediaClockTimer_response& operator =(const SetMediaClockTimer_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SetMediaClockTimer_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h
deleted file mode 100644
index 6ac2e6961..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SHOWCONSTANTTBT_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SHOWCONSTANTTBT_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "Image.h"
-#include "SoftButton.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class ShowConstantTBT_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    ShowConstantTBT_request(const ShowConstantTBT_request& c);
-    ShowConstantTBT_request(void);
-    
-    virtual ~ShowConstantTBT_request(void);
-  
-    ShowConstantTBT_request& operator =(const ShowConstantTBT_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string* get_navigationText1(void) const;
-    const std::string* get_navigationText2(void) const;
-    const std::string* get_eta(void) const;
-    const std::string* get_totalDistance(void) const;
-    const Image& get_turnIcon(void) const;
-    float get_distanceToManeuver(void) const;
-    float get_distanceToManeuverScale(void) const;
-    const bool* get_maneuverComplete(void) const;
-    const std::vector<SoftButton>& get_softButtons(void) const;
-
-    void reset_navigationText1(void);
-    bool set_navigationText1(const std::string& navigationText1_);
-    void reset_navigationText2(void);
-    bool set_navigationText2(const std::string& navigationText2_);
-    void reset_eta(void);
-    bool set_eta(const std::string& eta_);
-    void reset_totalDistance(void);
-    bool set_totalDistance(const std::string& totalDistance_);
-    bool set_turnIcon(const Image& turnIcon_);
-    bool set_distanceToManeuver(float distanceToManeuver_);
-    bool set_distanceToManeuverScale(float distanceToManeuverScale_);
-    void reset_maneuverComplete(void);
-    bool set_maneuverComplete(bool maneuverComplete_);
-    bool set_softButtons(const std::vector<SoftButton>& softButtons_);
-
-  private:
-  
-    friend class ShowConstantTBT_requestMarshaller;
-
-      std::string* navigationText1;	//!< (500)
-      std::string* navigationText2;	//!< (500)
-      std::string* eta;	//!< (500)
-      std::string* totalDistance;	//!< (500)
-      Image turnIcon;
-
-/**
-     Distance till next maneuver (starting from) from previous maneuver.
-     Used to calculate progress bar.
-*/
-      float distanceToManeuver;	//!<  (0,1000000000)
-
-/**
-     Fraction of distance till next maneuver (starting from when AlertManeuver is triggered).
-     Used to calculate progress bar.
-*/
-      float distanceToManeuverScale;	//!<  (0,1000000000)
-
-/**
-     If and when a maneuver has completed while an AlertManeuver is active, the app must send this value set to TRUE in order to clear the AlertManeuver overlay.
-     If omitted the value will be assumed as FALSE.
-*/
-      bool* maneuverComplete;
-
-/**
-     Three dynamic SoftButtons available (second SoftButton is fixed to "Turns").
-     If omitted on supported displays, the currently displayed SoftButton values will not change.
-*/
-      std::vector<SoftButton> softButtons;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h
deleted file mode 100644
index eb9b342ed..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SHOWCONSTANTTBT_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SHOWCONSTANTTBT_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class ShowConstantTBT_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        ShowConstantTBT_response(const ShowConstantTBT_response& c);
-        ShowConstantTBT_response(void);
-
-        virtual ~ShowConstantTBT_response(void);
-
-        ShowConstantTBT_response& operator =(const ShowConstantTBT_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class ShowConstantTBT_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Show_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Show_request.h
deleted file mode 100644
index 2126485e0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Show_request.h
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SHOW_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SHOW_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "Image.h"
-#include "SoftButton.h"
-#include "TextAlignment.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Updates the persistent display. Supported fields depend on display capabilities.
-
-  class Show_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    Show_request(const Show_request& c);
-    Show_request(void);
-    
-    virtual ~Show_request(void);
-  
-    Show_request& operator =(const Show_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string* get_mainField1(void) const;
-    const std::string* get_mainField2(void) const;
-    const std::string* get_mainField3(void) const;
-    const std::string* get_mainField4(void) const;
-    const TextAlignment* get_alignment(void) const;
-    const std::string* get_statusBar(void) const;
-    const std::string* get_mediaClock(void) const;
-    const std::string* get_mediaTrack(void) const;
-    const Image* get_graphic(void) const;
-    const std::vector<SoftButton>* get_softButtons(void) const;
-    const std::vector<std::string>* get_customPresets(void) const;
-
-    void reset_mainField1(void);
-    bool set_mainField1(const std::string& mainField1_);
-    void reset_mainField2(void);
-    bool set_mainField2(const std::string& mainField2_);
-    void reset_mainField3(void);
-    bool set_mainField3(const std::string& mainField3_);
-    void reset_mainField4(void);
-    bool set_mainField4(const std::string& mainField4_);
-    void reset_alignment(void);
-    bool set_alignment(const TextAlignment& alignment_);
-    void reset_statusBar(void);
-    bool set_statusBar(const std::string& statusBar_);
-    void reset_mediaClock(void);
-    bool set_mediaClock(const std::string& mediaClock_);
-    void reset_mediaTrack(void);
-    bool set_mediaTrack(const std::string& mediaTrack_);
-    void reset_graphic(void);
-    bool set_graphic(const Image& graphic_);
-    void reset_softButtons(void);
-    bool set_softButtons(const std::vector<SoftButton>& softButtons_);
-    void reset_customPresets(void);
-    bool set_customPresets(const std::vector<std::string>& customPresets_);
-
-  private:
-  
-    friend class Show_requestMarshaller;
-
-
-/**
-     The text that should be displayed in a single or upper display line.
-     If this text is not set, the text of mainField1 stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mainField1;	//!< (500)
-
-/**
-     The text that should be displayed on the second display line.
-     If this text is not set, the text of mainField2 stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mainField2;	//!< (500)
-
-/**
-     The text that should be displayed on the second "page" first display line.
-     If this text is not set, the text of mainField3 stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mainField3;	//!< (500)
-
-/**
-     The text that should be displayed on the second "page" second display line.
-     If this text is not set, the text of mainField4 stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mainField4;	//!< (500)
-
-/**
-     Specifies how mainField1 and mainField2 texts should be aligned on display.
-     If omitted, texts will be centered
-*/
-      TextAlignment* alignment;
-
-///  Requires investigation regarding the nav display capabilities. Potentially lower lowerStatusBar, upperStatusBar, titleBar, etc.
-      std::string* statusBar;	//!< (500)
-
-/**
-     Text value for MediaClock field. Has to be properly formatted by Mobile App according to Sync capabilities.
-     If this text is set, any automatic media clock updates previously set with SetMediaClockTimer will be stopped.
-*/
-      std::string* mediaClock;	//!< (500)
-
-/**
-     The text that should be displayed in the track field.
-     This field is only valid for media applications on NGN type ACMs.
-     If this text is not set, the text of mediaTrack stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mediaTrack;	//!< (500)
-
-/**
-     Image struct determining whether static or dynamic image to display in app.
-     If omitted on supported displays, the displayed graphic shall not change.
-*/
-      Image* graphic;
-
-/**
-     App defined SoftButtons.
-     If omitted on supported displays, the currently displayed SoftButton values will not change.
-*/
-      std::vector<SoftButton>* softButtons;	//!<   [%s..%s] 
-
-/**
-     App labeled on-screen presets (i.e. GEN2).
-     If omitted on supported displays, the presets will be shown as not defined.
-*/
-      std::vector<std::string>* customPresets;	//!<   [%s..%s] (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Show_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Show_response.h
deleted file mode 100644
index 8c44b8d5c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Show_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SHOW_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SHOW_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class Show_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        Show_response(const Show_response& c);
-        Show_response(void);
-
-        virtual ~Show_response(void);
-
-        Show_response& operator =(const Show_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class Show_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SingleTirePressureStatus.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SingleTirePressureStatus.h
deleted file mode 100644
index 435a56bf5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SingleTirePressureStatus.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SINGLETIREPRESSURESTATUS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SINGLETIREPRESSURESTATUS_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The pressure status of a tire.
-
-  class SingleTirePressureStatus
-  {
-  public:
-    enum SingleTirePressureStatusInternal
-    {
-      INVALID_ENUM=-1,
-      UNKNOWN=0,
-      NORMAL=1,
-      LOW=2,
-      FAULT=3,
-      NOT_SUPPORTED=4
-    };
-  
-    SingleTirePressureStatus() : mInternal(INVALID_ENUM)				{}
-    SingleTirePressureStatus(SingleTirePressureStatusInternal e) : mInternal(e)		{}
-  
-    SingleTirePressureStatusInternal get(void) const	{ return mInternal; }
-    void set(SingleTirePressureStatusInternal e)		{ mInternal=e; }
-  
-  private:
-    SingleTirePressureStatusInternal mInternal;
-    friend class SingleTirePressureStatusMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SingleTireStatus.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SingleTireStatus.h
deleted file mode 100644
index df99ace19..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SingleTireStatus.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SINGLETIRESTATUS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SINGLETIRESTATUS_INCLUDE
-
-
-#include "SingleTirePressureStatus.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class SingleTireStatus
-  {
-  public:
-  
-    SingleTireStatus(const SingleTireStatus& c);
-    SingleTireStatus(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    unsigned int get_pressure(void) const;
-    const SingleTirePressureStatus& get_status(void) const;
-
-// setters
-
-    bool set_pressure(unsigned int pressure_);
-    bool set_status(const SingleTirePressureStatus& status_);
-
-  private:
-
-    friend class SingleTireStatusMarshaller;
-
-
-///  The tire pressure in PSI.
-      unsigned int pressure;	//!<  (0,255)
-
-///  See SingleTirePressureStatus.
-      SingleTirePressureStatus status;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Slider_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Slider_request.h
deleted file mode 100644
index 3e7716d1d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Slider_request.h
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SLIDER_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SLIDER_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Creates a full screen or pop-up overlay (depending on platform) with a single user controlled slider.
-
-  class Slider_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    Slider_request(const Slider_request& c);
-    Slider_request(void);
-    
-    virtual ~Slider_request(void);
-  
-    Slider_request& operator =(const Slider_request&);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_numTicks(void) const;
-    unsigned int get_position(void) const;
-    const std::string& get_sliderHeader(void) const;
-    const std::vector<std::string>* get_sliderFooter(void) const;
-    unsigned int get_timeout(void) const;
-
-    bool set_numTicks(unsigned int numTicks_);
-    bool set_position(unsigned int position_);
-    bool set_sliderHeader(const std::string& sliderHeader_);
-    void reset_sliderFooter(void);
-    bool set_sliderFooter(const std::vector<std::string>& sliderFooter_);
-    bool set_timeout(unsigned int timeout_);
-
-  private:
-  
-    friend class Slider_requestMarshaller;
-
-
-///  Number of selectable items on a horizontal axis
-      unsigned int numTicks;	//!<  (2,26)
-
-///  Initial position of slider control (cannot exceed numTicks)
-      unsigned int position;	//!<  (1,26)
-
-///  Text header to display
-      std::string sliderHeader;	//!< (500)
-
-/**
-     Text footer to display (meant to display min/max threshold descriptors).
-     For a static text footer, only one footer string shall be provided in the array.
-     For a dynamic text footer, the number of footer text string in the array must match the numTicks value.
-     For a dynamic text footer, text array string should correlate with potential slider position index.
-     If omitted on supported displays, no footer text shall be displayed.
-*/
-      std::vector<std::string>* sliderFooter;	//!<   [%s..%s] (500)
-
-///  App defined timeout.
-      unsigned int timeout;	//!<  (0,65535)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Slider_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Slider_response.h
deleted file mode 100644
index e89602372..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Slider_response.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SLIDER_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SLIDER_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class Slider_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        Slider_response(const Slider_response& c);
-        Slider_response(void);
-
-        virtual ~Slider_response(void);
-
-        Slider_response& operator =(const Slider_response& c);
-
-        bool checkIntegrity(void);
-
-        unsigned int get_sliderPosition(void) const;
-        bool set_sliderPosition(unsigned int sliderPosition_);
-
-    private:
-        friend class Slider_responseMarshaller;
-
-        ///  Current slider value returned when saved or canceled
-        unsigned int sliderPosition;  //!<  (1,26)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButton.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButton.h
deleted file mode 100644
index 385ebe717..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButton.h
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SOFTBUTTON_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SOFTBUTTON_INCLUDE
-
-#include <string>
-
-#include "Image.h"
-#include "SystemAction.h"
-#include "SoftButtonType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class SoftButton
-  {
-  public:
-  
-    SoftButton(const SoftButton& c);
-    SoftButton(void);
-  
-    bool checkIntegrity(void);
-  
-    ~SoftButton(void);
-    SoftButton& operator =(const SoftButton&);
-
-// getters
-
-    const Image* get_image(void) const;
-    bool get_isHighlighted(void) const;
-    unsigned int get_softButtonID(void) const;
-    const SystemAction& get_systemAction(void) const;
-    const std::string* get_text(void) const;
-    const SoftButtonType& get_type(void) const;
-
-// setters
-
-    void reset_image(void);
-    bool set_image(const Image& image_);
-    bool set_isHighlighted(bool isHighlighted_);
-    bool set_softButtonID(unsigned int softButtonID_);
-    bool set_systemAction(const SystemAction& systemAction_);
-    void reset_text(void);
-    bool set_text(const std::string& text_);
-    bool set_type(const SoftButtonType& type_);
-
-  private:
-
-    friend class SoftButtonMarshaller;
-
-
-///  Optional image struct for SoftButton (if defined as IMAGE or BOTH)
-      Image* image;
-
-/**
-     True, if highlighted
-     False, if not highlighted
-*/
-      bool isHighlighted;
-
-///  Value which is returned via OnButtonPress / OnButtonEvent
-      unsigned int softButtonID;	//!<  (0,65536)
-
-///  Parameter indicating whether selecting a SoftButton shall call a specific system action.  This is intended to allow Notifications to bring the callee into full / focus; or in the case of persistent overlays, the overlay can persist when a SoftButton is pressed.
-      SystemAction systemAction;
-
-///  Optional text to display (if defined as TEXT or BOTH)
-      std::string* text;	//!< (500)
-
-///  Describes, whether it is text, highlighted text, icon, or dynamic image. See softButtonType
-      SoftButtonType type;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h
deleted file mode 100644
index 241fccb47..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SOFTBUTTONCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SOFTBUTTONCAPABILITIES_INCLUDE
-
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about a SoftButton's capabilities.
-
-  class SoftButtonCapabilities
-  {
-  public:
-  
-    SoftButtonCapabilities(const SoftButtonCapabilities& c);
-    SoftButtonCapabilities(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    bool get_imageSupported(void) const;
-    bool get_longPressAvailable(void) const;
-    bool get_shortPressAvailable(void) const;
-    bool get_upDownAvailable(void) const;
-
-// setters
-
-    bool set_imageSupported(bool imageSupported_);
-    bool set_longPressAvailable(bool longPressAvailable_);
-    bool set_shortPressAvailable(bool shortPressAvailable_);
-    bool set_upDownAvailable(bool upDownAvailable_);
-
-  private:
-
-    friend class SoftButtonCapabilitiesMarshaller;
-
-
-///  The button supports referencing a static or dynamic image.
-      bool imageSupported;
-
-/**
-     The button supports a LONG press.
-     Whenever the button is pressed long, onButtonPressed( LONG) will be invoked.
-*/
-      bool longPressAvailable;
-
-/**
-     The button supports a short press.
-     Whenever the button is pressed short, onButtonPressed( SHORT) will be invoked.
-*/
-      bool shortPressAvailable;
-
-/**
-     The button supports "button down" and "button up".
-     Whenever the button is pressed, onButtonEvent( DOWN) will be invoked.
-     Whenever the button is released, onButtonEvent( UP) will be invoked.
-*/
-      bool upDownAvailable;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButtonType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButtonType.h
deleted file mode 100644
index 06843f8f3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButtonType.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SOFTBUTTONTYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SOFTBUTTONTYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about the SoftButton capabilities.
-
-  class SoftButtonType
-  {
-  public:
-    enum SoftButtonTypeInternal
-    {
-      INVALID_ENUM=-1,
-      SBT_TEXT=0,
-      SBT_IMAGE=1,
-      SBT_BOTH=2
-    };
-  
-    SoftButtonType() : mInternal(INVALID_ENUM)				{}
-    SoftButtonType(SoftButtonTypeInternal e) : mInternal(e)		{}
-  
-    SoftButtonTypeInternal get(void) const	{ return mInternal; }
-    void set(SoftButtonTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    SoftButtonTypeInternal mInternal;
-    friend class SoftButtonTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Speak_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Speak_request.h
deleted file mode 100644
index 71859f874..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Speak_request.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SPEAK_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SPEAK_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Speaks a text.
-
-  class Speak_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    Speak_request(const Speak_request& c);
-    Speak_request(void);
-    
-    virtual ~Speak_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<TTSChunk>& get_ttsChunks(void) const;
-
-    bool set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_);
-
-  private:
-  
-    friend class Speak_requestMarshaller;
-
-
-/**
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk> ttsChunks;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Speak_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Speak_response.h
deleted file mode 100644
index 055a65f68..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Speak_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SPEAK_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SPEAK_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-  class Speak_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-  {
-  public:
-    Speak_response(const Speak_response& c);
-    Speak_response(void);
-
-    virtual ~Speak_response(void);
-
-    Speak_response& operator =(const Speak_response&);
-
-    bool checkIntegrity(void);
-
-  private:
-    friend class Speak_responseMarshaller;
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SpeechCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SpeechCapabilities.h
deleted file mode 100644
index ce2de5e03..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SpeechCapabilities.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SPEECHCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SPEECHCAPABILITIES_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about the TTS capabilities.
-
-  class SpeechCapabilities
-  {
-  public:
-    enum SpeechCapabilitiesInternal
-    {
-      INVALID_ENUM=-1,
-      SC_TEXT=0,
-      SAPI_PHONEMES=1,
-      LHPLUS_PHONEMES=2,
-      PRE_RECORDED=3,
-      SILENCE=4
-    };
-  
-    SpeechCapabilities() : mInternal(INVALID_ENUM)				{}
-    SpeechCapabilities(SpeechCapabilitiesInternal e) : mInternal(e)		{}
-  
-    SpeechCapabilitiesInternal get(void) const	{ return mInternal; }
-    void set(SpeechCapabilitiesInternal e)		{ mInternal=e; }
-  
-  private:
-    SpeechCapabilitiesInternal mInternal;
-    friend class SpeechCapabilitiesMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/StartTime.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/StartTime.h
deleted file mode 100644
index 34b36e17f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/StartTime.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_STARTTIME_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_STARTTIME_INCLUDE
-
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class StartTime
-  {
-  public:
-  
-    StartTime(const StartTime& c);
-    StartTime(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    unsigned int get_hours(void) const;
-    unsigned int get_minutes(void) const;
-    unsigned int get_seconds(void) const;
-
-// setters
-
-    bool set_hours(unsigned int hours_);
-    bool set_minutes(unsigned int minutes_);
-    bool set_seconds(unsigned int seconds_);
-
-  private:
-
-    friend class StartTimeMarshaller;
-
-
-/**
-     The hour of the media clock.
-     Some radios only support a max of 19 hours. If out of range, it will be rejected.
-*/
-      unsigned int hours;	//!<  (0,59)
-      unsigned int minutes;	//!<  (0,59)
-      unsigned int seconds;	//!<  (0,59)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h
deleted file mode 100644
index 4135977c0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SUBSCRIBEBUTTON_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SUBSCRIBEBUTTON_REQUEST_INCLUDE
-
-
-#include "ButtonName.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Subscribes to built-in HMI buttons.
-     The application will be notified by the OnButtonEvent and OnButtonPress.
-     To unsubscribe the notifications, use unsubscribeButton.
-*/
-
-  class SubscribeButton_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    SubscribeButton_request(const SubscribeButton_request& c);
-    SubscribeButton_request(void);
-    
-    virtual ~SubscribeButton_request(void);
-  
-    bool checkIntegrity(void);
-
-    const ButtonName& get_buttonName(void) const;
-
-    bool set_buttonName(const ButtonName& buttonName_);
-
-  private:
-  
-    friend class SubscribeButton_requestMarshaller;
-
-
-///  Name of the button to subscribe.
-      ButtonName buttonName;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h
deleted file mode 100644
index 9b90948de..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SUBSCRIBEBUTTON_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SUBSCRIBEBUTTON_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class SubscribeButton_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        SubscribeButton_response(const SubscribeButton_response& c);
-        SubscribeButton_response(void);
-
-        virtual ~SubscribeButton_response(void);
-
-        SubscribeButton_response& operator =(const SubscribeButton_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SubscribeButton_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h
deleted file mode 100644
index 1f6357440..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SUBSCRIBEVEHICLEDATA_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SUBSCRIBEVEHICLEDATA_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "VehicleDataType.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Subscribes for specific published data items.
-     The data will be only sent if it has changed.
-     The application will be notified by the onVehicleData notification whenever new data is available.
-     To unsubscribe the notifications, use unsubscribe with the same subscriptionType.
-*/
-
-  class SubscribeVehicleData_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    SubscribeVehicleData_request(const SubscribeVehicleData_request& c);
-    SubscribeVehicleData_request(void);
-    
-    virtual ~SubscribeVehicleData_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<VehicleDataType>& get_dataType(void) const;
-
-    bool set_dataType(const std::vector<VehicleDataType>& dataType_);
-
-  private:
-  
-    friend class SubscribeVehicleData_requestMarshaller;
-
-
-/**
-     List of defined vehicle data elements.
-     See VehicleDataType
-*/
-      std::vector<VehicleDataType> dataType;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h
deleted file mode 100644
index 7ed881c86..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SUBSCRIBEVEHICLEDATA_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SUBSCRIBEVEHICLEDATA_RESPONSE_INCLUDE
-
-#include <vector>
-
-#include "VehicleDataResult.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class SubscribeVehicleData_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        SubscribeVehicleData_response(const SubscribeVehicleData_response& c);
-        SubscribeVehicleData_response(void);
-
-        virtual ~SubscribeVehicleData_response(void);
-
-        SubscribeVehicleData_response& operator =(const SubscribeVehicleData_response&);
-
-        bool checkIntegrity(void);
-
-        const std::vector<VehicleDataResult>* get_dataResult(void) const;
-        void reset_dataResult(void);
-        bool set_dataResult(const std::vector<VehicleDataResult>& dataResult_);
-
-    private:
-        friend class SubscribeVehicleData_responseMarshaller;
-
-        ///  Permission status of vehicle data element.
-        std::vector<VehicleDataResult>* dataResult;   //!<   [%s..%s]
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SyncMsgVersion.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SyncMsgVersion.h
deleted file mode 100644
index 92b5c8ced..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SyncMsgVersion.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SYNCMSGVERSION_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SYNCMSGVERSION_INCLUDE
-
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Specifies the version number of the SYNC V4 protocol, that is supported by the mobile application
-
-  class SyncMsgVersion
-  {
-  public:
-  
-    SyncMsgVersion(const SyncMsgVersion& c);
-    SyncMsgVersion(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    unsigned int get_majorVersion(void) const;
-    unsigned int get_minorVersion(void) const;
-
-// setters
-
-    bool set_majorVersion(unsigned int majorVersion_);
-    bool set_minorVersion(unsigned int minorVersion_);
-
-  private:
-
-    friend class SyncMsgVersionMarshaller;
-
-
-///  The major version indicates versions that is not-compatible to previous versions.
-      unsigned int majorVersion;	//!<  (1,10)
-
-///  The minor version indicates a change to a previous version that should still allow to be run on an older version (with limited functionality)
-      unsigned int minorVersion;	//!<  (0,1000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SystemAction.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SystemAction.h
deleted file mode 100644
index c5a8aece2..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SystemAction.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SYSTEMACTION_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SYSTEMACTION_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration that describes system actions that can be triggered.
-
-  class SystemAction
-  {
-  public:
-    enum SystemActionInternal
-    {
-      INVALID_ENUM=-1,
-
-///  Default action occurs.  Standard behavior (e.g. SoftButton clears overlay).
-      DEFAULT_ACTION=0,
-
-///  App is brought into HMI_FULL.
-      STEAL_FOCUS=1,
-
-///  Current system context is maintained.  An overlay is persisted even though a SoftButton has been pressed and the notification sent.
-      KEEP_CONTEXT=2
-    };
-  
-    SystemAction() : mInternal(INVALID_ENUM)				{}
-    SystemAction(SystemActionInternal e) : mInternal(e)		{}
-  
-    SystemActionInternal get(void) const	{ return mInternal; }
-    void set(SystemActionInternal e)		{ mInternal=e; }
-  
-  private:
-    SystemActionInternal mInternal;
-    friend class SystemActionMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SystemContext.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SystemContext.h
deleted file mode 100644
index 0316dbaba..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SystemContext.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SYSTEMCONTEXT_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SYSTEMCONTEXT_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Enumeration that describes possible contexts an app's HMI might be in.
-     Communicated to whichever app is in HMI FULL, except Alert.
-*/
-
-  class SystemContext
-  {
-  public:
-    enum SystemContextInternal
-    {
-      INVALID_ENUM=-1,
-
-///  The app's persistent display (whether media/non-media/navigation) is fully visible onscreen.
-      SYSCTXT_MAIN=0,
-
-///  The system is currently in a VR session (with whatever dedicated VR screen being overlaid onscreen).
-      SYSCTXT_VRSESSION=1,
-
-///  The system is currently displaying a system or in-App menu onscreen.
-      SYSCTXT_MENU=2,
-
-///  The app's display HMI is currently being obscured by either a system or other app's overlay.
-      SYSCTXT_HMI_OBSCURED=3,
-
-///  Broadcast only to whichever app has an alert currently being displayed.
-      SYSCTXT_ALERT=4,
-      NOT_AUDIBLE=5,
-      AUDIBLE=6
-    };
-
-    SystemContext() : mInternal(INVALID_ENUM)				{}
-    SystemContext(SystemContextInternal e) : mInternal(e)		{}
-
-    SystemContextInternal get(void) const	{ return mInternal; }
-    void set(SystemContextInternal e)		{ mInternal=e; }
-
-  private:
-    SystemContextInternal mInternal;
-    friend class SystemContextMarshaller;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TBTState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TBTState.h
deleted file mode 100644
index d0127c36b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TBTState.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TBTSTATE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TBTSTATE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration that describes possible states of turn-by-turn client or SmartDeviceLink app.
-
-  class TBTState
-  {
-  public:
-    enum TBTStateInternal
-    {
-      INVALID_ENUM=-1,
-      ROUTE_UPDATE_REQUEST=0,
-      ROUTE_ACCEPTED=1,
-      ROUTE_REFUSED=2,
-      ROUTE_CANCELLED=3,
-      ETA_REQUEST=4,
-      NEXT_TURN_REQUEST=5,
-      ROUTE_STATUS_REQUEST=6,
-      ROUTE_SUMMARY_REQUEST=7,
-      TRIP_STATUS_REQUEST=8,
-      ROUTE_UPDATE_REQUEST_TIMEOUT=9
-    };
-  
-    TBTState() : mInternal(INVALID_ENUM)				{}
-    TBTState(TBTStateInternal e) : mInternal(e)		{}
-  
-    TBTStateInternal get(void) const	{ return mInternal; }
-    void set(TBTStateInternal e)		{ mInternal=e; }
-  
-  private:
-    TBTStateInternal mInternal;
-    friend class TBTStateMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h
deleted file mode 100644
index d07f1ad53..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TTSCHUNK_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TTSCHUNK_INCLUDE
-
-#include <string>
-
-#include "SpeechCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  A TTS chunk, that consists of the text/phonemes to speak and the type (like text or SAPI)
-
-  class TTSChunk
-  {
-  public:
-  
-    TTSChunk(const TTSChunk& c);
-    TTSChunk(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const std::string& get_text(void) const;
-    const SpeechCapabilities& get_type(void) const;
-
-// setters
-
-    bool set_text(const std::string& text_);
-    bool set_type(const SpeechCapabilities& type_);
-
-  private:
-
-    friend class TTSChunkMarshaller;
-
-
-/**
-     The text or phonemes to speak.
-     May not be empty.
-*/
-      std::string text;	//!< (500)
-
-///  Describes, whether it is text or a specific phoneme set. See SpeechCapabilities
-      SpeechCapabilities type;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextAlignment.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextAlignment.h
deleted file mode 100644
index a530de074..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextAlignment.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TEXTALIGNMENT_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TEXTALIGNMENT_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The list of possible alignments, left, right, or centered
-
-  class TextAlignment
-  {
-  public:
-    enum TextAlignmentInternal
-    {
-      INVALID_ENUM=-1,
-      LEFT_ALIGNED=0,
-      RIGHT_ALIGNED=1,
-      CENTERED=2
-    };
-  
-    TextAlignment() : mInternal(INVALID_ENUM)				{}
-    TextAlignment(TextAlignmentInternal e) : mInternal(e)		{}
-  
-    TextAlignmentInternal get(void) const	{ return mInternal; }
-    void set(TextAlignmentInternal e)		{ mInternal=e; }
-  
-  private:
-    TextAlignmentInternal mInternal;
-    friend class TextAlignmentMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextField.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextField.h
deleted file mode 100644
index 1c5ce12c6..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextField.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TEXTFIELD_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TEXTFIELD_INCLUDE
-
-
-#include "CharacterSet.h"
-#include "TextFieldName.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class TextField
-  {
-  public:
-  
-    TextField(const TextField& c);
-    TextField(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const CharacterSet& get_characterSet(void) const;
-    const TextFieldName& get_name(void) const;
-    unsigned int get_rows(void) const;
-    unsigned int get_width(void) const;
-
-// setters
-
-    bool set_characterSet(const CharacterSet& characterSet_);
-    bool set_name(const TextFieldName& name_);
-    bool set_rows(unsigned int rows_);
-    bool set_width(unsigned int width_);
-
-  private:
-
-    friend class TextFieldMarshaller;
-
-
-///  The character set that is supported in this field. See CharacterSet.
-      CharacterSet characterSet;
-
-///  The name that identifies the field. See TextFieldName.
-      TextFieldName name;
-
-///  The number of rows of this field.
-      unsigned int rows;	//!<  (1,3)
-
-///  The number of characters in one row of this field.
-      unsigned int width;	//!<  (1,500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextFieldName.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextFieldName.h
deleted file mode 100644
index eac2142e3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextFieldName.h
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TEXTFIELDNAME_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TEXTFIELDNAME_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class TextFieldName
-  {
-  public:
-    enum TextFieldNameInternal
-    {
-      INVALID_ENUM=-1,
-
-/**
-     The first line of first set of main fields of the persistent display
-     Applies to "Show"
-*/
-      mainField1=0,
-
-/**
-     The second line of first set of main fields of the persistent display
-     Applies to "Show"
-*/
-      mainField2=1,
-
-/**
-     The first line of second set of main fields of persistent display
-     Applies to "Show"
-*/
-      mainField3=2,
-
-/**
-     The second line of second set of main fields of the persistent display
-     Applies to "Show"
-*/
-      mainField4=3,
-
-/**
-     The status bar on Nav
-     Applies to "Show"
-*/
-      statusBar=4,
-
-/**
-     Text value for MediaClock field.
-     Applies to "Show"
-*/
-      mediaClock=5,
-
-/**
-     The track field of NGN type ACMs.
-     This field is only available for media applications.
-     Applies to "Show"
-*/
-      mediaTrack=6,
-
-/**
-     The first line of the alert text field
-     Applies to "Alert"
-*/
-      alertText1=7,
-
-/**
-     The second line of the alert text field
-     Applies to "Alert"
-*/
-      alertText2=8,
-
-/**
-     The third line of the alert text field
-     Applies to "Alert"
-*/
-      alertText3=9,
-
-/**
-      Long form body of text that can include newlines and tabs.
-     Applies to "ScrollableMessage"
-*/
-      scrollableMessageBody=10,
-
-///   First line suggestion for a user response (in the case of VR enabled interaction
-      initialInteractionText=11,
-
-///   First line of navigation text
-      navigationText1=12,
-
-///   Second line of navigation text
-      navigationText2=13,
-
-///   Estimated Time of Arrival time for navigation
-      ETA=14,
-
-///   Total distance to destination for navigation
-      totalDistance=15,
-
-///   First line of text for audio pass thru
-      audioPassThruDisplayText1=16,
-
-///   Second line of text for audio pass thru
-      audioPassThruDisplayText2=17,
-
-///   Header text for slider
-      sliderHeader=18,
-
-///   Footer text for slider
-      sliderFooter=19
-    };
-  
-    TextFieldName() : mInternal(INVALID_ENUM)				{}
-    TextFieldName(TextFieldNameInternal e) : mInternal(e)		{}
-  
-    TextFieldNameInternal get(void) const	{ return mInternal; }
-    void set(TextFieldNameInternal e)		{ mInternal=e; }
-  
-  private:
-    TextFieldNameInternal mInternal;
-    friend class TextFieldNameMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TimerMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TimerMode.h
deleted file mode 100644
index edfe14190..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TimerMode.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TIMERMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TIMERMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Causes the media clock timer to update from 0:00 to a specified time
-     Causes the media clock timer to update from a specified time to 0:00
-     Indicates to not use the media clock timer
-*/
-
-  class TimerMode
-  {
-  public:
-    enum TimerModeInternal
-    {
-      INVALID_ENUM=-1,
-      UP=0,
-      DOWN=1,
-      NONE=2
-    };
-  
-    TimerMode() : mInternal(INVALID_ENUM)				{}
-    TimerMode(TimerModeInternal e) : mInternal(e)		{}
-  
-    TimerModeInternal get(void) const	{ return mInternal; }
-    void set(TimerModeInternal e)		{ mInternal=e; }
-  
-  private:
-    TimerModeInternal mInternal;
-    friend class TimerModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TirePressureTellTale.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TirePressureTellTale.h
deleted file mode 100644
index 4a358edd5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TirePressureTellTale.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TIREPRESSURETELLTALE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TIREPRESSURETELLTALE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Reflects the status of the cluster instrument warning light.
-
-  class TirePressureTellTale
-  {
-  public:
-    enum TirePressureTellTaleInternal
-    {
-      INVALID_ENUM=-1,
-      OFF=0,
-      ON=1,
-      FLASH=2
-    };
-  
-    TirePressureTellTale() : mInternal(INVALID_ENUM)				{}
-    TirePressureTellTale(TirePressureTellTaleInternal e) : mInternal(e)		{}
-  
-    TirePressureTellTaleInternal get(void) const	{ return mInternal; }
-    void set(TirePressureTellTaleInternal e)		{ mInternal=e; }
-  
-  private:
-    TirePressureTellTaleInternal mInternal;
-    friend class TirePressureTellTaleMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TireStatus.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TireStatus.h
deleted file mode 100644
index f07dc6f11..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TireStatus.h
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TIRESTATUS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TIRESTATUS_INCLUDE
-
-
-#include "SingleTireStatus.h"
-#include "SingleTireStatus.h"
-#include "SingleTireStatus.h"
-#include "SingleTireStatus.h"
-#include "TirePressureTellTale.h"
-#include "SingleTireStatus.h"
-#include "SingleTireStatus.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The status and pressure of the tires.
-
-  class TireStatus
-  {
-  public:
-  
-    TireStatus(const TireStatus& c);
-    TireStatus(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const SingleTireStatus& get_innerLeftRear(void) const;
-    const SingleTireStatus& get_innerRightRear(void) const;
-    const SingleTireStatus& get_leftFront(void) const;
-    const SingleTireStatus& get_leftRear(void) const;
-    const TirePressureTellTale& get_pressureTellTale(void) const;
-    const SingleTireStatus& get_rightFront(void) const;
-    const SingleTireStatus& get_rightRear(void) const;
-
-// setters
-
-    bool set_innerLeftRear(const SingleTireStatus& innerLeftRear_);
-    bool set_innerRightRear(const SingleTireStatus& innerRightRear_);
-    bool set_leftFront(const SingleTireStatus& leftFront_);
-    bool set_leftRear(const SingleTireStatus& leftRear_);
-    bool set_pressureTellTale(const TirePressureTellTale& pressureTellTale_);
-    bool set_rightFront(const SingleTireStatus& rightFront_);
-    bool set_rightRear(const SingleTireStatus& rightRear_);
-
-  private:
-
-    friend class TireStatusMarshaller;
-
-
-///  The status of the inner left rear.
-      SingleTireStatus innerLeftRear;
-
-///  The status of the inner right rear.
-      SingleTireStatus innerRightRear;
-
-///  The status of the left front tire.
-      SingleTireStatus leftFront;
-
-///  The status of the left rear tire.
-      SingleTireStatus leftRear;
-
-///  See TirePressureTellTale.
-      TirePressureTellTale pressureTellTale;
-
-///  The status of the right front tire.
-      SingleTireStatus rightFront;
-
-///  The status of the right rear tire.
-      SingleTireStatus rightRear;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TriggerSource.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TriggerSource.h
deleted file mode 100644
index 55dfaa9bf..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TriggerSource.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TRIGGERSOURCE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TRIGGERSOURCE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Indicates the source from where the command was triggered.
-
-  class TriggerSource
-  {
-  public:
-    enum TriggerSourceInternal
-    {
-      INVALID_ENUM=-1,
-      TS_MENU=0,
-      TS_VR=1
-    };
-  
-    TriggerSource() : mInternal(INVALID_ENUM)				{}
-    TriggerSource(TriggerSourceInternal e) : mInternal(e)		{}
-  
-    TriggerSourceInternal get(void) const	{ return mInternal; }
-    void set(TriggerSourceInternal e)		{ mInternal=e; }
-  
-  private:
-    TriggerSourceInternal mInternal;
-    friend class TriggerSourceMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Turn.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Turn.h
deleted file mode 100644
index 175989086..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Turn.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TURN_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TURN_INCLUDE
-
-#include <string>
-
-#include "Image.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class Turn
-  {
-  public:
-  
-    Turn(const Turn& c);
-    Turn(void);
-  
-    bool checkIntegrity(void);
-  
-    ~Turn(void);
-    Turn& operator =(const Turn&);
-
-// getters
-
-    const std::string* get_navigationText(void) const;
-    const Image& get_turnIcon(void) const;
-
-// setters
-
-    void reset_navigationText(void);
-    bool set_navigationText(const std::string& navigationText_);
-    bool set_turnIcon(const Image& turnIcon_);
-
-  private:
-
-    friend class TurnMarshaller;
-
-      std::string* navigationText;	//!< (500)
-      Image turnIcon;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h
deleted file mode 100644
index e2db1562a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UNREGISTERAPPINTERFACE_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UNREGISTERAPPINTERFACE_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Closes an interface from a mobile application.
-     After unregisterAppInterface, no commands other than registerAppInterface will be accepted/executed.
-     Will fail, if no registerAppInterface was completed successfully before.
-*/
-
-  class UnregisterAppInterface_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    UnregisterAppInterface_request(const UnregisterAppInterface_request& c);
-    UnregisterAppInterface_request(void);
-    
-    virtual ~UnregisterAppInterface_request(void);
-  
-    bool checkIntegrity(void);
-
-
-
-  private:
-  
-    friend class UnregisterAppInterface_requestMarshaller;
-
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h
deleted file mode 100644
index 93bb3b4b7..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UNREGISTERAPPINTERFACE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UNREGISTERAPPINTERFACE_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class UnregisterAppInterface_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        UnregisterAppInterface_response(const UnregisterAppInterface_response& c);
-        UnregisterAppInterface_response(void);
-
-        virtual ~UnregisterAppInterface_response(void);
-
-        UnregisterAppInterface_response& operator =(const UnregisterAppInterface_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class UnregisterAppInterface_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h
deleted file mode 100644
index 526d5f4a1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEBUTTON_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEBUTTON_REQUEST_INCLUDE
-
-
-#include "ButtonName.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Unsubscribes from built-in HMI buttons.
-
-  class UnsubscribeButton_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    UnsubscribeButton_request(const UnsubscribeButton_request& c);
-    UnsubscribeButton_request(void);
-    
-    virtual ~UnsubscribeButton_request(void);
-  
-    bool checkIntegrity(void);
-
-    const ButtonName& get_buttonName(void) const;
-
-    bool set_buttonName(const ButtonName& buttonName_);
-
-  private:
-  
-    friend class UnsubscribeButton_requestMarshaller;
-
-
-///  Name of the button to unsubscribe.
-      ButtonName buttonName;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h
deleted file mode 100644
index 77acbd6df..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEBUTTON_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEBUTTON_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class UnsubscribeButton_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        UnsubscribeButton_response(const UnsubscribeButton_response& c);
-        UnsubscribeButton_response(void);
-
-        virtual ~UnsubscribeButton_response(void);
-
-        UnsubscribeButton_response& operator =(const UnsubscribeButton_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class UnsubscribeButton_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h
deleted file mode 100644
index 0c015589c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEVEHICLEDATA_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEVEHICLEDATA_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "VehicleDataType.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  This function is used to unsubscribe the notifications from the subscribeVehicleData function.
-
-  class UnsubscribeVehicleData_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    UnsubscribeVehicleData_request(const UnsubscribeVehicleData_request& c);
-    UnsubscribeVehicleData_request(void);
-    
-    virtual ~UnsubscribeVehicleData_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<VehicleDataType>& get_dataType(void) const;
-
-    bool set_dataType(const std::vector<VehicleDataType>& dataType_);
-
-  private:
-  
-    friend class UnsubscribeVehicleData_requestMarshaller;
-
-
-/**
-     Refers to the vehicle data elements specified by subscribeVehicleData.
-     See VehicleDataType
-*/
-      std::vector<VehicleDataType> dataType;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h
deleted file mode 100644
index e572a03c6..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEVEHICLEDATA_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEVEHICLEDATA_RESPONSE_INCLUDE
-
-#include <vector>
-
-#include "VehicleDataResult.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class UnsubscribeVehicleData_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        UnsubscribeVehicleData_response(const UnsubscribeVehicleData_response& c);
-        UnsubscribeVehicleData_response(void);
-
-        virtual ~UnsubscribeVehicleData_response(void);
-
-        UnsubscribeVehicleData_response& operator =(const UnsubscribeVehicleData_response&);
-
-        bool checkIntegrity(void);
-
-        const std::vector<VehicleDataResult>* get_dataResult(void) const;
-        void reset_dataResult(void);
-        bool set_dataResult(const std::vector<VehicleDataResult>& dataResult_);
-
-    private:
-        friend class UnsubscribeVehicleData_responseMarshaller;
-
-        ///  Permission status of vehicle data element.
-        std::vector<VehicleDataResult>* dataResult;   //!<   [%s..%s]
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateMode.h
deleted file mode 100644
index 36cff01fd..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateMode.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UPDATEMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UPDATEMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Describes how the media clock timer should behave on the platform
-     Starts the media clock timer counting upwards, as in time elapsed.
-     Starts the media clock timer counting downwards, as in time remaining.
-     Pauses the media clock timer
-     Resume the media clock timer
-     Clears the media clock timer (previously done through Show->mediaClock)
-*/
-
-  class UpdateMode
-  {
-  public:
-    enum UpdateModeInternal
-    {
-      INVALID_ENUM=-1,
-      COUNTUP=0,
-      COUNTDOWN=1,
-      PAUSE=2,
-      RESUME=3,
-      CLEAR=4
-    };
-  
-    UpdateMode() : mInternal(INVALID_ENUM)				{}
-    UpdateMode(UpdateModeInternal e) : mInternal(e)		{}
-  
-    UpdateModeInternal get(void) const	{ return mInternal; }
-    void set(UpdateModeInternal e)		{ mInternal=e; }
-  
-  private:
-    UpdateModeInternal mInternal;
-    friend class UpdateModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h
deleted file mode 100644
index ee77b9e84..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UPDATETURNLIST_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UPDATETURNLIST_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "SoftButton.h"
-#include "Turn.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class UpdateTurnList_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    UpdateTurnList_request(const UpdateTurnList_request& c);
-    UpdateTurnList_request(void);
-    
-    virtual ~UpdateTurnList_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<Turn>& get_turnList(void) const;
-    const std::vector<SoftButton>& get_softButtons(void) const;
-
-    bool set_turnList(const std::vector<Turn>& turnList_);
-    bool set_softButtons(const std::vector<SoftButton>& softButtons_);
-
-  private:
-  
-    friend class UpdateTurnList_requestMarshaller;
-
-      std::vector<Turn> turnList;	//!<   [%s..%s] 
-
-///  If omitted on supported displays, app-defined SoftButton will be left blank.
-      std::vector<SoftButton> softButtons;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h
deleted file mode 100644
index c4afa90b1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UPDATETURNLIST_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UPDATETURNLIST_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class UpdateTurnList_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        UpdateTurnList_response(const UpdateTurnList_response& c);
-        UpdateTurnList_response(void);
-
-        virtual ~UpdateTurnList_response(void);
-
-        UpdateTurnList_response& operator =(const UpdateTurnList_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class UpdateTurnList_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataResult.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataResult.h
deleted file mode 100644
index e88e99ae1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataResult.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_VEHICLEDATARESULT_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_VEHICLEDATARESULT_INCLUDE
-
-
-#include "VehicleDataType.h"
-#include "VehicleDataResultCode.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Individual published data request result
-
-  class VehicleDataResult
-  {
-  public:
-  
-    VehicleDataResult(const VehicleDataResult& c);
-    VehicleDataResult(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const VehicleDataType& get_dataType(void) const;
-    const VehicleDataResultCode& get_resultCode(void) const;
-
-// setters
-
-    bool set_dataType(const VehicleDataType& dataType_);
-    bool set_resultCode(const VehicleDataResultCode& resultCode_);
-
-  private:
-
-    friend class VehicleDataResultMarshaller;
-
-
-///  Defined published data element type.
-      VehicleDataType dataType;
-
-///  Published data result code.
-      VehicleDataResultCode resultCode;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataResultCode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataResultCode.h
deleted file mode 100644
index d07a6abd0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataResultCode.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_VEHICLEDATARESULTCODE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_VEHICLEDATARESULTCODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration that describes possible result codes of a vehicle data entry request.
-
-  class VehicleDataResultCode
-  {
-  public:
-    enum VehicleDataResultCodeInternal
-    {
-      INVALID_ENUM=-1,
-      VDRC_SUCCESS=0,
-      VDRC_DISALLOWED=1,
-      VDRC_USER_DISALLOWED=2,
-      VDRC_INVALID_ID=3,
-      VDRC_DATA_NOT_AVAILABLE=4,
-      VDRC_DATA_ALREADY_SUBSCRIBED=5,
-      VDRC_DATA_NOT_SUBSCRIBED=6,
-      VDRC_IGNORED=7
-    };
-  
-    VehicleDataResultCode() : mInternal(INVALID_ENUM)				{}
-    VehicleDataResultCode(VehicleDataResultCodeInternal e) : mInternal(e)		{}
-  
-    VehicleDataResultCodeInternal get(void) const	{ return mInternal; }
-    void set(VehicleDataResultCodeInternal e)		{ mInternal=e; }
-  
-  private:
-    VehicleDataResultCodeInternal mInternal;
-    friend class VehicleDataResultCodeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataType.h
deleted file mode 100644
index f99d291c4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataType.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_VEHICLEDATATYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_VEHICLEDATATYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Defines the data types that can be published and subscribed to.
-
-  class VehicleDataType
-  {
-  public:
-    enum VehicleDataTypeInternal
-    {
-      INVALID_ENUM=-1,
-
-/**
-     Notifies GPSData
-     may be subscribed
-*/
-      VEHICLEDATA_GPS=0,
-      VEHICLEDATA_SPEED=1,
-      VEHICLEDATA_FUELLEVEL=2,
-      VEHICLEDATA_FUELECONOMY=3,
-      VEHICLEDATA_ENGINERPM=4,
-      VEHICLEDATA_BATTVOLTS=5,
-      VEHICLEDATA_RAINSENSOR=6,
-      VEHICLEDATA_ODOMETER=7,
-      VEHICLEDATA_VIN=8,
-      VEHICLEDATA_EXTERNTEMP=9,
-      VEHICLEDATA_PRNDLSTATUS=10,
-      VEHICLEDATA_TIREPRESSURE=11,
-
-///  Battery pack voltage of hybrid and electrical vehicles
-      VEHICLEDATA_BATTERYPACKVOLTAGE=12,
-
-///  Battery current of hybrid and electrical vehicles
-      VEHICLEDATA_BATTERYCURRENT=13,
-
-///  Battery temperature of hybrid and electrical vehicles
-      VEHICLEDATA_BATTERYTEMPERATURE=14,
-
-///  Satellite radio serial number (ESN)
-      VEHICLEDATA_SATESN=15
-    };
-  
-    VehicleDataType() : mInternal(INVALID_ENUM)				{}
-    VehicleDataType(VehicleDataTypeInternal e) : mInternal(e)		{}
-  
-    VehicleDataTypeInternal get(void) const	{ return mInternal; }
-    void set(VehicleDataTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    VehicleDataTypeInternal mInternal;
-    friend class VehicleDataTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleType.h
deleted file mode 100644
index 56f133ff4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleType.h
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_VEHICLETYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_VEHICLETYPE_INCLUDE
-
-#include <string>
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class VehicleType
-  {
-  public:
-  
-    VehicleType(const VehicleType& c);
-    VehicleType(void);
-  
-    bool checkIntegrity(void);
-  
-    ~VehicleType(void);
-    VehicleType& operator =(const VehicleType&);
-
-// getters
-
-    const std::string* get_make(void) const;
-    const std::string* get_model(void) const;
-    const std::string* get_modelYear(void) const;
-    const std::string* get_trim(void) const;
-
-// setters
-
-    void reset_make(void);
-    bool set_make(const std::string& make_);
-    void reset_model(void);
-    bool set_model(const std::string& model_);
-    void reset_modelYear(void);
-    bool set_modelYear(const std::string& modelYear_);
-    void reset_trim(void);
-    bool set_trim(const std::string& trim_);
-
-  private:
-
-    friend class VehicleTypeMarshaller;
-
-
-/**
-     Make of the vehicle
-     e.g. Ford
-*/
-      std::string* make;	//!< (500)
-
-/**
-     Model of the vehicle
-     e.g. Fiesta
-*/
-      std::string* model;	//!< (500)
-
-/**
-     Model Year of the vehicle
-     e.g. 2013
-*/
-      std::string* modelYear;	//!< (500)
-
-/**
-     Trim of the vehicle
-     e.g. SE
-*/
-      std::string* trim;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VrCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VrCapabilities.h
deleted file mode 100644
index 9d4b9bc8a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VrCapabilities.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_VRCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_VRCAPABILITIES_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about the VR capabilities.
-
-  class VrCapabilities
-  {
-  public:
-    enum VrCapabilitiesInternal
-    {
-      INVALID_ENUM=-1,
-      VR_TEXT=0
-    };
-  
-    VrCapabilities() : mInternal(INVALID_ENUM)				{}
-    VrCapabilities(VrCapabilitiesInternal e) : mInternal(e)		{}
-  
-    VrCapabilitiesInternal get(void) const	{ return mInternal; }
-    void set(VrCapabilitiesInternal e)		{ mInternal=e; }
-  
-  private:
-    VrCapabilitiesInternal mInternal;
-    friend class VrCapabilitiesMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h
deleted file mode 100644
index 8050e5289..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_VRHELPITEM_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_VRHELPITEM_INCLUDE
-
-#include <string>
-
-#include "Image.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class VrHelpItem
-  {
-  public:
-  
-    VrHelpItem(const VrHelpItem& c);
-    VrHelpItem(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const Image& get_image(void) const;
-    unsigned int get_position(void) const;
-    const std::string& get_text(void) const;
-
-// setters
-
-    bool set_image(const Image& image_);
-    bool set_position(unsigned int position_);
-    bool set_text(const std::string& text_);
-
-  private:
-
-    friend class VrHelpItemMarshaller;
-
-
-///  Image struct for VR Help item
-      Image image;
-
-///  Position to display item in VR Help list
-      unsigned int position;	//!<  (1,8)
-
-///  Text to display for VR Help item
-      std::string text;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/messageType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/messageType.h
deleted file mode 100644
index 0cdc7c6ef..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/messageType.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_MESSAGETYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_MESSAGETYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Enumeration linking message types with function types in WiPro protocol.
-     Assumes enumeration starts at value 0.
-*/
-
-  class messageType
-  {
-  public:
-    enum messageTypeInternal
-    {
-      INVALID_ENUM=-1,
-      request=0,
-      response=1,
-      notification=2
-    };
-  
-    messageType() : mInternal(INVALID_ENUM)				{}
-    messageType(messageTypeInternal e) : mInternal(e)		{}
-  
-    messageTypeInternal get(void) const	{ return mInternal; }
-    void set(messageTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    messageTypeInternal mInternal;
-    friend class messageTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCRequest.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCRequest.h
deleted file mode 100644
index 085eee34a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCRequest.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
-* \file SDLRPCRequest.hpp
-* \brief Class SDLRPCRequest header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef ALRPCREQUEST_INCLUDE
-#define ALRPCREQUEST_INCLUDE
-
-#include "SDLRPCMessage.h"
-
-/**
-  *\namespace NsSmartDeviceLinkRPC
-  *\brief Namespace for SmartDeviceLink JSON protocol related functionality.
-*/
-namespace NsSmartDeviceLinkRPC
-{
-    /**
-     * \class SDLRPCRequest
-     * \brief Base class for SmartDeviceLink Json request messages.
-    */
-    class SDLRPCRequest : public SDLRPCMessage
-    {
-    public:
-        /**
-         * \brief Constructor
-         * \param protocolVersion Version of protocol (currently 1,2)
-        */
-        SDLRPCRequest( unsigned int protocolVersion );
-
-        /**
-         * \brief Constructor
-         * \param protocolVersion Version of protocol (currently 1,2)
-         * \param methodID Id of RPC called by message
-        */
-        SDLRPCRequest( unsigned int protocolVersion, int methodId);
-
-        /**
-         * \brief Default Constructor
-        */
-        SDLRPCRequest(void);
-
-        /**
-         * \brief Destructor
-        */
-        virtual ~SDLRPCRequest();
-
-        /**
-         * \brief Getter for correlation id of JSON message.
-         * \return correlation id of JSON message.
-         */
-        virtual unsigned int getCorrelationID() const;
-
-        /**
-         * \brief Setter for correlation id of JSON message.
-         * \param correlationID Correlation ID of JSON message.
-         * \return type description
-         */
-        virtual void setCorrelationID( unsigned int correlationID );
-
-    private:
-        /**
-          *\brief Correlation id of JSON message.
-        */
-        unsigned int 	mCorrelationID;
-
-    };
-
-}
-
-#endif  // ALRPCREQUEST_INCLUDE
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCResponse.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCResponse.h
deleted file mode 100644
index ec6f195de..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCResponse.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
-* \file SDLRPCResponse.h
-* \brief Class SDLRPCResponse header.
-* Copyright (c) 2013, Ford Motor Company
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of the Ford Motor Company nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef ALRPCRESPONSE_INCLUDE
-#define ALRPCRESPONSE_INCLUDE
-
-#include <string>
-#include "SDLRPCMessage.h"
-#include "JSONHandler/SDLRPCObjects/V2/Result.h"
-
-/**
-  *\namespace NsSmartDeviceLinkRPC
-  *\brief Namespace for SmartDeviceLink JSON protocol related functionality.
-*/
-namespace NsSmartDeviceLinkRPC
-{
-    /**
-     * \class SDLRPCResponse
-     * \brief Base class for SmartDeviceLink Json response message classes.
-    */
-    class SDLRPCResponse : public SDLRPCMessage
-    {
-    public:
-        /**
-         * \brief Constructor
-         * \param protocolVersion Version of protocol in message.
-        */
-        SDLRPCResponse(unsigned int protocolVersion);
-
-        /**
-         * \brief Constructor
-         * \param protocolVersion Version of protocol in message.
-         * \param methodID ID of RPC called by message.
-        */
-        SDLRPCResponse(unsigned int protocolVersion, int methodID);
-
-        /**
-         * \brief Default Constructor
-        */
-        SDLRPCResponse(void);
-
-        /**
-         * \brief Destructor
-        */
-        virtual ~SDLRPCResponse();
-
-        /**
-         * \brief Getter for correlation id.
-         * \return Correlation ID of Json Message
-         */
-        virtual unsigned int getCorrelationID() const;
-
-        /**
-         * \brief Setter for correlation id.
-         * \param correlationID Correlation ID of Json message
-         */
-        virtual void setCorrelationID(unsigned int correlationID);
-
-        bool get_success(void) const;
-        const NsSmartDeviceLinkRPCV2::Result& get_resultCode(void) const;
-        const std::string* get_info(void) const;
-
-        bool set_success(bool success_);
-        bool set_resultCode(const NsSmartDeviceLinkRPCV2::Result& resultCode_);
-
-        void reset_info(void);
-        bool set_info(const std::string& info_);
-
-    protected:
-        /**
-          *\brief Correlation Id of Json message.
-        */
-        unsigned int    mCorrelationID;
-
-        /**
-        true, if successful
-        false, if failed
-        */
-        bool success;
-
-        ///  See Result
-        NsSmartDeviceLinkRPCV2::Result resultCode;
-
-        ///  Provides additional human readable info regarding the result.
-        std::string* info;    //!< (1000)
-    };
-}
-
-#endif  // ALRPCRESPONSE_INCLUDE
diff --git a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/convertGpRPC.sh b/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/convertGpRPC.sh
deleted file mode 100755
index bec91390d..000000000
--- a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/convertGpRPC.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-x=`ls ../src/RPC2ObjectsImpl/*.gp`
-echo $x
-for fx in $x
-do
-	filename="${fx%.*}"
-	echo $filename
-	gperf $fx --output-file=$filename.inc
-done
diff --git a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/convertGpSDLink.sh b/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/convertGpSDLink.sh
deleted file mode 100755
index 59451bb1d..000000000
--- a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/convertGpSDLink.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-x=`ls ../src/SDLRPCObjectsImpl/V2/*.gp`
-echo $x
-for fx in $x
-do
-	filename="${fx%.*}"
-	echo $filename
-	gperf $fx --output-file=$filename.inc
-done
diff --git a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/scripts/idlgen.yp b/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/scripts/idlgen.yp
deleted file mode 100755
index a1faaee8c..000000000
--- a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/scripts/idlgen.yp
+++ /dev/null
@@ -1,1652 +0,0 @@
-#!/usr/bin/yapp
-# $Id$
-
-%{
- use IO::Handle;
- use Data::Dumper;
- use File::Spec;
- use Cwd;
-
-  sub lex_open;
-  sub lex_close;
-  sub lex_next;
-
-%}
-# _number _ident raw comment
-%%
-
-
-all:	interface						{  [$_[1]];}
-|	all interface						{ push @{$_[1]},$_[2]; $_[1]; }
-;
-
-interface:	'interface' namespace '{'  prefix_section  main_section	 '}'		{ { 'name' => $_[2], 'defs' => $_[4], 'data' => $_[5]}; }
-;
-
-prefix_section: prefix_section_item				{ [$_[1]]; }
-|		prefix_section prefix_section_item		{ push @{$_[1]},$_[2]; $_[1]; }
-;
-
-prefix_section_item:	'version' _string ';'			{ [$_[1],$_[2]];}
-|			'prefix' _string ';'			{ [$_[1],$_[2]];}
-;
-
-namespace:	_ident						{ $_[1];}
-|		namespace '::' _ident				{  sprintf "%s::%s",$_[1],$_[3]; }
-;
-
-main_section:	definition					{ [$_[1]]; }
-|		main_section definition				{ push @{$_[1]},$_[2]; $_[1]; }
-;
-
-definition:	notword _ident '(' arglist2 ')' ';'		{ ['method',0, $_[2], $_[4]]; }
-|		 _ident '(' arglist2 ')' ';'			{ ['method',1, $_[1], $_[3], []]; }
-|		 _ident '(' arglist2 delim arglist2 ')' ';'	{ ['method',1, $_[1], $_[3], $_[5]]; }
-;
-
-
-notword:	'oneway'
-|		'notification'
-;
-
-delim:		'->' | ';'
-;
-
-
-arglist2:						{ [];}
-|		arglist					{ $_[1]; }
-;
-
-arglist:	arg					{ [$_[1]];}
-|		arglist ',' arg				{ push @{$_[1]},$_[3];$_[1];}
-;
-
-arg:		type constraint pointer _ident array	{ [$_[1],$_[2],$_[3],$_[4],$_[5]];}
-;
-
-
-type:		'bool'					{ 'b'; }
-|		'unsigned' 'int'			{ 'u' }
-|		'int'					{ 'i' }
-|		'string' 				{ 's';}
-|		'float'					{ 'f'; }
-|		_ident					{ [$_[1]]; }
-;
-
-constraint:						{ [undef,undef]; }
-|		'(' _number cd _number ')'		{ [$_[2],$_[4]]; }
-|		'(' cd _number ')'			{ [undef,$_[3]]; }
-|		'(' _number cd ')'			{ [$_[2],undef]; }
-|		'(' _number ')'				{ [undef,$_[2]]; }
-;
-
-
-cd:		':'					{ $_[1]; }
-|		'~'					{ $_[1]; }
-;
-
-pointer:						{ ''; }
-|		'*'					{ '*'; }
-;
-
-array:							{ ''; }
-|		'[' ']'					{ [0,undef]; }
-|		'[' _number cd _number ']'		{ [$_[2],$_[4]]; }
-|		'[' cd _number ']'			{ [undef,$_[3]]; }
-|		'[' _number cd ']'			{ [$_[2],undef]; }
-|		'[' _number ']'				{ [undef,$_[2]]; }
-;
-
-%%
-
-
-use strict;
-
-sub lex_open
-{
-  my $fn=shift;
-
-my $lx=
-{
-  'keywords'=> [
-              '(::|;|-\>|\[|\]|\)|\(|\*|:|,|\{|\})',
-	      '(interface)',
-	      '(int)',
-	      '(unsigned)',
-	      '(bool)',
-	      '(float)',
-	      '(string)',
-	      '(version)',
-#	      '(using)',
-	      '(prefix)',
-	      '(notification)',
-	      '(oneway)'
-             ],
-  'tokens'=> { 
-#           _number => '(\-?\d+)', 
-#           _dnumber => '(\-?((\d+\.\d*)|(\.\d+))([eE]\-?\d+)?)',
-           _number => #'(\-?((\d+\.\d*)|(\.\d+))([eE]\-?\d+)?)',
-                       '(\-?((\d+\.\d*)|(\.\d+)|(\d+))([eE]\-?\d+)?)',
-           _ident => '([a-zA-Z][a-zA-Z_0-9]*)', 
-#           _inumber => '(\-?\d+)', 
-#           _pinumber => '(\d+)', 
-           _string =>"\"(([^\\\\\"]|(\\\\(([abfnrtvUEu'\"?\\\\])|([0-7]{1,3})|(x[0-9a-fA-F]+))))*?)\""
-	   },
-
-  'file' => $fn,
-  'cfile'=> $fn,
-  'line' => 0,
-  'input' => ''
-};
-
-  $lx->{'fh'}=IO::Handle->new();
-#  open($lx->{'fh'},'<',$lx->{'file'}) or die "Can't open file ".$lx->{'file'};
-  open($lx->{'fh'},'-|',sprintf('cpp %s',$lx->{'file'})) or die "Can't open file ".$lx->{'file'};
-  return $lx;
-}
-
-
-sub lex_close
-{
-  my $lx=shift;
-  
-  die if not ref $lx;
-  close $lx->{'fh'};
-}
-
-
-sub lex_next
-{
-  my $lx=shift;
-  
-  while(1)
-  {
-    if(not $lx->{'input'})
-    {
-      my $f=$lx->{'fh'};
-      do
-      {
-        $lx->{'input'}=<$f>;
-        $lx->{'line'}++;
-        return undef if not defined $lx->{'input'};
-        if($lx->{'input'}=~/^#\s+(\d+)\s+"(.+)"/)
-        {
-          $lx->{'cfile'}=$2;
-          $lx->{'line'}=$1;
-          $lx->{'input'}='';
-          redo;
-        }
-        
-        $lx->{'input'}=~s/^\s+//;
-        $lx->{'input'}=~s/\n+$//gs;
-      } while($lx->{'input'}=~/^\s*$/);
-    }
-
-   my $k;
-   for $k (@{$lx->{'keywords'}})
-   {
-     return ($1,$1) if($lx->{input}=~s/^\s*$k$//);
-     return ($1,$1) if($lx->{input}=~s/^\s*$k\s+//);
-     return ($1,$1) if($lx->{input}=~s/^\s*$k\b//);
-#     return ($1,$1) if($lx->{input}=~s/^\s*$k//);
-     return ($1,$1) if($lx->{input}=~s/^\s*$k(\W)/$2/);
-   }
-
-   for $k (sort keys %{$lx->{'tokens'}})
-   {
-      my $v=$lx->{'tokens'}->{$k};
-      return ($k,$1) if($lx->{input}=~s/^\s*$v\s*//);
-   }
-   die sprintf "lexer error at %s:%u\n>>>%s",$lx->{'cfile'},$lx->{'line'},$lx->{'input'};
-  }
-}
-
-
-
-sub _Error {
-    my $self=shift;
-=pod=
-        exists $self->YYData->{'ERRMSG'}
-    and do {
-        print $self->YYData->{'ERRMSG'};
-        delete $self->YYData->{'ERRMSG'};
-        return;
-    };
-=cut=    
-    die sprintf "Syntax error in %s:%u\nCurtok:\t'%s':\nCurval:\t'%s':\nExpected:\t'%s':\n",
-          $self->YYData->{'DATA'}[0]->{'cfile'},
-	  $self->YYData->{'DATA'}[0]->{'line'},
-          ($self->YYCurtok),($self->YYCurval),($self->YYExpect);
-
-#    printf STDERR "File:%s\nLine:%s\n",$self->YYData->{DATA}[0]->{'curfilename'},
-#	  $self->YYData->{DATA}[0]->{'curline'};
-#   die Dumper($self->YYCurtok,$self->YYCurval,$self->YYExpect,$self->YYData->{DATA}[0]);
-}
-
-sub _Lexer {
-    my($parser)=shift;
-    return lex_next($parser->YYData->{'DATA'}[0]);
-}
-
-sub Run {
-    my($self)=shift;
-    my $fname=shift;
-    my $lx=lex_open($fname);
-
-
-    $self->YYData->{'DATA'}=[$lx];
-    my $rv=$self->YYParse( 'yylex' => \&_Lexer, 'yyerror' => \&_Error
-#          ,yydebug => 0x1f
-           );
-   lex_close($lx);
-   return $rv;
-}
-
-package main;
-use Data::Dumper;
-
-
-my %config;
-
-# args parse
-sub args_parse
-{
-   my @args=@ARGV;
-   my $t;
-   while($t=shift @args)
-   {
-     if($t eq '-i')    {  $config{'idl'}=shift @args;   next;   }
-     if($t eq '-o')   {  $config{'gen'}=shift @args; $config{'pimpl'}=shift @args; $config{'lib'}=shift @args; next; }
-     if($t eq '-f')   {  $config{'alrpc'}=shift @args; $config{'aimpl'}=shift @args; next; }
-     if($t eq '-b')   {  $config{'base'}=shift @args; next; }
-
-     if($t eq '-n')   {  $config{'ns'}=shift @args; next; }
-     if($t eq '-fn')   {  $config{'nsa'}=shift @args; next; }
-     if($t eq '-g')    {  $config{'pragma'}=1;   next;   }
-     if($t eq '-s')   {  $config{'style'}=shift @args; next; }
-     if($t eq '-sh')   {  $config{'sh'}=shift @args; next; }
-     if($t eq '-sc')   {  $config{'sc'}=shift @args; next; }
-     if($t eq '-ee')   {  $config{'ee'}=1; next; }
-#     if($t eq '-a')   {  $config{'abs'}=1; next; }
-     if($t eq '-m')   {   $config{'mk'}=shift @args; next; }
-
-     die 'unknown in command line '.$t;
-   }
-}
-
-args_parse();
-
-die 'no input' if not exists $config{'idl'};
-die sprintf "cant open input idl %s",$config{'idl'} if not -e $config{'idl'};
-
-die 'path not defined' if $config{'lib'} eq '';
-
-$config{'base'}='rpc2' if not exists $config{'base'};
-$config{'gen'}='include' if not exists $config{'gen'};
-$config{'pimpl'}='src' if not exists $config{'pimpl'};
-
-
-my $parser=new idlgen;
-
-my $list=$parser->Run($config{'idl'});
-
-# .o files dependencies
-my $mkdep=[];
-# all files with path
-my $mklist=[];
-
-my %data;
-my %global;
-my %funcs;
-my %wire;
-
-foreach(@$list)
-{
-  die sprintf "duplicate interface name %s in idl",$_->{'name'} if exists $data{$_->{'name'}};
-  my $p=$_;
-  $data{$p->{'name'}}={};
-  
-  if(exists $p->{'defs'})
-  {
-    foreach(@{$p->{'defs'}})
-    {
-      printf STDERR "warning, %s redefined to %s in interface %s\n",$_->[0],$_->[1],$p->{'name'}  if exists $data{$p->{'name'}}->{$_->[0]};
-      $data{$p->{'name'}}->{$_->[0]}=$_->[1];
-    }
-  }
-  else
-  {
-    $data{$p->{'name'}}->{'version'}='not defined';
-    $data{$p->{'name'}}->{'prefix'}='';
-  }
-  $data{$p->{'name'}}->{'funcs'}={};
-  
-  if(not exists $p->{'data'} or @{$p->{'data'}}==0)
-  {
-     printf STDERR "warning, no methods defined in interface %s\n",$p->{'name'};
-     next;
-  }
-  foreach(@{$p->{'data'}})
-  {
-    my $t=$_;
-    shift @$t;
-    die sprintf "method %s defined twice at interface %s",$t->[1],$p->{'name'} if exists $data{$p->{'name'}}->{'funcs'}->{$t->[1]};
-    my $fqn=sprintf "%s%s",$data{$p->{'name'}}->{'prefix'},$t->[1];
-    printf STDERR "methods %s and %s in interfaces %s and %s have same wire name %s",$t->[1],$wire{$fqn}->[1],$p->{'name'},$wire{$fqn}->[0],$fqn
-              if exists $wire{$fqn};
-    $wire{$fqn}=[$p->{'name'},$t->[1]];
-    $data{$p->{'name'}}->{'funcs'}->{$t->[1]}=$t;
-  }
-}
-
-sub interface;
-
-
-my ($path,$pimpl,$lib,$p2i,$i2p,$i2l,$i2a,$p2a,$p2p,$p2m);
-
-my ($ns,$nsa,$timemod,$pragma);
-
-my $sh=exists $config{'sh'} ? $config{'sh'} : 'hh';
-my $sc=exists $config{'sc'} ? $config{'sc'} : 'cc';
-my $timestamp=gmtime(time());
-
-$pragma = sprintf "#pragma GCC dependency \"%s\"\n\n",Cwd::realpath($config{'idl'}) if exists $config{'pragma'};
-
-{
-  my @a=stat $config{'idl'};
-  $timemod=gmtime(@a[9]);
-  undef @a;
-}
-
-sub getfort
-{
-  my $x=`fortune -s`;
-
-  $x=~s/\*\//* \//gs;
-  $x=~s/\/\*/\/ \*/gs;
-  return $x eq '' ? '' : sprintf "/*\n%s*/\n\n",$x;
-}
-
-my $dd=`ddate`;
-$dd=~s/\n/ /gs;
-
-my $lib=$config{'lib'};
-$lib ='lib' if $lib eq '';
-$lib=~s/\/$//;
-$lib.='/';
-
-my $base=$config{'base'};
-$base=~s/\/\//\//;
-$base=~s/\/$//;
-$base.='/';
-
-$p2m=sprintf "%s/%s/",$config{'base'},$config{'gen'};
-$p2m=~s/\/\//\//;$p2m=~s/\/$//;$p2m.='/';
-
-my %json=(
-  'f' => 'Double',
-  'i' => 'Int',
-  'u' => 'Int',
-  'b' => 'Bool',
-  's' => 'String'
-);
-
-my %json2=(
-  'f' => 'Numeric',
-  'i' => 'Int',
-  'u' => 'Int',
-  'b' => 'Bool',
-  's' => 'String'
-);
-
-my @gclasses;
-my @gnclasses;
-
-foreach(sort keys %data)
-{
-  my $p=$_;
-  undef %funcs;
-  undef %global;
-  %funcs=%{$data{$p}->{'funcs'}};
-  $global{'interface'}=$p;
-  $global{'version'}=$data{$p}->{'version'};
-  $global{'prefix'}=$data{$p}->{'prefix'};
-
-  my $t=$p;
-  $t=~s/::/\//g;
-
-  $path=sprintf "%s/%s/%s",$config{'base'},$config{'gen'},$t;
-  $path=~s/\/\//\//;
-  $path=~s/\/$//;
-  $path.='/';
-
-  $pimpl=sprintf "%s/%s/%s",$config{'base'},$config{'pimpl'},$t;
-  $pimpl=~s/\/\//\//;
-  $pimpl=~s/\/$//;
-  $pimpl.='/';
-
-=pod=
-  $p2i=File::Spec->abs2rel($path,$pimpl);
-  $i2p=File::Spec->abs2rel($pimpl,$path);
-  $i2l=File::Spec->abs2rel($lib,$path);
-  
-#  $p2m=File::Spec->abs2rel(sprintf "%s/%s",$config{'base'},$config{'gen'},$pimpl) if not exists $config{'abs'};
-
-  $i2a=File::Spec->abs2rel($config{'alrpc'},$path);
-  $p2a=File::Spec->abs2rel($config{'alrpc'},$pimpl);
-  $p2p=File::Spec->abs2rel($config{'aimpl'},$pimpl);
-
-  $p2i=$path if exists $config{'abs'};
-  $i2p=$pimpl if exists $config{'abs'};
-  $i2l=$lib if exists $config{'abs'};
-
-  $i2a=$config{'alrpc'} if exists $config{'abs'};
-  $p2a=$config{'alrpc'} if exists $config{'abs'};
-  $p2p=$config{'aimpl'} if exists $config{'abs'};
-=cut=
-  
-#  $p2m=File::Spec->abs2rel(sprintf "%s/%s",$config{'base'},$config{'gen'},$pimpl) if not exists $config{'abs'};
-
-  $p2i=$path;
-  $i2p=$pimpl;
-  $i2l=$lib;
-  $i2a=$config{'alrpc'};
-  $p2a=$config{'alrpc'};
-  $p2p=$config{'aimpl'};
-
-
-  $p2i=~s/\/$//;$p2i=~s/\/\//\//;
-  $i2p=~s/\/$//;$i2p=~s/\/\//\//;
-  $i2l=~s/\/$//;$i2l=~s/\/\//\//;
-  $i2a=~s/\/$//;$i2a=~s/\/\//\//;
-  $p2a=~s/\/$//;$p2a=~s/\/\//\//;
-  $p2p=~s/\/$//;$p2p=~s/\/\//\//;
-  $p2m=~s/\/$//;$p2m=~s/\/\//\//;
-
-  interface($p);
-}
-
-
-
-# code let's rock!
-# generation block!
-# :L
-
-
-
-sub mkpath
-{
-  my $x=shift;
-  my $s=shift;
-#  $x=$path.'/'.$x.'.'.$s;
-  $x.='.'.$s;
-  push @$mklist,$x;
-  push @$mkdep,$x if $s eq $sc;
-  return '>'.$x if not exists $config{'style'};
-  return sprintf "| %s > %s",$config{'style'},$x;
-}
-
-sub printhat
-{
-  my $n=shift;
-  my $p=shift;
-  return sprintf "#ifndef %s%s_INCLUDE\n#define %s%s_INCLUDE\n\n%s",$p,uc $n,$p,uc $n,$pragma;
-}
-
-sub check
-{
-  my $z=$_;
-#    die Dumper($z);
-#    my $isarr= ref $z->[4];
-#    my $isstr= $z->[0] eq 's';
-#    my $isint= not ref $z->[0];
-#    my $isopt= $z->[2] eq '*';
-
-  return '' if not ref $z->[0] and not ref $z->[4] and not defined $z->[1]->[0] and not defined $z->[1]->[1];
-  return '' if not ref $z->[0] and ref $z->[4] and not defined $z->[4]->[0] and not defined $z->[4]->[1]
-           and not defined $z->[1]->[0] and not defined $z->[1]->[1];
-
-
-  my $n=$z->[3];
-  my $n2=$n.( $z->[2] eq '*' ? '[0]' : '');
-  my $n3=$n2.(ref $z->[4] ? '[i]' : '');
-  my $tp= ref $z->[0] ? $z->[0]->[0] : $z->[0];
-  my $c;
-
-  if(ref $z->[1] and (defined $z->[1]->[0] or defined $z->[1]->[1]))
-  {
-     my $c2= $z->[0] eq 's' ? '.length()' : '';
-     if(defined $z->[1]->[0] and defined $z->[1]->[1])
-     {
-       $c=sprintf "s.#iname#%s<%s || s.#iname#%s>%s",$c2,$z->[1]->[0],$c2,$z->[1]->[1];
-     }
-     else
-     {
-       $c=sprintf "s.#iname#%s<%s",$c2,$z->[1]->[0] if defined $z->[1]->[0];
-       $c=sprintf "s.#iname#%s>%s",$c2,$z->[1]->[1] if defined $z->[1]->[1];
-     }
-  }
-
-  $c='!#type#Marshaller::checkIntegrityConst(s.#iname#)' if ref $z->[0];
-
-  if($c ne '' or ref $z->[4])
-  {
-    if(ref $z->[4])
-    {
-      my $q;
-      $q="  if(s.#name#)\n" if $z->[2] eq '*';
-      $q.="  {\n    unsigned int i=s.#pname#.size();\n";
-      $q.=sprintf "    if(i<%s)  return false;\n",$z->[4]->[0] if defined $z->[4]->[0];
-      $q.=sprintf "    if(i>%s)  return false;\n",$z->[4]->[1] if defined $z->[4]->[1];
-      if(defined $z->[1]->[0] or defined $z->[1]->[1])
-      {
-        $q.="    while(i--)\n    {\n";
-        $q.="      if($c)  return false;\n";
-        $q.="    }\n";
-      }
-      $q.="  }\n";
-      $c=$q;
-    }
-    else
-    {
-      $c= $z->[2] eq '*' ? sprintf "  if(s.#name# && (%s))  return false;\n",$c
-                         : sprintf "  if(%s)  return false;\n",$c;
-    }
-  }
-
-  $c=~s/#pname#/$n2/gs;
-  $c=~s/#iname#/$n3/gs;
-  $c=~s/#name#/$n/gs;
-  my $tp2=ref $z->[0] ? $nsa.'::'.$tp :$tp;
-  $c=~s/#type#/$tp2/gs;
-
-  return $c ? "$c\n" : '';
-}
-
-
-sub interface
-{
-
-  my $iface=shift;
-
-#print "global settings:\n",Dumper(\%global);
-#print "methods:\n",Dumper(\%funcs);
-
-my $using0;
-
-$ns=$config{'ns'};
-$nsa=$config{'nsa'};
-
-
-`mkdir -p $path`;
-`mkdir -p $pimpl`;
-
-
-my $hat=sprintf "\n/*\n  interface\t%s\n  version\t%s\n  generated at\t%s\n  source stamp\t%s\n  author\tRC\n*/\n\n",
-        $global{'interface'},$global{'version'},$timestamp,$timemod;
-
-$hat= sprintf "\n// %s%s",$dd,$hat if exists $config{'ee'} and $dd ne '';
-
-
-my @nss=split('::',$global{'interface'});
-unshift @nss,split('::',$ns) if $ns ne '';
-
-my $nsbra='';
-my $nsket='';
-
-if(@nss)
-{
-  my $i='';
-  foreach(@nss)
-  {
-    $nsbra.=sprintf "%snamespace %s\n%s{\n",$i,$_,$i;
-    $nsket=sprintf "%s}\n%s",$i,$nsket;
-    $i.='  ';
-  }
-}
-
-#my $ind= @nss ?  ('  ' x scalar @nss) : '';
-my $ind= @nss ?  '  ' x @nss : '';
-my $using; #="using namespace NsRPC2Communication;\n";
-#$using.=sprintf "using namespace %s;\n",$nsa if $nsa ne '';
-$using.=sprintf "using namespace %s;\n",join('::',@nss) if @nss;
-
-my $using2; #="using namespace NsRPC2Communication;\n";
-$using2.=sprintf "using namespace %s;\n",join('::',@nss) if @nss;
-
-my $nsap='';
-$nsap=$nsa.'::' if $nsa;
-
-my $prefix=@nss ? uc join('_',@nss) : '';
-$prefix.='_' if @nss;
-
-
-my @classes;
-foreach(sort keys %funcs)
-{
-  push @classes,$_;
-  push @classes,$_."Response" if $funcs{$_}->[0]==1;
-  my $g=[];
-  @$g=split('::',$iface);
-  push @gclasses,[$iface,$_,$g,$global{'prefix'}];
-  push @gclasses,[$iface,$_."Response",$g,$global{'prefix'}] if $funcs{$_}->[0]==1;
-}
-
-open(FO,mkpath($path.'RPC2',$sh)) or die;
-print FO printhat('RPC2',$prefix);
-#printf FO "#ifndef %s%s_INCLUDE\n#define %sRPC2_INCLUDE\n\n%s",$prefix,$prefix,$pragma;
-print FO "#include <string>\n#include <json/json.h>\n\n";
-printf FO "#include \"%s%s.%s\"\n",$path,$_,$sh foreach @classes;
-printf FO "\n#include \"%s/Marshaller.%s\"\n\n",$p2m,$sh;
-
-print FO $hat;
-print FO "\n#endif\n";
-close FO;
-
-my @nclasses;
-foreach(sort keys %funcs)
-{
-  my $d=$_;
-  if($funcs{$d}->[0]==0)
-  {
-    my $r=[$d,$d,0,0,0,[]];  # method name, class name, type, hasstr,hasarr, list of external entities from SmartDeviceLink
-
-    foreach(@{$funcs{$d}->[2]})
-    {
-      $r->[3]=1 if $_->[0] eq 's';
-      $r->[4]=1 if ref $_->[4];
-      push @{$r->[5]},$_->[0]->[0] if ref $_->[0];
-    }
-    push @nclasses,$r;
-    my $r2=[$iface];
-    push @$r2,@$r;
-    push @gnclasses,$r2;
-    next;
-  }
-  my $r=[$d,$d,1,0,0,[]];
-  my $r2=[$iface];
-  foreach(@{$funcs{$d}->[2]})
-  {
-    $r->[3]=1 if $_->[0] eq 's';
-    $r->[4]=1 if ref $_->[4];
-    push @{$r->[5]},$_->[0]->[0] if ref $_->[0];
-  }
-  push @$r2,@$r;
-  push @gnclasses,$r2;
-  push @nclasses,$r;
-
-  $r=[$d,$d.'Response',2,0,0,[]];
-  $r2=[$iface];
- 
-  foreach(@{$funcs{$d}->[3]})
-  {
-    $r->[3]=1 if $_->[0] eq 's';
-    $r->[4]=1 if ref $_->[4];
-    push @{$r->[5]},$_->[0]->[0] if ref $_->[0];
-  }
-  push @$r2,@$r;
-  push @gnclasses,$r2;
-  push @nclasses,$r;
-}
-
-my @tp=qw{RPC2Notification RPC2Request RPC2Response};
-
-my %tps= 
-(
-  'b' => 'bool',
-  'i' => 'int',
-  'u' => 'unsigned int',
-  's' => 'std::string',
-  'f' => 'float'
-);
-
-my $useext=0;
-
-# !!! check moved
-
-foreach(@nclasses)
-{
-  my $f=$_;
-  my $n=$f->[1];
-  my $base=@tp[$f->[2]];
-  my @args;
-  {
-    my $n=2;
-    $n=3 if $f->[2]==2;
-    @args=@{$funcs{$f->[0]}->[$n]};
-  }
-
-  my $mname=sprintf 'METHOD_%s__%s',uc join('_',split('::',$iface)),uc $n;
-
-  open(FO,mkpath($path.$n,$sh)) or die;
-  print FO printhat ($n,$prefix);
-# check vector/string
-  print FO "#include <string>\n" if $f->[3]==1;
-  print FO "#include <vector>\n" if $f->[4]==1;
-
-  printf FO qq!#include "%s/%s.h"\n!,$i2l,$base;
-
-  print FO "\n";
-# check foreign classes
-  printf FO qq!#include "%s/%s.%s"\n!,$i2a,$_,$sh foreach @{$f->[5]};
-
-  print FO $hat;
-  print FO $nsbra;
-
-  my $t=qq!\nclass #name# : public ::NsRPC2Communication::#base#\n{\npublic:\n\n  #name#(const #name#& c);\n  #name#(void);\n\n!.
-        qq!  #name#& operator =(const #name#&);\n\n  virtual ~#name#(void);\n\n  bool checkIntegrity(void);\n!;
-
-
-  $t=~s/\n/\n$ind/gs;
-  $t=~s/#name#/$n/gs;
-  $t=~s/#base#/$base/gs;
-  
-  print FO $t."\n";
-
-#  gettes/setters
-
-  my $g;
-  my $s;
-  my $p;
-
-  foreach(@args)
-  {
-    my $z=$_;
-#    die Dumper($z);
-#    my $isarr= ref $z->[4];
-#    my $isstr= $z->[0] eq 's';
-#    my $isint= not ref $z->[0];
-#    my $isopt= $z->[2] eq '*';
-
-    my $nm=$z->[3];
-    my $tp= ref $z->[0] ? $z->[0]->[0] : exists $tps{$z->[0]} ? $tps{$z->[0]} : $z->[0];
-    $tp=$nsa.'::'.$tp if ref $z->[0];
-#    $tp='::'.$tp if ref $z->[0];
-    $tp=sprintf("std::vector< %s>",$tp) if ref $z->[4];
-    
-    my $r;
-    my $u;
-# constraints in comments
-
-    my $cmt;
-    {
-      my $l;
-      my $r;
-      my $m;
-      $l=sprintf "%s <= ",$z->[1]->[0] if ref $z->[1] and defined $z->[1]->[0];
-      $r=sprintf " <= %s",$z->[1]->[1] if ref $z->[1] and defined $z->[1]->[1];
-
-      if($l or $r)
-      {
-        $cmt=$nm;
-        $cmt.='[]' if ref $z->[4];
-        $cmt=$l.$cmt if $l;
-        $cmt.=$r if $r;
-      }
-
-      if(ref $z->[4] and defined $z->[4]->[0] and defined $z->[4]->[1]) # array
-      {
-         $cmt.=" ; " if $cmt;
-         $cmt.=sprintf "%s <= ",$z->[4]->[0] if defined $z->[4]->[0];
-         $cmt.="size";
-         $cmt.=sprintf " <= %s",$z->[4]->[1] if defined $z->[4]->[1];
-      }
-    }
-    $cmt=sprintf "/// %s\n",$cmt if $cmt;
-    
-#    printf FO Dumper($z);
-     $u.=$cmt;
-    if($z->[2] eq '*')
-    {
-      $r=sprintf "  %sconst %s* get_%s(void);\n",$ind,$tp,$nm;
-
-      $u.=sprintf "  %sbool set_%s(const %s& %s);\n\n",$ind,$nm,$tp,$nm;
-      $u.=sprintf "  %svoid reset_%s(void);\n\n",$ind,$nm;
-      $p.=sprintf "  %s%s* %s;\n",$ind,$tp,$nm;
-    }
-    elsif((not ref $z->[0]) and $z->[0] ne 's' and not ref $z->[4])
-    {
-      $r=sprintf "  %s%s get_%s(void);\n\n",$ind,$tp,$nm;
-      $u.=sprintf "  %sbool set_%s(%s %s);\n\n",$ind,$nm,$tp,$nm;
-      $p.=sprintf "  %s%s %s;\n",$ind,$tp,$nm;
-    }
-    else
-    {
-      $r=sprintf "  %sconst %s& get_%s(void);\n\n",$ind,$tp,$nm;
-      $u.=sprintf "  %sbool set_%s(const %s& %s);\n\n",$ind,$nm,$tp,$nm;
-      $p.=sprintf "  %s%s %s;\n",$ind,$tp,$nm;
-    }
-    
-=pod=
-reserve space for future bug fixing
-:-)
-=cut=
-    $g.=$r;
-    $s.=$u;
-  }
-  
-  print FO "// getters\n" if $g ne '';
-  print FO $g;
-  print FO "\n// setters\n" if $s ne '';
-  print FO $s;
-  
-  printf FO qq!\n%sprivate:\n\n%s  friend class %sMarshaller;\n\n!,$ind,$ind,$n;
-
-  print FO $p;
-
-  
-  printf FO "\n%s};\n",$ind;
-  
-  print FO $nsket;
-  print FO "\n#endif\n";
-  close FO;
-
-# implementations, ooh
-
-  open(FO,mkpath($pimpl.$n.'Marshaller',$sh)) or die;
-  print FO printhat($n.'Marshaller',$prefix);
-
-  print FO "#include <string>\n#include <json/json.h>\n\n";
-  printf FO qq!#include "%s/%s.%s"\n!,$p2i,$n,$sh;
-
-  print FO "\n".$nsbra;
-  my $z=qq!\nstruct #Marshaller\n{\n  static bool checkIntegrity(#& e);\n!.
-qq!  static bool checkIntegrityConst(const #& e);\n\n  static bool fromString(const std::string& s,#& e);\n!.
-qq!  static const std::string toString(const #& e);\n\n  static bool fromJSON(const Json::Value& s,#& e);\n!.
-qq!  static Json::Value toJSON(const #& e);!;
-
-  $z=~s/\n/\n$ind/gs;
-  $z=~s/#/$n/gs;
-  
-  print FO $z;
-
-  printf FO "\n%s};\n",$ind;
-  
-  print FO $nsket;
-  print FO "\n#endif\n";
-  close FO;
-
-# *Marshaller.cc
-
-  open(FO,mkpath($pimpl.$n.'Marshaller',$sc)) or die;
-  print FO $pragma;
-
-  printf FO qq!#include "%s/%s.%s"\n!,$p2i,$n,$sh;
-
-  printf FO qq!#include "%s/%sMarshaller.%s"\n!,$p2p,$_,$sh foreach @{$f->[5]};
-  printf FO qq!#include "%s/ResultMarshaller.%s"\n!,$p2p,$sh;
-#  printf FO qq!#include "%s/Marshaller.%s"\n!,$i2a,$sh;
-
-  printf FO qq!#include "%s%sMarshaller.%s"\n!,$pimpl,$n,$sh;
-  print FO $hat;
-  
-  {
-    my $o=getfort();
-    print FO $o if exists $config{'ee'} and $o ne '';
-  }
-  
-  
-  my $jf='params';
-  $jf='result' if $f->[2]==2;
-  
-  {
-    my $t='';
-#    $t=1 if $f->[2] == 2;
-    foreach(@args)
-    {
-      $t=1 if ref $_->[0];
-    }  
-    $using0= $t ? $using : $using2;
-    $useext=1 if $t==1;
-  }
-#  print FO $using0;
-  print FO $using;
-  
-  $z=qq~\nbool #Marshaller::checkIntegrity(#& s)\n{\n  return checkIntegrityConst(s);\n}\n\n\nbool #Marshaller::fromString(const std::string& s,#& e)\n~.
-     qq~{\n  try\n  {\n    Json::Reader reader;\n    Json::Value json;\n    if(!reader.parse(s,json,false))  return false;\n~.
-     qq~    if(!fromJSON(json,e))  return false;\n  }\n  catch(...)\n  {\n    return false;\n  }\n  return true;\n}\n\n\n~.
-     qq~const std::string #Marshaller::toString(const #& e)\n{\n  Json::FastWriter writer;\n  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : ~.
-     qq~"";\n}\n\n\nbool #Marshaller::checkIntegrityConst(const #& s)\n{\n~;
-
-  $z=~s/#/$n/gs;
-  print FO $z;
-
-# there are 12 cases. try to pack them, MDL rulezzz!
-  print FO check($_) foreach @args;
-
-  print FO qq!  return true;\n}\n\n\n!;
-  
-  printf FO qq~Json::Value %sMarshaller::toJSON(const %s& e)\n{\n  Json::Value json(Json::objectValue);\n~.
-qq~  if(!checkIntegrityConst(e))\n    return Json::Value(Json::nullValue);\n\n~,$n,$n;
-
-  my $pr;
-  $pr=qq~  json["params"]=Json::Value(Json::objectValue);\n~ if @args;
-
-  printf FO qq~  json["jsonrpc"]=Json::Value("2.0");\n  json["method"]=Json::Value("%s%s");\n%s\n~,
-            $global{'prefix'},$n,$pr if $f->[2] == 0;
-  printf FO qq~  json["jsonrpc"]=Json::Value("2.0");\n  json["method"]=Json::Value("%s%s");\n\n~.
-qq~  json["id"]=Json::Value(e.getId());\n%s~,$global{'prefix'},$n,$pr if $f->[2] == 1;
-  printf FO qq~  json["jsonrpc"]=Json::Value("2.0");\n  json["id"]=Json::Value(e.getId());\n  json["result"]=Json::Value(Json::objectValue);\n~.
-qq~  ~.$nsap.qq~Result r(static_cast<~.$nsap.qq~Result::ResultInternal>(e.getResult()));\n  json["result"]["resultCode"]=~.$nsap.qq~ResultMarshaller::toJSON(r);\n~.
-qq~  json["result"]["method"]=Json::Value("%s%s");\n\n~,$global{'prefix'},$n if $f->[2] == 2;
-
-  foreach(@args)
-  {
-    my $z=$_;
-    my $q; $q='[0]' if $z->[2] eq '*';
-    printf FO "  if(e.%s)\n",$z->[3] if $z->[2] eq '*';
-
-    my $u='Json::Value';
-    $u=sprintf '%s::%sMarshaller::toJSON',$nsa,$z->[0]->[0] if ref $z->[0];
-   
-   if(ref $z->[4])
-   {
-     printf FO qq~  {\n    unsigned int i=e.%s%s.size();\n    Json::Value j=Json::Value(Json::arrayValue);\n~.
-qq~    j.resize(i);\n    while(i--)\n      j[i]=%s(e.%s%s[i]);\n\n    json["%s"]["%s"]=j;\n  }\n~,$z->[3],$q,$u,$z->[3],$q,$jf,$z->[3];
-
-   }
-   else
-   {
-     print FO '  ' if $q;
-     printf FO qq~  json["%s"]["%s"]=%s(e.%s%s);;\n~,$jf,$z->[3],$u,$z->[3],$q;
-   }
-    
-  }
-  
-  print FO "  return json;\n}\n\n\n";
-  
-  printf FO qq~bool %sMarshaller::fromJSON(const Json::Value& json,%s& c)\n{\n  try\n  {\n    if(!json.isObject())  return false;\n~.
-qq~    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;\n~,$n,$n;
-
-
-  if($f->[2]==0)	#notify
-  {
-    printf FO qq~    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("%s%s"))  return false;\n~,$global{'prefix'},$n;
-    print FO
-qq~    if(!json.isMember("params")) return false;\n\n    Json::Value js=json["params"];\n    if(!js.isObject())  return false;\n\n~ if @args;
-
-  }
-  elsif($f->[2]==1)	#request
-  {
-    printf FO qq~    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("%s%s"))  return false;\n~.
-qq~    if(!json.isMember("id") || !json["id"].isInt()) return false;\n    c.setId(json["id"].asInt());\n\n~,$global{'prefix'},$n;
-    print FO
-qq~    if(!json.isMember("params")) return false;\n\n    Json::Value js=json["params"];\n    if(!js.isObject())  return false;\n~ if @args;
-
-  }
-  elsif($f->[2]==2)	#response
-  {
-    printf FO qq~    if(!json.isMember("id") || !json["id"].isInt()) return false;\n    c.setId(json["id"].asInt());\n\n~.
-qq~    if(!json.isMember("result")) return false;\n\n    Json::Value js=json["result"];\n~.
-qq~    if(!js.isObject())  return false;\n\n    ~.$nsap.qq~Result r;\n    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;\n~.
-qq~    if(!js.isMember("method") || !js["method"].isString())  return false;\n    if(js["method"].asString().compare("%s%s")) return false;\n\n~.
-qq~    if(!~.$nsap.qq~ResultMarshaller::fromJSON(js["resultCode"],r))  return false;\n    c.setResult(r.get());\n~,$global{'prefix'},$n;
-
-  }
-  else
-  {
-    die 'something wrong in our kingdom';
-  }
-# deep deep tree :-)
-
-  foreach(@args)
-  {
-    my $z=$_;
-    my $l;
-
-    my $ct;
-    if(ref $z->[1] and (defined $z->[1]->[0] or defined $z->[1]->[1]))
-    {
-      my $c2= $z->[0] eq 's' ? '.length()' : '';
-     if(defined $z->[1]->[0] and defined $z->[1]->[1])
-      {
-        $ct=sprintf "#aname#%s<%s || #aname#%s>%s",$c2,$z->[1]->[0],$c2,$z->[1]->[1];
-      }
-     else
-     {
-       $ct=sprintf "#aname#%s<%s",$c2,$z->[1]->[0] if defined $z->[1]->[0];
-       $ct=sprintf "#aname#%s>%s",$c2,$z->[1]->[1] if defined $z->[1]->[1];
-     }
-     $ct=sprintf "if(%s)  return false;\n",$ct if $ct;
-     my $f=$z->[3];
-     $f.='[0]' if $z->[2] eq '*';
-     if(ref $z->[4])
-     {
-       $f.='[i]';
-     }
-     $ct=~s/#aname#/c.$f/gs if $ct;
-    }
-
-
-     if(ref $z->[4])			#array
-     {
-       my $ca;
-
-       $ca.=sprintf "      if(i<%s)  return false;\n",$z->[4]->[0] if defined $z->[4]->[0];
-       $ca.=sprintf "      if(i>%s)  return false;\n",$z->[4]->[1] if defined $z->[4]->[1];
- 
-       if($z->[2] eq '*')		#array optional
-       {
-         if(ref $z->[0])		#array optional not simple type
-         {
-$l=qq~    if(c.#name#)  delete c.#name#;\n    c.#name#=0;\n~.
-   qq~    if(js.isMember("#name#"))\n    {\n      if(!js["#name#"].isArray()) return false;\n~.
-   qq~      unsigned int i=js["#name#"].size();\n~.$ca.
-   qq~\n      c.#name#=new std::vector<#type#>();\n~.
-   qq~      c.#name#->resize(js["#name#"].size());\n\n      while(i--)\n~.
-   qq~        if(!#type#Marshaller::fromJSON(js["#name#"][i],c.#name#[0][i]))  return false;\n    }\n\n~;
-
-         }
-         else				#array optional simple type
-         {
-$l=sprintf
-   qq~    if(c.#name#)  delete c.#name#;\n    c.#name#=0;\n~.
-   qq~    if(js.isMember("#name#"))\n    {\n      if(!js["#name#"].isArray()) return false;\n~.
-   qq~      unsigned int i=js["#name#"].size();\n~.$ca."\n".
-   qq~      c.#name#=new std::vector<#type#>();\n~.
-   qq~      c.#name#->resize(js["#name#"].size());\n\n      while(i--)\n      {\n~.
-   qq~        if(!js["#name#"][i].is%s())\n          return false;\n\n        c.#name#[0][i]=js["#name#"][i].as%s();\n        ~.$ct.
-   qq~      }\n    }\n\n~,$json2{$z->[0]},$json{$z->[0]};
-         }
-       }
-       else				#array not optional
-       {
-         if(ref $z->[0])		#array not optional not simple type
-         {
-
-#$l=qq~    if(!js.isMember("#name#") || !js["#name#"].isArray())  return false;\n~.
-#   qq~    {\n      unsigned int i=js["#name#"].size();\n~.$ca.qq~      std::vector<#type#> z(i);\n      while(i--)\n~.
-#   qq~        if(!#type#Marshaller::fromJSON(js["#name#"][i],c.#name#[i]))  return false;\n      c.#name#=z;\n    }\n~;
-
-$l=qq~    if(!js.isMember("#name#") || !js["#name#"].isArray())  return false;\n~.
-   qq~    {\n      unsigned int i=js["#name#"].size();\n~.$ca.qq~      c.#name#.resize(i);\n      while(i--)\n      {\n        #type# t;\n~.
-   qq~        if(!#type#Marshaller::fromJSON(js["#name#"][i],t))\n          return false;\n         c.#name#[i]=t;\n      }\n    }\n~;
-
-         }
-         else				#array not optional simple type
-         {
-$l=sprintf
-   qq~    if(!js.isMember("#name#") || !js["#name#"].isArray())\n      return false;\n    {\n~.
-   qq~      c.#name#.clear();\n      unsigned int i=js["#name#"].size();\n~.$ca.
-   qq~      c.#name#.resize(i);\n      while(i--)\n~.
-   qq~      {\n        if(!js["#name#"][i].is%s())\n          return false;\n        c.#name#[i]=js["#name#"][i].as%s();\n        ~.$ct.
-   qq~\n      }\n    }\n\n~,$json2{$z->[0]},$json{$z->[0]};
-
-
-         }
-       }
-     }
-     else				# not array
-     {
-       if($z->[2] eq '*')		#not array optional
-       {
-         if(ref $z->[0])		#not array optional not simple type
-         {
-$l=qq~    if(c.#name#)  delete c.#name#;\n    c.#name#=0;\n~.
-   qq~    if(js.isMember("#name#"))\n    {\n      c.#name#=new #type#();\n~.
-   qq~      if(!#type#Marshaller::fromJSON(js["#name#"],c.#name#[0]))  return false;\n    }\n~;
-         }
-         else				#not array optional simple type
-         {
-$l=sprintf
-   qq~    if(c.#name#)  delete c.#name#;\n    c.#name#=0;\n~.
-   qq~    if(js.isMember("#name#"))\n    {\n      if(!js["#name#"].is%s())  return false;\n      c.#name#=new #type#();\n~.
-   qq~      c.#name#[0]=js["#name#"].as%s();\n      ~.$ct."\n    }\n",
-          $json2{$z->[0]},$json{$z->[0]};
-         }
-       }
-       else				#not array not optional
-       {
-         if(ref $z->[0])		#not array not optional not simple type
-         {
-$l.=qq~    if(!js.isMember("#name#") || !#type#Marshaller::fromJSON(js["#name#"],c.#name#))  return false;\n~;
-         }
-         else				#not array not optional simple type
-         {
-$l=sprintf
-   qq~    if(!js.isMember("#name#") || !js["#name#"].is%s())  return false;\n~.
-   qq~    c.#name#=js["#name#"].as%s();\n    ~.$ct,
-          $json2{$z->[0]},$json{$z->[0]};
-         }
-       }
-     }
-     my $n=$z->[3];
-     my $t=$tps{$z->[0]};
-     $t=$nsa.'::'.$z->[0]->[0] if ref $z->[0];
-     $l=~s/#name#/$n/gs;
-     $l=~s/#type#/$t/gs;
-     $l.="\n";
-     print FO $l; 
-  }
-  print FO qq~  }\n  catch(...)\n  {\n    return false;\n  }\n  return checkIntegrity(c);\n}\n~;
-
-  close FO;
-
-# *.cc
-
-# oops, those getters...
-# many dumb works only for stupid C++ common rules...
-# i think i should kill Stroustrup
-
-  open(FO,mkpath($pimpl.$n,$sc)) or die;
-  print FO $pragma;
-
-  printf FO qq!#include "%s/%s.%s"\n!,$p2i,$n,$sh;
-  printf FO qq!#include "%s/Marshaller.%s"\n!,$p2m,$sh;
-  print FO $hat;
-
-  {
-    my $o=getfort();
-    print FO $o if exists $config{'ee'} and $o ne '';
-  }
-  
-
-  print FO $using0;
-  
-  printf FO "\n\n%s& %s::operator =(const %s& c)\n{\n",$n,$n,$n;
-  
-  foreach (@args)
-  {
-    my $z=$_;
-    my $l;
-    if($z->[2] eq '*')
-    {
-      $l=sprintf "  if(%s)  delete %s;\n",$z->[3],$z->[3];
-      if(ref $z->[4])
-      {
-        $l.=sprintf "  %s= c.%s ? new std::vector<%s>(c.%s[0]) : 0;\n",$z->[3],$z->[3],
-                      (ref $z->[0] ? $nsa.'::'.$z->[0]->[0] : $tps{$z->[0]}),$z->[3];
-      }
-      else
-      {
-        $l.=sprintf "  %s= c.%s ? new %s(c.%s[0]) : 0;\n",$z->[3],$z->[3],
-                      (ref $z->[0] ? $nsa.'::'.$z->[0]->[0] : $tps{$z->[0]}),$z->[3];
-      }
-    }
-    else
-    {
-      $l=sprintf "  %s=c.%s;\n",$z->[3],$z->[3];
-    }
-    print FO $l;
-  }
-  
-  printf FO "  return *this;\n}\n\n\n%s::~%s(void)\n{\n",$n,$n;
-
-  foreach(@args)
-  {
-    printf FO "  if(%s)  delete %s;\n",$_->[3],$_->[3] if $_->[2] eq '*';
-  }
-  
-  print FO "}\n\n\n";
-
-# two constructors
-#  my $l1=sprintf "%s::%s(void) : \n  %s(Marshaller::METHOD_%s)",$n,$n,@tp[$f->[2]],uc $n;
-#  my $l2=sprintf "%s::%s(const %s& c) : %s(Marshaller::METHOD_%s",$n,$n,$n,@tp[$f->[2]],uc $n;
-  my $l1=sprintf "%s::%s(void) : \n  %s(Marshaller::%s)",$n,$n,@tp[$f->[2]],$mname;
-  my $l2=sprintf "%s::%s(const %s& c) : %s(Marshaller::%s",$n,$n,$n,@tp[$f->[2]],$mname;
-
-  foreach(@args)
-  {
-    my $z=$_;
-    $l1.=sprintf ",\n  %s(0)",$z->[3] if $z->[2] eq '*';
-  }
-
-  $l1.="\n{\n}\n\n\n";
-
-  if($f->[2]==0) # notification
-  {
-    $l2.=')';
-  }
-  elsif($f->[2]==1) # request
-  {
-    $l2.=',c.getId())'
-
-  }
-  elsif($f->[2]==2) # response
-  {
-    $l2.=',c.getId(),c.getResult())';
-  }
-  else
-  {
-    die "oops!";
-  }
-
-  $l2.="\n{\n  *this=c;\n}\n\n\n";
-
-  print FO $l1;
-  print FO $l2;
-
-# getters and setters
-
-  my $g;
-  my $s;
-  foreach(@args)
-  {
-    my $z=$_;
-    my $nm=$z->[3];
-    my $tp= ref $z->[0] ? $nsa.'::'.$z->[0]->[0] : exists $tps{$z->[0]} ? $tps{$z->[0]} : $z->[0];
-    $tp=sprintf("std::vector< %s>",$tp) if ref $z->[4];
-    
-    $g=$s='';
-    my $p=sprintf "%s::",$n;
-    if($z->[2] eq '*')
-    {
-      $g=sprintf "const %s* %s::get_%s(void)\n{\n  return %s;\n}\n\n",$tp,$n,$nm,$nm;
-#      $s=sprintf "bool %s::set_%s(%s* %s_)\n{\n  if(%s)  delete %s;\n  %s=%s_;\n  return true;\n}\n\n",$n,$nm,$tp,$nm,$nm,$nm,$nm,$nm;
-
-      $s=sprintf "bool %s::set_%s(const %s& %s_)\n{\n  if(%s)  delete %s;\n  %s=new %s(%s_);\n  return true;\n}\n\n",$n,$nm,$tp,$nm,$nm,$nm,$nm,$tp,$nm;
-      $s.=sprintf "void %s::reset_%s(void)\n{\n  if(%s)  delete %s;\n  %s=0;\n}\n\n",$n,$nm,$nm,$nm,$nm;
-    }
-    elsif((not ref $z->[0]) and $z->[0] ne 's' and not ref $z->[4])
-    {
-      $g=sprintf "%s %s::get_%s(void)\n{\n  return %s;\n}\n\n",$tp,$n,$nm,$nm;
-      $s=sprintf "bool %s::set_%s(%s %s_)\n{\n  %s=%s_;\n  return true;\n}\n\n",$n,$nm,$tp,$nm,$nm,$nm;
-    }
-    else
-    {
-      $g=sprintf "const %s& %s::get_%s(void)\n{\n  return %s;\n}\n\n",$tp,$n,$nm,$nm;
-      $s=sprintf "bool %s::set_%s(const %s& %s_)\n{\n  %s=%s_;\n  return true;\n}\n\n",$n,$nm,$tp,$nm,$nm,$nm;
-    }
-    printf FO $g;
-    printf FO $s;
-  }
-
-  printf FO "bool %s::checkIntegrity(void)\n{\n  return %sMarshaller::checkIntegrity(*this);\n}\n",$n,$n;
-  close FO;
-}
-
-
-}
-
-#################################################################### code common for all interfaces
-
-$ns=$config{'ns'};
-
-my $nsbra='';
-my $nsket='';
-
-my @nss2;
-@nss2=split('::',$ns) if $ns ne '';
-
-if(@nss2)
-{
-  my $i='';
-  foreach(@nss2)
-  {
-    $nsbra.=sprintf "%snamespace %s\n%s{\n",$i,$_,$i;
-    $nsket=sprintf "%s}\n%s",$i,$nsket;
-    $i.='  ';
-  }
-}
-
-my $ind= @nss2 ?  '  ' x @nss2 : '';
-
-
-my $hat=sprintf "\n/*\n  generated at\t%s\n  source stamp\t%s\n  author\tRC\n*/\n\n",$timestamp,$timemod;
-
-$hat= sprintf "\n// %s%s",$dd,$hat if exists $config{'ee'} and $dd ne '';
-
-sub printhat2
-{
-  my $n=shift;
-  my $p;
-  $p.=join('_',@nss2);
-  $p.= $p eq '' ? '' : '_';
-  return sprintf "#ifndef %sMARSHALLER_INCLUDE\n#define %sMARSHALLER_INCLUDE\n\n%s",uc $p,uc $p,$pragma;
-}
-
-$path=sprintf "%s/%s",$config{'base'},$config{'gen'};
-$pimpl=sprintf "%s/%s",$config{'base'},$config{'pimpl'};
-
-$path=~s/\/\//\//g;$path=~s/\/$//g;$path.='/';
-$pimpl=~s/\/\//\//g;$pimpl=~s/\/$//g;$pimpl.='/';
-
-open(FO,mkpath($path.'Marshaller',$sh)) or die;
-print FO printhat2 'Marshaller';
-#printf FO "#ifndef %sRPC2_INCLUDE\n#define %sRPC2_INCLUDE\n\n%s",$prefix,$prefix,$pragma;
-print FO "#include <string>\n#include <json/json.h>\n\n";
-
-my $t=qq!#include "RPC2Error.h"\n#include "RPC2Notification.h"\n#include "RPC2Request.h"\n#include "RPC2Response.h"\n!.
-      qq!\n#include "RPC2ErrorMarshaller.h"\n\n!;
-
-
-my $i2l=File::Spec->abs2rel($lib,$base);
-$i2l=$lib;
-$i2l=~s/\/$//;$i2l=~s/\/\//\//;
-
-$t=~s/ "/ "$i2l\//gs;
-
-print FO $t;
-
-foreach(@gclasses)
-{
-  my $pth=join('/',@{$_->[2]});
-  $pth=sprintf "%s/%s/%s",$base,$config{'pimpl'},$pth;
-#  $pth=File::Spec->abs2rel($pth,$base) if not exists $config{'abs'};
-  $pth=~s/\/$//;$pth=~s/\/\//\//;
-  
-  printf FO "#include \"%s/%sMarshaller.%s\"\n",$pth,$_->[1],$sh;
-}
-
-print FO $hat;
-
-print FO $nsbra;
-
-my $t=qq!\nclass Marshaller\n{\npublic:\n\n  enum Methods\n  {\n    METHOD_INVALID=-1,!;
-$t=~s/\n/\n$ind/gs;
-
-print FO $t;
-
-$t=join(",\n" ,map { sprintf '#METHOD_%s__%s',uc join('_',@{$_->[2]}),uc $_->[1] } @gclasses);
-
-$t=~s/#/$ind    /g;
-
-printf FO "\n%s\n  %s};\n\n",$t,$ind;
-
-#my @classes;
-
-$t=qq!\nMarshaller()\t\t\t{}\n~Marshaller()\t\t\t{}\n\nstatic ::NsRPC2Communication::RPC2Command* fromString(const std::string&);\n!.
-   qq!static std::string toString(const ::NsRPC2Communication::RPC2Command* msg);\n\n!.
-   qq!static ::NsRPC2Communication::RPC2Command* fromJSON(const Json::Value&);\nstatic Json::Value toJSON(const ::NsRPC2Communication::RPC2Command* msg);!.
-   qq!\n\nprotected:!;
-   
-#   qq!static std::string toString(const ::NsRPC2Communication::RPC2Command* msg);\n\nprotected:\n\n!.
-#   qq!static ::NsRPC2Communication::RPC2Command* fromJSON(const Json::Value&);\nstatic Json::Value toJSON(const ::NsRPC2Communication::RPC2Command* msg);!;
-
-$t=~s/\n/\n$ind  /gs;
-$t=~s/  protected:/protected:/g;
-
-print FO $t;
-print FO "\n\n";
-
-
-foreach(@gclasses)
-{
-  my $n=sprintf "%s::%s",$_->[0],$_->[1];
-  my $x=sprintf "%s__%s",join('_',@{$_->[2]}),$_->[1];
-  my $t= "// #type#\nstatic bool fromString(const std::string& str, #type#& res)\n{\n  return m#name#.fromString(str, res);\n}\n\n".
-         "static std::string toString(const #type#& res)\n{\n  return m#name#.toString(res);\n}";
-
-  $t=~s/#type#/$n/gs;
-  $t=~s/#name#/$x/gs;
-  $t=~s/\n/\n$ind  /gs;
-  print FO $t;
-  print FO "\n\n";
-}
-
-
-$t=qq~\nstruct localHash\n{\n  const char *name;\n  unsigned int idx;\n  void* marshaller;\t\t\t\t\t// Bingo!!!  old good plain C with direct casting!!!\n~.
-   qq!};\n\nprivate:\n\nstatic Json::Value Request2JSON(const ::NsRPC2Communication::RPC2Request* msg);\n!.
-   qq!static Json::Value Response2JSON(const ::NsRPC2Communication::RPC2Response* msg);\n!.
-   qq!static Json::Value Notification2JSON(const ::NsRPC2Communication::RPC2Notification* msg);\n\n!.
-   qq!static const char* getName(Methods e)\n{\n!.
-   qq!  return (e>=0 && e<#) ? mHashTable[e].name : NULL;\n}\n\nstatic const Methods getIndex(const char* s);\n\n!.
-   qq!static const localHash mHashTable[#];\nfriend class Marshaller_intHash;\n\n!.
-   qq!static ::NsRPC2Communication::RPC2ErrorMarshaller mRPC2ErrorInternal;!;
-
-$t=~s/\n/\n$ind  /gs;
-$t=~s/  private:/private:/gs;
-my $z=scalar(@gclasses);
-$t=~s/#/$z/gs;
-print FO $t;
-print FO "\n\n";
-
-foreach(@gclasses)
-{
-  my $n=sprintf "%s::%s",$_->[0],$_->[1];
-  my $x=sprintf "%s__%s",join('_',@{$_->[2]}),$_->[1];
-
-  printf FO "%s  static %sMarshaller m%s;\n",$ind,$n,$x;
-}
-
-printf FO "\n%s};\n",$ind;
-
-print FO $nsket;
-
-print FO "\n#endif\n";
-close FO;
-
-open(FO,'>',$pimpl.'/Marshaller.gp') or die;
-print FO qq!%language=C++\n%struct-type\n%define lookup-function-name getPointer\n%define class-name Marshaller_intHash\n!.
-            qq!%omit-struct-type\n%readonly-tables\n%compare-strncmp\n%compare-lengths\n\nstruct Marshaller::localHash\n{\n!.
-            qq!  const char *name;\n  unsigned int idx;\n  void* method;\n};\n\n%%\n!;
-
-my $z;
-
-
-for($z=0;$z<@gclasses;$z++)
-{
-  my $q=join('_',@{@gclasses[$z]->[2]});
-  printf FO "%s%s,%u,&Marshaller::m%s__%s\n",@gclasses[$z]->[3],@gclasses[$z]->[1],$z,$q,@gclasses[$z]->[1];
-}
-close FO;
-
-
-#**  my @g=split('::',$iface);
-#**  push @gclasses,[$iface,$_,\@g,$global{$prefix}];
-
-  open(FO,mkpath($pimpl.'Marshaller',$sc)) or die;
-  print FO $pragma;
-#  print FO printhat $n;
-# check vector/string
-  print FO "#include <cstring>\n";
-
-  printf FO qq!#include "%sMarshaller.%s"\n!,$path,$sh;
-
-  print FO "\n";
-
-#  printf FO qq!#include "%s/%s.%s"\n!,$p2i,$_,$sh foreach @classes;
-
-foreach(@gclasses)
-{
-  my $pth=join('/',@{$_->[2]});
-  $pth=sprintf "%s/%s/%s",$base,$config{'gen'},$pth;
-#  $pth=File::Spec->abs2rel($pth,$base) if not exists $config{'abs'};
-  $pth=~s/\/$//;$pth=~s/\/\//\//;
-  
-  printf FO "#include \"%s/%s.%s\"\n",$pth,$_->[1],$sh;
-}
-
-
-  print FO "\n";
-  print FO $nsbra;
-  printf FO qq!#include "%sMarshaller.inc"\n!,$pimpl;
-  print FO $nsket;
-
-  print FO $hat;
-
-  {
-    my $o=getfort();
-    print FO $o if exists $config{'ee'} and $o ne '';
-  }
-  
-  print FO "using namespace NsRPC2Communication;\n";
-  printf FO "using namespace %s;\n",$config{'ns'} if $config{'ns'} ne '';
-
-
-
-  print FO qq#\n\nconst Marshaller::Methods Marshaller::getIndex(const char* s)\n{\n  if(!s)\n    return METHOD_INVALID;#.
-qq#  const struct localHash* p=Marshaller_intHash::getPointer(s,strlen(s));\n#.
-qq#  return p ? static_cast<Methods>(p->idx) : METHOD_INVALID;\n}\n\nRPC2Command* Marshaller::fromString(const std::string& s)\n#.
-qq#{\n  RPC2Command* rv=0;\n  try\n  {\n    Json::Reader reader;\n    Json::Value json;\n\n    if(!reader.parse(s,json,false))  return 0;#.
-qq#    if(!(rv=fromJSON(json)))  return 0;\n  }\n  catch(...)\n  {\n    return 0;\n  }\n  return rv;\n}\n\n#.
-qq#std::string Marshaller::toString(const RPC2Command* msg)\n{\n  if(!msg)  return "";\n\n  Json::Value json=toJSON(msg);\n\n#.
-qq#  if(json.isNull()) return "";\n\n  Json::FastWriter writer;\n  std::string rv;\n  return writer.write(json);\n}\n\n#.
-qq#RPC2Command* Marshaller::fromJSON(const Json::Value& json)\n{\n  if(!json.isObject())  return 0;\n#.
-qq#  if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return 0;\n\n#.
-qq#  if(json.isMember("error"))				// error\n  {\n    RPC2Error rv;\n    if(!RPC2ErrorMarshaller::fromJSON(json,rv))  return 0;\n\n#.
-qq#    return new RPC2Error(rv);\n  }\n\n  if(!json.isMember("id"))				// notification\n  {\n#.
-qq#    if(!json.isMember("method") || !json["method"].isString())  return 0;\n\n    Methods m=getIndex(json["method"].asString().c_str());\n\n#.
-qq#    switch(m)\n    {\n#;
-
-  my @tx;
-  my @rx;
-# notification
-#    my $r=[$d,$d,0,0,0,[]];  # method name, class name, type, hasstr,hasarr, list of external entities from SmartDeviceLink
-
-  foreach(@gnclasses)
-  {
-    my $f=$_;
-    my $u=shift @$f;
-
-    my $n=$f->[1];
-    my $z=qq!      case METHOD_#IF#__#NAME#:\n      {\n        #if#::#name# *rv=new #if#::#name#;\n        return #if#::#name#Marshaller::fromJSON(json,*rv) ? rv : 0;\n      }\n!;
-    $z=~s/#name#/$n/gs;
-    $z=~s/#if#/$u/gs;
-    my $t=uc $n;
-    my $t2=uc $u;$t2=~s/::/_/g;
-    $z=~s/#NAME#/$t/gs;
-    $z=~s/#IF#/$t2/gs;
-    @tx[$f->[2]].=$z;
-    $z=qq~    case METHOD_#IF#__#NAME#:\n      return #if#::#name#Marshaller::toJSON(*static_cast<const #if#::#name#*>(msg));\n~;
-    $z=~s/#name#/$n/gs;
-    $z=~s/#NAME#/$t/gs;
-    $z=~s/#IF#/$t2/gs;
-    $z=~s/#if#/$u/gs;
-    @rx[$f->[2]].=$z;
-  }
-
-  print FO @tx[0];
-  print FO qq#      default:\n        return 0;\n    }\n    return 0;\n  }\n\n#.
-qq#  if(json.isMember("method"))				// request\n  {\n    if(!json["id"].isInt())  return 0;\n\n#.
-qq#    Methods m=getIndex(json["method"].asString().c_str());\n    switch(m)\n    {\n#;
-
-  print FO @tx[1];
-
-
-  print FO qq#      default:\n        return 0;\n    }\n    return 0;\n  }\n#.
-qq#							// response\n#.
-qq#  if(!json.isMember("result"))  return 0;\n\n  if(!json["id"].isInt()) return 0;\n\n#.
-qq#// here is extension of protocol, two fields added: _Result and _Method\n#.
-qq#  if(!json["result"].isMember("resultCode") || !json["result"]["resultCode"].isString())  return 0;\n#.
-qq#  if(!json["result"].isMember("method") || !json["result"]["method"].isString())  return 0;\n\n#.
-qq#  Methods m=getIndex(json["result"]["method"].asString().c_str());\n\n  switch(m)\n  {\n#;
-
-  @tx[2]=~s/\n  /\n/gs;
-  @tx[2]=~s/^  //gs;
-  print FO @tx[2];
-
-  print FO qq#    default:\n      return 0;\n  }\n\n  return 0;\n}\n\n\n#.
-qq#Json::Value Marshaller::Notification2JSON(const NsRPC2Communication::RPC2Notification* msg)\n{\n#.
-qq#  Json::Value j=Json::Value(Json::nullValue);\n  if(!msg) return j;\n\n  switch(msg->getMethod())\n  {\n#;
-
-  print FO @rx[0];
-
-  print FO qq#    default:\n      return j;\n  }\n}\n\n\n#.
-qq#Json::Value Marshaller::Request2JSON(const NsRPC2Communication::RPC2Request* msg)\n{\n#.
-qq#  Json::Value j=Json::Value(Json::nullValue);\n  if(!msg) return j;\n  switch(msg->getMethod())\n  {\n#;
-
-  print FO @rx[1];
-
-  print FO qq#    default:\n      return j;\n  }\n}\n\n\n#.
-qq#Json::Value Marshaller::Response2JSON(const NsRPC2Communication::RPC2Response* msg)\n{\n#.
-qq#  Json::Value j=Json::Value(Json::nullValue);\n  if(!msg) return j;\n  switch(msg->getMethod())\n  {\n#;
-
-  print FO @rx[2];
-
-#  my $z=join('::',@nss);
-#  $z.='::' if $z;
-
-  print FO qq#    default:\n      return j;\n  }\n}\n\n\nJson::Value Marshaller::toJSON(const RPC2Command* msg)\n{\n#.
-qq#  Json::Value j=Json::Value(Json::nullValue);\n  if(!msg) return j;\n\n  switch(msg->getCommandType())\n  {\n#.
-qq#    case RPC2Command::REQUEST:\n      return Request2JSON(static_cast<const RPC2Request*>(msg));\n    case RPC2Command::RESPONSE:\n#.
-qq#      return Response2JSON(static_cast<const RPC2Response*>(msg));\n    case RPC2Command::NOTIFICATION:\n#.
-qq#      return Notification2JSON(static_cast<const RPC2Notification*>(msg));\n\n    case RPC2Command::ERROR:\n#.
-qq#      return RPC2ErrorMarshaller::toJSON(*static_cast<const RPC2Error*>(msg));\n\n    case RPC2Command::UNDEFINED:\n#.
-qq#    default:\n      return j;\n  }\n}\n\n\nconst Marshaller::localHash Marshaller::mHashTable[#.@gclasses.
-qq#]=\n{\n#;
-
-  my $i;
-  my @tmp;
-  for($i=0;$i<@gclasses;$i++)
-  {
-    my $q=join('_',@{@gclasses[$i]->[2]});
-    push @tmp,sprintf '  {"%s%s",%u,&Marshaller::m%s__%s}',@gclasses[$i]->[3],@gclasses[$i]->[1],$i,$q,@gclasses[$i]->[1];
-  }
-
-  print FO join(",\n",@tmp);
-  print FO "\n\n};\n\nNsRPC2Communication::RPC2ErrorMarshaller Marshaller::mRPC2ErrorInternal;\n\n";
-
-foreach(@gclasses)
-{
-#  my $n=sprintf "%s::%s::%s",$config{'ns'},$_->[0],$_->[1];
-  my $n=sprintf "%s::%s",$_->[0],$_->[1];
-  my $x=sprintf "%s__%s",join('_',@{$_->[2]}),$_->[1];
-
-  printf FO "%sMarshaller Marshaller::m%s;\n",$n,$x;
-}
-
-close FO;
-
-sub fold
-{
-  my $t=shift;
-#rewrite, fold is buggy  
-#  $t=`echo "$t" | fold -s -w 80`;
-  my @x=split(/\s+/s,$t);
-  my $r;
-  my $a='';
-  my $len=60;
-  foreach(@x)
-  {
-    my $z=$_;
-    if(length($a)>=$len)
-    {
-      $r.=$a." \\\n ";
-      $a=$z;
-      next;
-    }
-    $a.=' '.$z;
-  }
-  $r=sprintf "%s %s\n\n",$r,$a;
-  $r=~s/  */ /gs;
-  $r=~s/^  */ /g;
-  $r=~s/^ +//;
-  return $r;
-}
-
-if(exists $config{'mk'})
-{
-  open(FO,'>',$config{'mk'}) or die "cant create mk file ".$config{'mk'};
-  my $prefix='XX';
-  my $t=sprintf "%s_SRC=",$prefix;
-  $t.="$_ " foreach @$mkdep;
-  print FO fold $t;
-
-  my $idl=$config{'idl'};
-
-  $t='#p#_OBJ=$(#p#_SRC:.#s#=.o)'."\n#p#_GP=#b#Marshaller.gp\n#p#_LIB=#b##p#.a\n#p#_INC=".'$'."(#p#_GP:.gp=.inc)\nIDL=#i#\n\n#p#_all: ".'$'."(#p#_OBJ)\n\n";
-  $t.='#p#_lib: $(#p#_LIB)'."\n\n";
-  
-  $t.='$(#p#_LIB): (#p#_OBJ)'."\n\t".'ar rcsu $@ $^'."\n\n";
-  $t=~s/#p#/$prefix/gs;
-  $t=~s/#i#/$idl/gs;
-  $t=~s/#b#/$base/gs;
-  $t=~s/#s#/$sc/gs;
-  print FO $t;
-
-  $t=sprintf "%sMarshaller.gp %s : %s",$base,join(' ',@$mklist),$idl;
-  print FO fold $t;
-  print FO "\n";
-  printf FO "%sMarshaller.inc : %sMarshaller.gp\n\tgperf %s --output-file=%s\n\n",$base,$base,'$<','$@';
-
-
-  $t='';
-#  $t.=`g++ -MM -MG -I. $_ `."\n\n" foreach @$mkdep;
-  my @deps;
-  foreach(@$mkdep)
-  {
-    my $p=$_;
-    my $o=$p;$o=~s/.$sc$/.o/;
-    my $d; (undef,$d,undef)=File::Spec->splitpath($p);
-    push @deps,[$d,scalar `g++ -MM -MG -MQ $o -I. $p `];
-  }
-
-  print FO join("\n\n",map { $_->[1] } @deps);
-
-  close FO;
-}
-
-print "done\n";
-
-1;
diff --git a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/scripts/pr0tojoin.pl b/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/scripts/pr0tojoin.pl
deleted file mode 100755
index afd7216e4..000000000
--- a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/scripts/pr0tojoin.pl
+++ /dev/null
@@ -1,493 +0,0 @@
-#!/usr/bin/perl
-
-# modified Wed Oct 24 10:49:58 EEST 2012
-
-use FileHandle;
-use File::Slurp;
-use File::Temp;
-use XML::Simple;
-use Sort::Topological qw(toposort);
-use JSON::XS;
-use Data::Dumper;
-use File::Spec;
-use Cwd;
-use Data::Compare;
-
-use strict;
-
-
-my %config;
-
-# args parse
-sub args_parse
-{
-   my @args=@ARGV;
-   my $t;
-   while($t=shift @args)
-   {
-     if($t eq '-1')    {  $config{'xml1'}=shift @args;   next;   }
-     if($t eq '-2')    {  $config{'xml2'}=shift @args;   next;   }
-#     if($t eq '-n1')    {  $config{'ns1'}=shift @args;   next;   }
-#     if($t eq '-n2')    {  $config{'ns2'}=shift @args;   next;   }
-#     if($t eq '-p')    {  $config{'path'}=shift @args; $config{'pimpl'}=shift @args;   next;   }
-     die 'unknown in command line '.$t;
-   }
-}
-
-args_parse();
-
-die 'no input' if not exists $config{'xml1'};
-die 'no input' if not exists $config{'xml2'};
-
-$config{'path'}='include' if not exists $config{'path'};
-$config{'pimpl'}='src' if not exists $config{'pimpl'};
-
-$config{'ns1'}='NsSmartDeviceLinkRPCV1' if not exists $config{'ns1'};
-$config{'ns2'}='NsSmartDeviceLinkRPCV2' if not exists $config{'ns2'};
-
-my %itypes= map { $_ => 1} qw(Boolean Integer String Float);
-
-sub load
-{
-  my $xn=shift;
-
-  my $xml=XMLin($xn,ContentKey => '__content', KeyAttr => [], ForceArray =>1, KeepRoot => 1);
-  die sprintf 'cant parse xml %s',$xn if not ref $xml;
-  die sprintf "interface section not found in xml %s",$xn if not exists $xml->{'interface'};
-
-  $xml=$xml->{'interface'}->[0];
-
-  my @table;
-  my %types;
-  my %exts;
-  my %dmt;
-  my %rdmt;
-  my %dmm;
-
-  foreach(qw(name date version))
-  {
-    die "$_ attribute found in tags" if ref $xml->{$_};
-    $exts{$_}=$xml->{$_} or die "$_ attribute not specified";
-  }
-
-  push @table,[$_->{'name'},$_->{'messagetype'},$_->{'param'},$_->{'description'}] foreach @{$xml->{'function'}};
-
-  for(my $i=0;$i<@table;$i++)
-  {
-    my $k=@table[$i];
-    my $n=$k->[0];
-    my $s=sprintf "%s : %s",$n,$k->[1];
-    $dmm{$s}={};
-    foreach(@{$k->[2]})
-    {
-      $dmm{$s}->{$_->{'type'}}=1 if not exists $itypes{$_->{'type'}};
-    }
-  }
-
-#die Dumper $xml->{'enum'};
-
-  foreach(@{$xml->{'enum'}})
-  {
-    my $k=$_;
-    die sprintf "duplicate definition %s",$k->{'name'} if exists $types{$k->{'name'}};
-    $types{$k->{'name'}}->{'list'}=[];
-    $types{$k->{'name'}}->{'ldesc'}=[];
-    $types{$k->{'name'}}->{'iname'}=[];
-
-    $types{$k->{'name'}}->{'type'}='enum';
-    push @{$types{$k->{'name'}}->{'list'}}, map { $_->{'name'} } @{$k->{'element'}};
-    push @{$types{$k->{'name'}}->{'ldesc'}}, map { $_->{'description'} } @{$k->{'element'}};
-    push @{$types{$k->{'name'}}->{'iname'}}, map { $_->{'internal_name'} } @{$k->{'element'}};
-  
-    for(my $i=0;$i<@{$types{$k->{'name'}}->{'list'}};$i++)
-    {
-      $types{$k->{'name'}}->{'iname'}->[$i]=$types{$k->{'name'}}->{'list'}->[$i] if not defined $types{$k->{'name'}}->{'iname'}->[$i];
-      if($types{$k->{'name'}}->{'iname'}->[$i]!~/^[a-zA-Z]/)
-      {
-        printf STDERR "ill-defined enum value %s in enum %s, fixing...\n",$types{$k->{'name'}}->{'iname'}->[$i],$k->{'name'};
-        $types{$k->{'name'}}->{'iname'}->[$i]="FIX_".$types{$k->{'name'}}->{'iname'}->[$i];
-      }
-    }
-
-    $types{$k->{'name'}}->{'descr'}=$k->{'description'} if exists $k->{'description'};
-  }
-
-  foreach(@{$xml->{'struct'}})
-  {
-    my $k=$_;
-    die sprintf "duplicate definition %s",$k->{'name'} if exists $types{$k->{'name'}};  
-    $types{$k->{'name'}}->{'list'}={};
-    $types{$k->{'name'}}->{'type'}='struct';
-    %{$types{$k->{'name'}}->{'list'}}= map { $_->{'name'} , $_ } @{$k->{'param'}};
-    $types{$k->{'name'}}->{'descr'}=$k->{'description'} if exists $k->{'description'};
-  }
-
-  foreach(@{$xml->{'variant'}})
-  {
-    my $k=$_;
-    die sprintf "duplicate definition %s",$k->{'name'} if exists $types{$k->{'name'}};
-    $types{$k->{'name'}}->{'list'}={};
-    $types{$k->{'name'}}->{'type'}='variant';
-#  die Dumper $k->{'element'};
-    %{$types{$k->{'name'}}->{'list'}}= map { $_->{'name'} , $_ } @{$k->{'param'}};
-    $types{$k->{'name'}}->{'descr'}=$k->{'description'} if exists $k->{'description'};
-  
-    $types{$k->{'name'}}->{'list'}->{$_}->{'ename'}= $types{$k->{'name'}}->{'list'}->{$_}->{'name'}
-      foreach keys %{$types{$k->{'name'}}->{'list'}};
-
-    $types{$k->{'name'}}->{'ldesc'}=[];
-    push @{$types{$k->{'name'}}->{'ldesc'}}, map { $_->{'description'} } @{$k->{'param'}};
-  }
-
-#fixing conflicts
-
-  {
-    my %tmp;
-    foreach(sort keys %types)
-    {
-      my $n=$_;
-      if($types{$n}->{'type'} eq 'enum')
-      {
-        $tmp{$_}=['enum',$n,$_] foreach @{$types{$n}->{'iname'}};
-        next;
-      }
-
-      if($types{$n}->{'type'} eq 'variant')
-      {
-#      $tmp{$_}++ foreach @{$types{$n}->{'iname'}};
-        $tmp{$types{$n}->{'list'}->{$_}->{'ename'}}=['variant',$n,$_] foreach keys %{$types{$n}->{'list'}};
-        next;
-      }
-    }
-#    die Dumper \%tmp;
-
-    foreach(sort keys %types)
-    {
-      my $n=$_;
-      next if not exists $tmp{$n};
-      printf STDERR "naming conflict for %s class/enumerator: %s, not fixable\n",$n,Dumper $tmp{$n};
-      die Dumper $types{$tmp{$n}->[1]}->{'list'};
-    }
-  } 
-
-  undef $xml;
-
-  foreach(sort keys %types)
-  {
-    $dmt{$_}={};
-    next if $types{$_}->{'type'} eq 'enum';
-    my $n=$_;
-
-    foreach(values %{$types{$n}->{'list'}})
-    {
-      next if exists $itypes{$_->{'type'}};
-      my $k=$_;
-      die sprintf "unknown type in structure definition %s:%s %s",$n,$k->{'name'},$k->{'type'} if not exists $types{$k->{'type'}};
-      $dmt{$n}->{$k->{'type'}}=1;
-      $rdmt{$k->{'type'}}=[] if not exists $rdmt{$k->{'type'}};
-      push @{$rdmt{$k->{'type'}}},$n;
-    }
-  }
-
-  foreach(keys %dmm)
-  {
-    my $k=$_;
-    my $v=$dmm{$_};
-    foreach(keys %$v)
-    {
-      die sprintf "type '%s' not found in method %s",$_,$k if not exists $types{$_};
-    }
-  }
-
-#die Dumper %types;
-
-  my $rv=[{},{},[],{},{},{}];
-  %{$rv->[0]}=%exts;
-  %{$rv->[1]}=%types;
-  @{$rv->[2]}=@table;
-  %{$rv->[3]}=%dmt;
-  %{$rv->[4]}=%dmm;
-  %{$rv->[5]}=%rdmt;
-
-  return $rv;
-}
-
-
-my $t1=load($config{'xml1'});
-my $t2=load($config{'xml2'});
-
-
-my @table=@{$t1->[2]};
-my %types=%{$t1->[1]};
-my %exts=%{$t1->[0]};
-my %dmt=%{$t1->[3]};
-my %dmm=%{$t1->[4]};
-
-#die Dumper \%dmt;
-
-foreach (sort keys %{$t2->[0]})
-{
-  if(not exists $exts{$_})
-  {
-    $exts{$_}=$t2->[0]->{$_};
-    next;
-  }
-  next if $exts{$_} eq $t2->[0]->{$_};
-  $exts{$_}.=' / '.$t2->[0]->{$_};
-}
-
-
-my %mod;
-
-my @l=sort keys %{$t2->[1]};
-
-my @order=qw(a b c d e f);
-
-my %horder=map { my $t=[]; push @$t,keys %{$t2->[3]{$_}}; $_ => $t } sort keys %{$t2->[3]};
-
-sub topo_children { @{$horder{$_[0]} || []}; }
-my @ts=reverse toposort(\&topo_children,\@l);
-
-#die Dumper(\@ts);
-
-sub genfix
-{
-  my $x=shift;
-  $x.='_fix';
-  $x.='_fix' while exists $types{$x};
-  return $x;
-}
-
-
-foreach (@ts)
-{
-  my $k=$_;
-  my $s=$k;
-  $k=$mod{$k} while exists $mod{$k};
-  my $v=$t2->[1]->{$s};
-
-  if(exists $mod{$s})
-  {
-     foreach(@{$t2->[5]->{$s}})
-     {
-       my $z=$_;
-       next if exists $mod{$z};
-       $mod{$z}=genfix($z);
-     }
-  }
-
-  if($v->{'type'} ne 'enum')
-  {
-    foreach(keys %{$v->{'list'}})
-    {
-      my $n=$_;
-      my $vn=$v->{'list'}->{$n};
-      next if exists $itypes{$v->{'list'}->{$n}->{'type'}};
-
-      my $z=$v->{'list'}->{$n}->{'type'};
-      $z=$mod{$z} 
-        while exists $mod{$z};# and $mod{$z}->[0]!=1;
-      $v->{'list'}->{$n}->{'type'}=$z;
-    }
-  }
-
-  if(not exists $types{$k})
-  {
-    $types{$k}=$v;
-#    delete $t2->[1]->{$k}; #='moved';
-#todo: add namespace
-
-    next;
-  }
-
-  my $v0=$types{$k};
-  if($v0->{'type'} ne $v->{'type'})
-  {
-fix:
-    printf STDERR "fixing type conflict for %s -> %s_fix\n",$k,$k;
-    my $nk=genfix($k);
-
-    $mod{$s}=$nk;
-    $types{$nk}=$v;
-    
-    next if not exists $t2->[5]->{$s};
-
-    my @l=@{$t2->[5]->{$s}};
-
-    foreach(@{$t2->[5]->{$s}})
-    {
-       my $z=$_;
-       next if exists $mod{$z};
-       $mod{$z}=genfix($z);
-    }
-
-#    $mov{$nk}=$nk;
-    next;
-  }
-
-# struct -> list ->
-# variant -> list ->
-
-  if($v->{'type'} eq 'enum')
-  {
-    goto fix if @{$v->{'list'}}!=@{$v0->{'list'}} or @{$v->{'iname'}}!=@{$v0->{'iname'}};
-    for(my $t=0;$t<@{$v->{'list'}};$t++)
-    {
-      goto fix if $v->{'list'}->[$t] ne $v0->{'list'}->[$t];
-    }
-
-    for(my $t=0;$t<@{$v->{'iname'}};$t++)
-    {
-      goto fix if $v->{'iname'}->[$t] ne $v0->{'iname'}->[$t];
-    }
-    next;
-  }
-
-#  printf "0 %s\n",scalar keys %{$v->{'list'}};
-#  print Dumper($v->{'list'});
-  foreach(keys %{$v->{'list'}})
-  {
-    my $n=$_;
-    my $vn=$v->{'list'}->{$n};
-    next if exists $itypes{$v->{'list'}->{$n}->{'type'}};
-
-    my $z=$v->{'list'}->{$n}->{'type'};
-    $z=$mod{$z} 
-      while exists $mod{$z};# and $mod{$z}->[0]!=1;
-    $v->{'list'}->{$n}->{'type'}=$z;
-  }
-
-#    if $s eq 'VehicleType';
-
-  goto fix if Compare($v->{'list'},$v0->{'list'},{ ignore_hash_keys => ['description','platform','element','issue'] });
-  printf STDERR "duplicate structures %s, no fixing required, simple skipped\n",$k;
-  
-}
-
-#die Dumper \%types;
-
-#foreach(keys %mod)
-
-
-my %q0=map { sprintf("%s : %s",$_->[0],$_->[1]) => $_ } @{$t1->[2]};
-my %q=map { sprintf("%s : %s",$_->[0],$_->[1]) => $_ } @{$t2->[2]};
-
-my %fixed;
-
-foreach(sort keys %q)
-{
-  my $k=$_;
-  my $v=$q{$k};
-  for(my $i=0;$i<@{$v->[2]};$i++)
-  {
-    my $t=$v->[2]->[$i]->{'type'};
-    next if exists $itypes{$t};
-    next if not exists $mod{$t};
-    $t=$mod{$t} while exists $mod{$t};
-    $v->[2]->[$i]->{'type'}=$t;
-  }
-}
-
-foreach(sort %q)
-{
-  my $k=$_;
-  my $v=$q{$k};
-
-  my $nk=$v->[0];
-  $nk=$k.'_fix';
-
-  next if not exists $q0{$k};
-  my $v0=$q0{$k};
-  
-  if($v->[0] ne $v0->[0]) #or $v->[1] ne $v0->[1])
-  {
-fix:
-    printf STDERR "fixing method conflict for %s -> %s\n",$k,$nk;
-    $fixed{$v->[0]}=$nk;
-    next;
-  }
-
-  goto fix if not Compare($v->[2],$v0->[2],{ ignore_hash_keys => ['description','platform','element'] });
-  printf STDERR "duplicate method %s\n",$k;
-}
-
-#die Dumper \@table;
-
-foreach(sort keys %q)
-{
-  my $k=$_;
-  my $v=$q{$k};
- 
-  $v->[0].='_fix' if exists $fixed{$v->[0]};
-  push @table,$v;
-}
-
-my %res;
-$res{'interface'}=[{}];
-my $r=$res{'interface'}->[0];
-
-%$r=%exts;
-
-$r->{'function'}=[];
-
-foreach(@table)
-{
-  my $k=$_;
-  my $x={};
-  $x->{'name'}=$k->[0];
-  $x->{'messagetype'}=$k->[1];
-  $x->{'param'}=$k->[2];
-  $x->{'description'}=$k->[3];
-  push @{$r->{'function'}},$x;
-}
-
-$r->{'enum'}=[];
-$r->{'variant'}=[];
-$r->{'struct'}=[];
-
-foreach(sort keys %types)
-{
-  my $k=$_;
-  my $v=$types{$k};
-
-  my $x={};
-
-  $x->{'name'}=$k;
-  $x->{'description'}=[];
-  $x->{'description'}=$v->{'descr'} if exists $v->{'descr'};
-
-  if($v->{'type'} eq 'enum')
-  {
-    $x->{'element'}=[];
-    for(my $i=0;$i<@{$v->{'list'}};$i++)
-    {
-      my $z={};
-      $z->{'name'}=$v->{'list'}->[$i];
-      $z->{'internal_name'}=$v->{'iname'}->[$i];
-      $z->{'description'}=$v->{'ldesc'}->[$i] if defined $v->{'ldesc'}->[$i];
-      push @{$x->{'element'}},$z;
-    }
-  } 
-  elsif($v->{'type'} eq 'struct')
-  {
-    $x->{'param'}=[];
-    push @{$x->{'param'}},$v->{'list'}->{$_} foreach sort keys %{$v->{'list'}};
-  }
-  else					# variant, not deep tested yet
-  {
-    $x->{'param'}=[];
-    push @{$x->{'param'}},$v->{'list'}->{$_} foreach sort keys %{$v->{'list'}};
-  }
-
-  push @{$r->{$v->{'type'}}},$x;
-}
-
-
-#die Dumper \@table;
-print XMLout(\%res,'KeepRoot' => 1);
-
-print STDERR "done\n";
-#die Dumper \%types;
-exit 0;
-
-
diff --git a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/scripts/robok0der.pl b/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/scripts/robok0der.pl
deleted file mode 100755
index ddc38ed55..000000000
--- a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/scripts/robok0der.pl
+++ /dev/null
@@ -1,2775 +0,0 @@
-#!/usr/bin/perl
-
-# modified Wed Oct 24 10:49:58 EEST 2012
-
-use FileHandle;
-use File::Slurp;
-use File::Temp;
-use XML::Simple;
-#use Sort::Topological qw(toposort);
-use JSON::XS;
-use Data::Dumper;
-use File::Spec;
-use Cwd;
-
-use strict;
-
-#$SIG{PIPE} = 'IGNORE';
-
-
-my %config;
-
-# args parse
-sub args_parse
-{
-   my @args=@ARGV;
-   my $t;
-   while($t=shift @args)
-   {
-     if($t eq '-i')    {  $config{'xml'}=shift @args;   next;   }
-     if($t eq '-r')   {  $config{'random'}=shift @args; next; }
-     if($t eq '-c')   {  $config{'loops'}=shift @args; next; }
-     if($t eq '-log')   {  $config{'log'}=shift @args; next; }
-     if($t eq '-lib')   {  $config{'lib'}=shift @args; next; }
-     if($t eq '-n')   {  $config{'ns'}=shift @args; next; }
-     if($t eq '-s')   {  $config{'style'}=shift @args; next; }
-     if($t eq '-sh')   {  $config{'sh'}=shift @args; next; }
-     if($t eq '-sc')   {  $config{'sc'}=shift @args; next; }
-     if($t eq '-ee')   {  $config{'ee'}=1; next; }
-     if($t eq '-p')    {  $config{'pver'}=shift @args;   next;   }
-     if($t eq '-g')    {  $config{'pragma'}=1;   next;   }
-     if($t eq '-a')    {  $config{'abs'}=1;   next;   }
-
-     if($t eq '-md')   {  $config{'dryrun'}=shift @args; $config{'mode'}='dryrun'; next; }
-     if($t eq '-mf')   {  $config{'fuzzer'}=shift @args; $config{'mode'}='fuzzer'; next; }
-     if($t eq '-mg')   {  $config{'generate'}=shift @args; $config{'pimpl'}=shift @args; $config{'mode'}='generate'; next; }
-
-     die 'unknown in command line '.$t;
-   }
-}
-
-args_parse();
-
-die 'no input' if not exists $config{'xml'};
-die 'nothing to do' if not exists $config{'mode'};
-die sprintf "cant open input xml %s",$config{'xml'} if not -e $config{'xml'};
-
-# parse xml
-my $xml=XMLin($config{'xml'},ContentKey => '__content', KeyAttr => [], ForceArray =>1, KeepRoot => 1);
-die 'cant parse xml' if not ref $xml;
-
-die "interface section not found in xml" if not exists $xml->{'interface'};
-
-$xml=$xml->{'interface'}->[0];
-
-my @table;
-my %types;
-my %exts;
-
-
-foreach(qw(name date version))
-{
-  die "$_ attribute found in tags" if ref $xml->{$_};
-  $exts{$_}=$xml->{$_} or die "$_ attribute not specified";
-}
-
-my %json=(
-  'Float' => 'Double',
-  'Integer' => 'Int',
-  'Boolean' => 'Bool',
-  'String' => 'String'
-);
-
-my %json2=(
-  'Float' => 'Numeric',
-  'Integer' => 'Int',
-  'Boolean' => 'Bool',
-  'String' => 'String'
-);
-
-
-push @table,[$_->{'name'},$_->{'messagetype'},$_->{'param'},$_->{'description'}] foreach @{$xml->{'function'}};
-
-
-foreach(@{$xml->{'enum'}})
-{
-  my $k=$_;
-  die sprintf "duplicate definition %s",$k->{'name'} if exists $types{$k->{'name'}};
-  $types{$k->{'name'}}->{'list'}=[];
-  $types{$k->{'name'}}->{'ldesc'}=[];
-  $types{$k->{'name'}}->{'iname'}=[];
-
-  $types{$k->{'name'}}->{'type'}='enum';
-  push @{$types{$k->{'name'}}->{'list'}}, map { $_->{'name'} } @{$k->{'element'}};
-  push @{$types{$k->{'name'}}->{'ldesc'}}, map { $_->{'description'} } @{$k->{'element'}};
-  push @{$types{$k->{'name'}}->{'iname'}}, map { $_->{'internal_name'} } @{$k->{'element'}};
-  
-  for(my $i=0;$i<@{$types{$k->{'name'}}->{'list'}};$i++)
-  {
-    $types{$k->{'name'}}->{'iname'}->[$i]=$types{$k->{'name'}}->{'list'}->[$i] if not defined $types{$k->{'name'}}->{'iname'}->[$i];
-    if($types{$k->{'name'}}->{'iname'}->[$i]!~/^[a-zA-Z]/)
-    {
-      printf STDERR "ill-defined enum value %s in enum %s, fixing...\n",$types{$k->{'name'}}->{'iname'}->[$i],$k->{'name'};
-      $types{$k->{'name'}}->{'iname'}->[$i]="FIX_".$types{$k->{'name'}}->{'iname'}->[$i];
-    }
-  }
-
-  $types{$k->{'name'}}->{'descr'}=$k->{'description'} if exists $k->{'description'};
-}
-
-
-foreach(@{$xml->{'struct'}})
-{
-  my $k=$_;
-  die sprintf "duplicate definition %s",$k->{'name'} if exists $types{$k->{'name'}};  
-  $types{$k->{'name'}}->{'list'}={};
-  $types{$k->{'name'}}->{'type'}='struct';
-  %{$types{$k->{'name'}}->{'list'}}= map { $_->{'name'} , $_ } @{$k->{'param'}};
-  $types{$k->{'name'}}->{'descr'}=$k->{'description'} if exists $k->{'description'};
-}
-
-foreach(@{$xml->{'variant'}})
-{
-  my $k=$_;
-  die sprintf "duplicate definition %s",$k->{'name'} if exists $types{$k->{'name'}};
-  $types{$k->{'name'}}->{'list'}={};
-  $types{$k->{'name'}}->{'type'}='variant';
-#  die Dumper $k->{'element'};
-  %{$types{$k->{'name'}}->{'list'}}= map { $_->{'name'} , $_ } @{$k->{'param'}};
-  $types{$k->{'name'}}->{'descr'}=$k->{'description'} if exists $k->{'description'};
-  
-  $types{$k->{'name'}}->{'list'}->{$_}->{'ename'}= $types{$k->{'name'}}->{'list'}->{$_}->{'name'}
-    foreach keys %{$types{$k->{'name'}}->{'list'}};
-
-  $types{$k->{'name'}}->{'ldesc'}=[];
-  push @{$types{$k->{'name'}}->{'ldesc'}}, map { $_->{'description'} } @{$k->{'param'}};
-}
-
-#fixing conflicts
-
-{
-  my %tmp;
-  foreach(sort keys %types)
-  {
-    my $n=$_;
-    if($types{$n}->{'type'} eq 'enum')
-    {
-      $tmp{$_}=['enum',$n,$_] foreach @{$types{$n}->{'iname'}};
-      next;
-    }
-
-    if($types{$n}->{'type'} eq 'variant')
-    {
-#      $tmp{$_}++ foreach @{$types{$n}->{'iname'}};
-      $tmp{$types{$n}->{'list'}->{$_}->{'ename'}}=['variant',$n,$_] foreach keys %{$types{$n}->{'list'}};
-      next;
-    }
-  }
-#    die Dumper \%tmp;
-
-  foreach(sort keys %types)
-  {
-    my $n=$_;
-    next if not exists $tmp{$n};
-    printf STDERR "naming conflict for %s class/enumerator: %s, not fixable\n",$n,Dumper $tmp{$n};
-    die Dumper $types{$tmp{$n}->[1]}->{'list'};
-  }
-} 
-
-undef $xml;
-
-
-my $rnd= exists $config{'random'} ? $config{'random'} : $$ ^ time;
-
-
-goto generate if $config{'mode'} eq 'generate';
-
-
-printf STDERR "random is %u\n",$rnd;
-srand($rnd);
-
-
-my $maxstring=10;
-my $maxarray=10;
-
-sub generate_type_valid
-{
-  my $p=shift;
-  return undef if($p->{'mandatory'} eq 'false' and (int rand 2)==0);
-  
-  if($p->{'array'} eq 'true')
-  {
-    my $minsize=0;
-    my $maxsize=$maxarray;
-    
-    $minsize=$p->{'minsize'} if exists $p->{'minsize'};
-    $maxsize=$p->{'maxsize'} if exists $p->{'maxsize'};
-    my $size= $minsize+ int rand ($maxsize-$minsize);
-    my $rv=[];
-
-    my $tp= {%$p};
-    $tp->{'array'}='false';
-    $tp->{'mandatory'}='true';
-    
-    push @$rv,generate_type_valid($tp) while $size--;
-    return $rv;
-  }
-  
-  return (JSON::XS::false,JSON::XS::true)[int rand 2] if $p->{'type'} eq 'Boolean';
-  if($p->{'type'} eq 'Float')
-  {
-    my $minsize=0;
-    my $maxsize=100;
-    
-    $minsize=$p->{'minvalue'} if exists $p->{'minvalue'};
-    $maxsize=$p->{'maxvalue'} if exists $p->{'maxvalue'};
-    return ($minsize+ rand ($maxsize-$minsize));
-  }
-
-  if($p->{'type'} eq 'Integer')
-  {
-    my $minsize=0;
-    my $maxsize=100;
-    
-    $minsize=$p->{'minvalue'} if exists $p->{'minvalue'};
-    $maxsize=$p->{'maxvalue'} if exists $p->{'maxvalue'};
-
-    return ($minsize+ int rand ($maxsize-$minsize));
-  }
-
-  if($p->{'type'} eq 'String')
-  {
-    my $maxl=$maxstring;
-    $maxl= $p->{'maxlength'} if exists $p->{'maxlength'};
-    return chr(1+int rand 127) x int rand $maxl;
-#    return chr(int rand 256) x int rand $maxl;
-  }
-
-  die "not defined type: ".Dumper $p if not exists $types{$p->{'type'}};
-  
-  if($types{$p->{'type'}}->{'type'} eq 'enum')
-  {
-     return $types{$p->{'type'}}->{'list'}->[int rand @{$types{$p->{'type'}}->{'list'}}]
-  }
-
-  if($types{$p->{'type'}}->{'type'} eq 'variant')
-  {
-     my @z=sort keys %{$types{$p->{'type'}}->{'list'}};
-     my $q=@z[int rand @z];
-     return { $q => generate_type_valid($types{$p->{'type'}}->{'list'}->{$q}) };
-  }
-
-
-  if($types{$p->{'type'}}->{'type'} eq 'struct')
-  {
-     my $q={};
-     foreach(sort keys %{$types{$p->{'type'}}->{'list'}})
-     {
-       my $t=$_;
-       $types{$p->{'type'}}->{'list'}->{$t};
-       my $z=generate_type_valid($types{$p->{'type'}}->{'list'}->{$t});
-       $q->{$t}=$z if defined $z;
-     }
-     return $q;
-  }
-
-  die 'unknown tag: '.Dumper $p->{'type'};
-}
-
-sub generate_valid
-{
-  my $method=@table[int rand @table];
-  my $rv={};
-
-
-  foreach(@{$method->[2]})
-  {
-    next if exists $_->{'mandatory'} and (int rand 2)==0;
-    my $t=generate_type_valid($_);
-    $rv->{$_->{'name'}} = $t if defined $t;
-  }
- 
-  return { $method->[1] => { 'name' => $method->[0] , 'correlationID' => int rand 100000, 'parameters' => $rv}};
-}
-
-my $iters=$config{'loops'};
-
-$iters+=0;
-$iters=10 if $iters==0;
-
-goto dryrun if $config{'mode'} eq 'dryrun';
-
-my $log=$config{'log'};
-$log='fuzzer.log' if $log eq '';
-unlink $log;
-
-my $name=tmpnam();
-
-`date >>$log`;
-`ddate >>$log`;
-#`echo $rnd >>$log`;
-
-open(LOG,'>>',$log) or die;
-LOG->autoflush(1);
-printf LOG "random base %s\n",$rnd;
-
-my $json;
-my $err=0;
-my $cnt=0;
-
-my $json_xs=JSON::XS->new->utf8;
-
-my $tpath=$config{'fuzzer'};
-
-while($iters--)
-{
-  printf STDERR "%u remaining\n",$iters;
-  open(FO, "|valgrind --tool=memcheck --leak-check=full --num-callers=24 --show-reachable=yes --track-fds=yes $tpath/alrpctest 2>&1 | grep -v DWARF >$name ; echo \"--finish--\" >>$name" )
-        or die "cant open";
-  FO->autoflush(1);
-  $cnt++;
-#  $json_xs->encode($perl_data);
-#  $json=encode_json(generate_valid());
-  $json=$json_xs->encode(generate_valid());
-  printf FO "%s\n",$json;
-  close FO;
-  my $res;
-  do
-  {
-    $res=read_file($name);
-  } unless($res=~/--finish--$/s);
-
-#'ERROR SUMMARY: 0 errors from 0 contexts'
-#'--error--'
-  if($res=~/\n--error--\n/s or $res!~/ERROR SUMMARY: 0 errors from 0 contexts/s)
-  {
-    $err++;
-    printf LOG "::SENT\n%s\n",$json;
-    printf LOG "::RECEIVED\n%s\n",$res;
-  }
-}
-
-printf LOG "\n\ntotal runs %u, errors %u, random base %u\n\n",$cnt,$err,$rnd;
-close LOG;
-
-unlink $name;
-
-printf STDERR "total runs %u, errors %u, random base %u\n\n",$cnt,$err,$rnd;
-
-exit 0;
-
-dryrun:
-
-$log=$config{'dryrun'};
-
-my $json_xs=JSON::XS->new->utf8;
-
-open(FO, '>', $log) or die "cant open";
-FO->autoflush(1);
-
-printf FO "%s\n",$json_xs->encode(generate_valid()) while $iters--;
-close FO;
-
-exit 0;
-
-generate:
-
-# dependencies checking
-# i think it will be safer skip dependency checking. may be later when Moon moved in other constellation. today is bad time, really. :-)
-
-
-# preparing
-
-my $path=$config{'generate'};
-$path=~s/\/$//;
-$path.='/';
-
-my $pver=exists $config{'pver'} ? $config{'pver'} : 1;
-my $pimpl=$config{'pimpl'};
-$pimpl=~s/\/$//;
-$pimpl.='/';
-
-my $lib=$config{'lib'};
-$lib ='lib' if $lib eq '';
-$lib=~s/\/$//;
-$lib.='/';
-
-my $p2i=File::Spec->abs2rel($path,$pimpl);
-my $i2p=File::Spec->abs2rel($pimpl,$path);
-my $i2l=File::Spec->abs2rel($lib,$path);
-
-$p2i=$path if exists $config{'abs'};
-$i2p=$pimpl if exists $config{'abs'};
-$i2l=$lib if exists $config{'abs'};
-
-$p2i=~s/\/$//;
-$i2p=~s/\/$//;
-$i2l=~s/\/$//;
-
-
-my $ns=$config{'ns'};
-my $ind= $ns eq '' ? '' : '  ';
-
-my $sh=exists $config{'sh'} ? $config{'sh'} : 'hh';
-my $sc=exists $config{'sc'} ? $config{'sc'} : 'cc';
-
-`mkdir -p $path`;
-`mkdir -p $pimpl`;
-
-my $timestamp=gmtime(time());
-
-my $pragma='';
-#$pragma = sprintf "#pragma GCC dependency \"%s\"\n\n",File::Spec->canonpath($config{'xml'}) if exists $config{'pragma'};
-$pragma = sprintf "#pragma GCC dependency \"%s\"\n\n",Cwd::realpath($config{'xml'}) if exists $config{'pragma'};
-
-my $timemod;
-
-{
-  my @a=stat $config{'xml'};
-  $timemod=gmtime(@a[9]);
-  undef @a;
-}
-
-sub getfort
-{
-  my $x=`fortune -s`;
-
-  $x=~s/\*\//* \//gs;
-  $x=~s/\/\*/\/ \*/gs;
-  return sprintf "/*\n%s*/\n",$x;
-}
-
-my $hat=sprintf "\n/*\n  interface\t%s\n  version\t%s\n  date\t\t%s\n  generated at\t%s\n  source stamp\t%s\n  author\tRC\n*/\n\n",
-        $exts{'name'},$exts{'version'},$exts{'date'},$timestamp,$timemod;
-
-my $dd=`ddate`;
-$dd=~s/\n/ /gs;
-$hat= sprintf "// %s%s",$dd,$hat if exists $config{'ee'};
-
-my $prefix=$ns eq '' ? "" : sprintf "%s_",uc $ns;
-
-
-sub header_h
-{
-  my $name=shift;
-
-  return sprintf "%s#ifndef %s%s_INCLUDE\n#define %s%s_INCLUDE\n\n",
-          $pragma,
-          $prefix,uc $name,$prefix,uc $name;
-}
-
-
-sub comment2
-{
-  my $x=shift;
-  return '' if $x eq '';
-  return sprintf "\n///  %s\n",$x if not ref $x;
-  return sprintf "\n///  %s\n",$x->[0] if @$x==1;
-  return sprintf "\n/**\n     %s\n*/\n",join("\n     ",@$x);
-}
-
-sub comment
-{
-  my $x=shift;
-  return '' if not ref $x;
-  return '' if not exists $x->{'descr'};
-  my $d=join("\n     ",@{$x->{'descr'}});
-  return @{$x->{'descr'}}>1 ? sprintf "\n/**\n     %s\n*/\n",$d : sprintf "\n///  %s\n",$d;
-}
-
-sub mkpath
-{
-  my $x=shift;
-  my $s=shift;
-#  $x=$path.'/'.$x.'.'.$s;
-  $x.='.'.$s;
-  return '>'.$x if not exists $config{'style'};
-  return sprintf "| %s > %s",$config{'style'},$x;
-}
-
-open(FO,mkpath($pimpl.'PerfectHashTable',$sh)) or die;
-print FO "#ifndef PERFECTHASHTABLE_INCLUDE\n#define PERFECTHASHTABLE_INCLUDE\n\n";
-
-print FO "struct PerfectHashTable\n{\n  const char *name;\n  unsigned int idx;\n};\n" if $ns eq '';
-printf FO "namespace %s\n{\n  struct PerfectHashTable\n  {\n    const char *name;\n    unsigned int idx;\n  };\n}",$ns if $ns ne '';
-
-print FO "\n#endif\n";
-close FO;
-
-# enums processing, 4 files per type produced.
-foreach(sort keys %types)
-{
-  my $k=$_;
-  next if $types{$k}->{'type'} ne 'enum';
-  my $cmt=comment($types{$k});
-
-  open(FO,mkpath($path.$k,$sh)) or die;
-  print FO header_h($k);
-  print FO $hat;
-
-  my $templ_enum='
-class #name#
-{
-public:
-  enum #name#Internal
-  {
-    INVALID_ENUM=-1'
-;
-#    EN_US=0,
-  my $templ_enum2='
-  };
-
-  #name#() : mInternal(INVALID_ENUM)				{}
-  #name#(#name#Internal e) : mInternal(e)		{}
-
-  #name#Internal get(void) const	{ return mInternal; }
-  void set(#name#Internal e)		{ mInternal=e; }
-
-private:
-  #name#Internal mInternal;
-  friend class #name#Marshaller;
-};
-';
-  printf FO "namespace %s\n{\n",$ns if $ns ne '';
-  print FO $cmt;
-  my $t=$templ_enum;
-  $t=~s/\n/\n  /gs if $ns ne '';
-  $t=~s/#name#/$k/gs;
-  print FO $t;
-  
-#  die Dumper($types{$k}) if $k eq 'Language';
-  
-  for(my $i=0;$i<@{$types{$k}->{'list'}};$i++)
-  {
-    my $c='';
-    $c=comment2($types{$k}->{'ldesc'}->[$i]) if defined $types{$k}->{'ldesc'}->[$i];
-    printf FO ",\n";
-    printf FO $c if $c ne '';
-    my $t= defined $types{$k}->{'iname'}->[$i] ? $types{$k}->{'iname'}->[$i] : $types{$k}->{'list'}->[$i];
-    printf FO "    %s%s=%u",$ind,$t,$i;
-  }  
-  $t=$templ_enum2;
-  $t=~s/\n/\n  /gs if $ns ne '';
-  $t=~s/#name#/$k/gs;
-  print FO $t;
-  print FO "\n}\n" if $ns ne '';
-  print FO "\n#endif\n";
-  close FO;
-
-  open(FO,'>',sprintf "%s%sMarshaller.gp",$pimpl,$k) or die;
-
-  print FO "%language=C++\n%struct-type\n%define lookup-function-name getPointer\n%define class-name ".$k."_intHash\n%omit-struct-type\n";
-  print FO "%readonly-tables\n%compare-strncmp\n%compare-lengths\n\nstruct ";
-  printf FO "%s::",$ns if $ns ne '';
-  print FO "PerfectHashTable\n{\n  const char *name;\n  unsigned int idx;\n};\n\n%%\n";
-
-  for(my $i=0;$i<@{$types{$k}->{'list'}};$i++)
-  {
-    printf FO "%s,%u\n",$types{$k}->{'list'}->[$i],$i;
-  }
-
-  close FO;
-  
-  open(FO,mkpath(sprintf('%s%sMarshaller',$pimpl,$k),$sh)) or die;
-  print FO header_h($k.'Marshaller');
-  
-#  printf FO "#include <string>\n#include <json/json.h>\n\n#include \"PerfectHashTable.%s\"\n\n#include \"../%s.%s\"\n\n",$sh,$k,$sh;
-  printf FO "#include <string>\n#include <json/json.h>\n\n#include \"PerfectHashTable.%s\"\n\n#include \"%s/%s.%s\"\n\n",$sh,$p2i,$k,$sh;
-
-  print FO $hat;
-  printf FO "namespace %s\n{\n",$ns if $ns ne '';
-
-  printf FO "\n//! marshalling class for %s\n",$k;
-
-  my $templ='
-class #name#Marshaller
-{
-public:
-
-  static std::string toName(const #name#& e) 	{ return getName(e.mInternal) ?: ""; }
-
-  static bool fromName(#name#& e,const std::string& s)
-  { 
-    return (e.mInternal=getIndex(s.c_str()))!=#name#::INVALID_ENUM;
-  }
-
-  static bool checkIntegrity(#name#& e)		{ return e.mInternal!=#name#::INVALID_ENUM; } 
-  static bool checkIntegrityConst(const #name#& e)	{ return e.mInternal!=#name#::INVALID_ENUM; } 
-
-  static bool fromString(const std::string& s,#name#& e);
-  static const std::string toString(const #name#& e);
-
-  static bool fromJSON(const Json::Value& s,#name#& e);
-  static Json::Value toJSON(const #name#& e);
-
-  static const char* getName(#name#::#name#Internal e)
-  {
-     return (e>=0 && e<#num#) ? mHashTable[e].name : NULL;
-  }
-
-  static const #name#::#name#Internal getIndex(const char* s);
-
-  static const PerfectHashTable mHashTable[#num#];
-};
-';
-  my $z=$templ;
-  $z=~s/\n/\n  /gs if $ns ne '';
-  $z=~s/#name#/$k/gs;
-  my $t=@{$types{$k}->{'list'}};
-  $z=~s/#num#/$t/gs;
-   
-  print FO $z;
-
-  print FO "\n}\n" if $ns ne '';
-
-  print FO "\n#endif\n";
-  close FO;
-
-# enumerator marshaller cc file
-
-  open(FO,mkpath(sprintf('%s%sMarshaller',$pimpl,$k),$sc)) or die;
-  print FO $pragma;
-  my $nsc= $ns eq '' ? '' : "using namespace $ns;\n";
-  my $hhat=$hat;
-  {
-    if(exists $config{'ee'})
-    {
-      $hhat=~s/^\/\/.*?\n//s;
-      $hhat=getfort().$hhat;
-    }
-  }
-
-  
-$templ='#include <cstring>
-#include "#p2i#/#name#.#sh#"
-#include "#name#Marshaller.#sh#"
-#include "#name#Marshaller.inc"
-
-'.$hhat.$nsc.'
-
-const #name#::#name#Internal #name#Marshaller::getIndex(const char* s)
-{
-  if(!s)
-    return #name#::INVALID_ENUM;
-  const struct PerfectHashTable* p=#name#_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<#name#::#name#Internal>(p->idx) : #name#::INVALID_ENUM;
-}
-
-
-bool #name#Marshaller::fromJSON(const Json::Value& s,#name#& e)
-{
-  e.mInternal=#name#::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=#name#::INVALID_ENUM);
-}
-
-
-Json::Value #name#Marshaller::toJSON(const #name#& e)
-{
-  if(e.mInternal==#name#::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool #name#Marshaller::fromString(const std::string& s,#name#& e)
-{
-  e.mInternal=#name#::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string #name#Marshaller::toString(const #name#& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==#name#::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable #name#Marshaller::mHashTable[#num#]=
-{
-';
-
-  $z=$templ;
-  $z=~s/#name#/$k/gs;
-  $z=~s/#num#/$t/gs;
-  $z=~s/#sh#/$sh/gs;
-  $z=~s/#p2i#/$p2i/gs;
-
-  print FO $z;
-
-  my @r;
-  for(my $i=0;$i<@{$types{$k}->{'list'}};$i++)
-  {
-    push @r,sprintf "  {\"%s\",%u}",$types{$k}->{'list'}->[$i],$i;
-  }
-
-  print FO join(",\n",@r);
-
-  print FO "\n};\n";
-  close FO;
-}
-
-# ooh, enums processed, going to variants. it's more complex.
-# some stuff
-
-sub prepare_field
-{
-  my $n=shift;
-  my $v=shift;
-
-  my $r={ 'name' => $n, 'type' => $v->{'type'}};
-  $r->{'ename'}= $v->{'ename'} if exists $v->{'ename'};
-  $r->{'descr'}= $v->{'description'} if exists $v->{'description'};
-
-  if(exists $v->{'array'})
-  {
-    $r->{'array'}=[];
-    $r->{'array'}->[0]=$v->{'minsize'} if exists $v->{'minsize'};
-    $r->{'array'}->[1]=$v->{'maxsize'} if exists $v->{'maxsize'};
-  }
-  $r->{'opt'}=1 if exists $v->{'mandatory'};
-
-  if($v->{'type'} eq 'String')
-  {
-      $r->{'ctype'}='std::string';
-      $r->{'ref'}=1;
-      $r->{'max'}=$v->{'maxLength'} if exists $v->{'maxLength'};
-      $r->{'max'}=$v->{'maxlength'} if exists $v->{'maxlength'};
-      return $r;
-  }
-  if($v->{'type'} eq 'Float')
-  {
-      $r->{'ctype'}='float';
-      $r->{'ref'}=0;
-      $r->{'max'}=$v->{'maxvalue'} if exists $v->{'maxvalue'};
-      $r->{'min'}=$v->{'minvalue'} if exists $v->{'minvalue'};
-      return $r;
-  }
-  if($v->{'type'} eq 'Boolean')
-  {
-    $r->{'ctype'}='bool';
-    $r->{'ref'}=0;
-    return $r;
-  }
-
-  if($v->{'type'} eq 'Integer')
-  {
-    $r->{'ref'}=0;
-    $r->{'max'}=$v->{'maxvalue'} if exists $v->{'maxvalue'};
-    $r->{'min'}=$v->{'minvalue'} if exists $v->{'minvalue'};
-    $r->{'ctype'}=( exists $r->{'min'} and $r->{'min'}>=0) ? 'unsigned int' : 'int';
-    return $r;
-  }
-
-#  die sprintf "unknown type found in %s : %s",$k,$v->{'type'} if not exists $types{$v->{'type'}};
-  return undef if not exists $types{$v->{'type'}};
-  $r->{'ctype'}=$v->{'type'};
-  $r->{'ref'}=1;
-  return $r;
-}
-
-# 1. field list preparing
-sub prepare_fields
-{
-  my $k=shift;
-  my $rv=[[],0,0];
-  
-  foreach(sort keys %{$types{$k}->{'list'}})
-  {
-    my $n=$_;
-    my $v=$types{$k}->{'list'}->{$n};
-    
-    my $z=prepare_field($n,$v);
-    die sprintf "unknown type found in %s : %s",$k,$v->{'type'} if not defined $z;
-    push @{$rv->[0]},prepare_field($n,$v);
-    $rv->[2]=1 if exists $v->{'array'};
-    $rv->[1]=1 if $v->{'type'} eq 'String';
-  }
-  
-  return $rv;
-}
-
-
-sub declare_field
-{
-  my $r=shift;
-  my $rv='';
-  
-  my $o= exists $r->{'opt'} ? '*' : '';
-
-  $rv= exists $r->{'array'} ?  sprintf "std::vector<%s>%s %s;",$r->{'ctype'},$o,$r->{'name'} : sprintf "%s%s %s;",$r->{'ctype'},$o,$r->{'name'};
-
-  my $cms='';
-
-  
-  $cms.="  [%s..%s] ",$r->{'array'}->[0],$r->{'array'}->[1] if exists $r->{'array'};
-
-  $cms.=sprintf "(%s)",$r->{'max'} if $r->{'ctype'} eq 'std::string' and exists $r->{'max'};
-  if($r->{'type'} eq 'Float' or $r->{'type'} eq 'Integer')
-  {
-     my $min;$min=$r->{'min'} if exists $r->{'min'};
-     my $max;$max=$r->{'max'} if exists $r->{'max'};
-     $cms.=sprintf " (%s,%s)",$min,$max if $max ne '' and $min ne '';
-   }
-   
-  $rv.="\t//!< ".$cms if $cms ne '';
-
-  return $rv;
-}
-
-sub declare_field2
-{
-  my $r=shift;
-  my $rv=declare_field($r);
-  my $c='';
-  $c=comment2($r->{'descr'}) if exists $r->{'descr'};
-#  print Dumper($c.$rv,$r);
-  return $c.$rv;
-}
-
-sub declare_setter
-{
-  my $r=shift;
-  my $rv='';
-  
-  return sprintf "bool set_%s(%s %s_);",$r->{'name'},$r->{'ctype'},$r->{'name'}
-    if(($r->{'type'} eq 'Float' or $r->{'type'} eq 'Integer' or $r->{'type'} eq 'Boolean') and not exists $r->{'array'});
-  
-  $rv= exists $r->{'array'} ? sprintf "std::vector<%s>",$r->{'ctype'} : $r->{'ctype'};
-
-  return sprintf "bool set_%s(const %s& %s_);",$r->{'name'},$rv,$r->{'name'};
-}
-
-
-sub define_setter
-{
-  my $n=shift;
-  my $p=shift;				# parent name
-  my $t=shift;				# 0 for variants and 1 for structs
-
-  my $rv=declare_setter($n);
-  $rv=~s/^bool //s;
-  $rv=~s/;$//s;
-  $rv=sprintf "bool %s::%s\n{\n",$p,$rv;
-
-  my $f= $t==1 ? $n->{'name'} : ('mInternal.'.$n->{'name'});
-
-  my $tp= exists $n->{'array'} ? sprintf "std::vector<%s>",$n->{'ctype'} : $n->{'ctype'};
-
-# check constraints
-
-  if(defined $n->{'array'})
-  {
-     $rv.= sprintf "  unsigned int i=%s_.size();\n",$n->{'name'};
-     if(defined $n->{'array'}->[0] and defined $n->{'array'}->[1])
-     {
-       $rv.= sprintf "  if(i>%s || i<%s)  return false;\n",$n->{'array'}->[1],$n->{'array'}->[0];
-     }
-     else
-     {
-       $rv.= sprintf "  if(i<%s) return false;\n",$n->{'array'}->[0] if defined $n->{'array'}->[0];
-       $rv.= sprintf "  if(i>%s) return false;\n",$n->{'array'}->[1] if defined $n->{'array'}->[1];
-     }
-
-    $rv.="  while(i--)\n  {\n" if $n->{'type'} ne 'Boolean';
-    
-    if($n->{'type'} eq 'String')
-    {
-      $rv.=sprintf "    if(%s_[i].length()>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-    }
-    elsif($n->{'type'} eq 'Integer')
-    {
-      $rv.=sprintf "    if(%s_[i]>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-      $rv.=sprintf "    if(%s_[i]<%s)  return false;\n",$n->{'name'},$n->{'min'} if exists $n->{'min'} and $n->{'ctype'} eq 'unsigned int' and $n->{'min'}>0;
-    }
-    elsif($n->{'type'} eq 'Float')
-    {
-      $rv.=sprintf "    if(%s_[i]>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-      $rv.=sprintf "    if(%s_[i]<%s)  return false;\n",$n->{'name'},$n->{'min'} if exists $n->{'min'};
-    }
-    elsif($n->{'type'} ne 'Boolean')
-    {
-       $rv.=sprintf "    if(!%sMarshaller::checkIntegrityConst(%s_[i]))   return false;\n",$n->{'ctype'},$n->{'name'};
-    }
-    $rv.="  }\n" if $n->{'type'} ne 'Boolean';
-  }
-  else
-  {
-    if($n->{'type'} eq 'String')
-    {
-      $rv.=sprintf "  if(%s_.length()>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-    }
-    elsif($n->{'type'} eq 'Integer')
-    {
-      $rv.=sprintf "  if(%s_>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-      $rv.=sprintf "  if(%s_<%s)  return false;\n",$n->{'name'},$n->{'min'} if exists $n->{'min'} and $n->{'ctype'} eq 'unsigned int' and $n->{'min'}>0;
-    }
-    elsif($n->{'type'} eq 'Float')
-    {
-      $rv.=sprintf "  if(%s_>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-      $rv.=sprintf "  if(%s_<%s)  return false;\n",$n->{'name'},$n->{'min'} if exists $n->{'min'};
-    }
-    elsif($n->{'type'} ne 'Boolean')
-    {
-       $rv.=sprintf "  if(!%sMarshaller::checkIntegrityConst(%s_))   return false;\n",$n->{'ctype'},$n->{'name'};
-    }
-  }
-
-  if(exists $n->{'opt'})
-  {
-    $rv.=sprintf "  delete %s;\n  %s=0;\n\n  %s=new %s(%s_);\n",$f,$f,$f,$tp,$n->{'name'};
-  }
-  else
-  {
-    $rv.=sprintf "  mInternal.mDiscriminator=%s;\n", $n->{'ename'} if $t==0;
-
-    if(exists $n->{'opt'})
-    {
-      $rv.=sprintf "  %s=new %s(%s_);\n",$f,$tp,$n->{'name'};
-    }
-    else
-    {
-      $rv.=sprintf "  %s=%s_;\n",$f,$n->{'name'};
-    }
-  }
-
-  $rv.="  return true;\n}\n\n";
-
-  return $rv;
-}
-
-
-# variants
-
-
-foreach(sort keys %types)
-{
-  my $k=$_;
-  next if $types{$k}->{'type'} ne 'variant';
-  
-  my $cmt=comment($types{$k});
-
-  open(FO,mkpath($path.$k,$sh)) or die;
-  print FO header_h($k);
-  
-  my $t=0+keys %{$types{$k}->{'list'}};
-  
-  my $fields=prepare_fields($k);
-  my @tp=@{$fields->[0]};
-  my $isstr=$fields->[1];
-  my $isarr=$fields->[2];
-
-  print FO "#include <string>\n\n" if $isstr==1;
-  print FO "#include <vector>\n\n" if $isarr==1;
-
-  foreach(@tp)
-  {
-    next if $_->{'ref'}==0;
-    next if $_->{'ctype'} eq 'std::string';
-    printf FO "#include \"%s.%s\"\n",$_->{'ctype'},$sh;
-  }
-
-  print FO "\n",$hat;
-  print FO "\n";
-  printf FO "namespace %s\n{\n",$ns if $ns ne '';
-  print FO $cmt;
-
-  my $tmpl=sprintf "class %s\n{\npublic:\n\n  enum eDiscriminator\n  {\n    INVALID_ENUM=-1",$k;
-  $tmpl=~s/\n/\n  /gs if $ns ne '';
-  printf FO $tmpl;
-
-  for(my $i=0;$i<@tp;$i++)
-  {
-    printf FO ",\n    %s%s=%u",$ind, @tp[$i]->{'ename'},$i;
-  }
-  printf FO "\n  %s};\n\n  %sstruct tUnion\n%s  {\n%s    eDiscriminator mDiscriminator;\n",$ind,$ind,$ind,$ind;
- 
- foreach(@tp)
- {
-   my $n=$_;
-   my $c='';
-   $c=comment2($n->{'descr'}) if exists $n->{'descr'};
-#   printf FO "%s%s    %s\n",$c,$ind,declare_field($_)  foreach @tp;
-   printf FO "%s%s    %s\n",$c,$ind,declare_field($n);
- } 
- 
-  printf FO "%s  };\n",$ind;
-  
-  my $tmpl='
-  #name#(const #name#& c);
-  #name#(void);
-
-  ~#name#(void);
-
-//! return true if all constraints valid
-  bool checkIntegrity(void);
-
-// getters
-  eDiscriminator getType(void);
-  eDiscriminator get_All(tUnion& t);
-//setters
-
-';
-  $tmpl=~s/#name#/$k/gs;
-  $tmpl=~s/\n /\n   /gs if $ns ne '';
-  print FO $tmpl;
-  
-  foreach(@tp)
-  {
-    printf FO "%s  %s\n",$ind,declare_setter($_);
-  }
-
-  $tmpl="\n  bool set_All(const tUnion& t);\n\nprivate:\n  tUnion mInternal;\n\n  friend class #name#Marshaller;\n";
-  $tmpl=~s/#name#/$k/gs;
-  $tmpl=~s/\n /\n   /gs if $ns ne '';
-  print FO $tmpl;
-  
-  
-  printf FO "%s};\n",$ind;
-  print FO "\n}\n" if $ns ne '';
-  print FO "\n#endif\n";
-  close FO;
-
-  open(FO,'>',sprintf "%s%sMarshaller.gp",$pimpl,$k) or die;
-  print FO "%language=C++\n%struct-type\n%define lookup-function-name getPointer\n%define class-name ".$k."_intHash\n%omit-struct-type\n";
-  print FO "%readonly-tables\n%compare-strncmp\n%compare-lengths\n\nstruct ";
-  printf FO "%s::",$ns if $ns ne '';
-  print FO "PerfectHashTable\n{\n  const char *name;\n  unsigned int idx;\n};\n\n%%\n";
-  
-  for(my $i=0;$i<@tp;$i++)
-  {
-    printf FO "%s,%u\n", @tp[$i]->{'ename'},$i;
-  }
-
-  close FO;
-  
-  open(FO,mkpath($pimpl.$k,$sc)) or die;
-  print FO $pragma;
-  print FO "#include <cstring>\n\n";
-  printf FO "#include \"%s/%s.%s\"\n",$p2i,$k,$sh;
-
-  {
-    my %h = map { $_->{'ctype'} ,1} grep { $_->{'ref'}==1 and $_->{'ctype'} ne 'std::string' } @tp;
-    print FO join("\n",map { sprintf '#include "%sMarshaller.%s"',$_,$sh } sort keys %h);
-  }
-
-  printf FO "\n#include \"%sMarshaller.%s\"\n\n",$k,$sh;
-
-  {
-    my $h=$hat;
-    if(exists $config{'ee'})
-    {
-      $h=~s/^\/\/.*?\n//s;
-      $h=getfort().$h;
-    }
-    print FO $h;
-  }
-  
-  printf FO "using namespace %s;\n",$ns if $ns ne '';
-
-  $tmpl='
-#name#::~#name#(void)
-{
-}
-
-#name#::#name#(const #name#& c)
-{
-  *this=c;
-}
-
-#name#::#name#(void)
-{
-  mInternal.mDiscriminator=INVALID_ENUM;
-}
-
-
-bool #name#::checkIntegrity(void)
-{
-  return #name#Marshaller::checkIntegrity(*this); 
-}
-
-#name#::eDiscriminator #name#::getType(void)
-{
-  return mInternal.mDiscriminator;
-}
-
-#name#::eDiscriminator #name#::get_All(tUnion& t)
-{
-  t=mInternal;
-  return mInternal.mDiscriminator;
-}
-
-bool #name#::set_All(const tUnion& t)
-{
-  mInternal=t;
-  return checkIntegrity();
-}
-';
-  
-  my $z=$tmpl;
-  $z=~s/#name#/$k/gs;
-  print FO $z;
-
-# variant setters
-  print FO define_setter($_,$k,0) foreach @tp;
-
-  close FO;
-
-# marshaller hh
-
-  open(FO,mkpath(sprintf('%s%sMarshaller',$pimpl,$k),$sh)) or die;
-
-  print FO header_h($k.'Marshaller');
-
-  printf FO "#include <string>\n#include <json/json.h>\n\n#include \"PerfectHashTable.%s\"\n#include \"%s/%s.%s\"\n\n",
-        $sh,$p2i,$k,$sh;
-
-  print FO $hat;
-
-  printf FO "namespace %s\n{\n",$ns if $ns ne '';
-
-  $tmpl='
-struct #name#Marshaller
-{
-  static std::string toName(const #name#& e) 	{ return getName(e.mInternal.mDiscriminator) ?: ""; }
-
-  static bool fromName(#name#::eDiscriminator& e,const std::string& s)
-  { 
-    return (e=getIndex(s.c_str()))!=#name#::INVALID_ENUM;
-  }
-
-  static bool checkIntegrity(#name#& e);
-  static bool checkIntegrityConst(const #name#& e);
-
-  static bool fromString(const std::string& s,#name#& e);
-  static const std::string toString(const #name#& e);
-
-  static bool fromJSON(const Json::Value& s,#name#& e);
-  static Json::Value toJSON(const #name#& e);
-
-
-  static const char* getName(#name#::eDiscriminator e)
-  {
-     return (e>=0 && e<#num#) ? mHashTable[e].name : NULL;
-  }
-   
-  static const #name#::eDiscriminator getIndex(const char* s);
-
-  static const PerfectHashTable mHashTable[#num#];
-};';
-
-  my $z=$tmpl;
-  $z=~s/\n/\n  /gs if $ns ne '';
-  $z=~s/#name#/$k/gs;
-  my $t=scalar keys %{$types{$k}->{'list'}};
-  $z=~s/#num#/$t/gs;
-  print FO $z;
-
-  printf FO "\n}\n" if $ns ne '';
-  print FO "\n#endif\n";
-   
-  close FO;
-
-# long way to finish, i want COFFEE!!!
-# but last variant file must be done before..
-
-  open(FO,mkpath(sprintf('%s%sMarshaller',$pimpl,$k),$sc)) or die;
-  print FO $pragma;
-
-  my $nsc= $ns eq '' ? '' : "using namespace $ns;\n\n";
-  my $hhat=$hat;
-  {
-    if(exists $config{'ee'})
-    {
-      $hhat=~s/^\/\/.*?\n//s;
-      $hhat=getfort().$hhat;
-    }
-  }
-
-  print FO "#include <cstring>\n\n";
-
-  printf FO "#include \"%s/%s.%s\"\n",$p2i,$k,$sh;
-
-  {
-    my %h = map { $_->{'ctype'} ,1} grep { $_->{'ref'}==1 and $_->{'ctype'} ne 'std::string' } @tp;
-    print FO join("\n",map { sprintf '#include "%sMarshaller.%s"',$_,$sh } sort keys %h);
-  }
-  
-  printf FO "\n\n#include \"%sMarshaller.%s\"\n#include \"%sMarshaller.inc\"\n\n",$k,$sh,$k;
-
-  print FO $hhat;
-  
-  print FO $nsc;
-
-  $tmpl='bool #name#Marshaller::checkIntegrity(#name#& s)
-{
-  return checkIntegrityConst(s);
-}
-
-const #name#::eDiscriminator #name#Marshaller::getIndex(const char* s)
-{
-  if(!s)
-    return #name#::INVALID_ENUM;
-  const struct PerfectHashTable* p=#name#_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<#name#::eDiscriminator>(p->idx) : #name#::INVALID_ENUM;
-}
-
-
-bool #name#Marshaller::fromString(const std::string& s,#name#& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string #name#Marshaller::toString(const #name#& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-';
-
-  $tmpl=~s/#name#/$k/gs;
-  print FO $tmpl;
-
-# and there are four untemplated methods.
-# my coffee wait me
-
-  printf FO "\nbool %sMarshaller::checkIntegrityConst(const %s& s)\n{\n  switch(s.mInternal.mDiscriminator)\n  {\n".
-                "    case %s::INVALID_ENUM:\n      return false;\n",$k,$k,$k;
-
-   foreach(@tp)
-   {
-     my $n=$_;
-     printf FO "    case %s::%s:\n",$k, $n->{'ename'};
-
-    if(defined $n->{'array'})
-    {
-       printf FO "    {\n      unsigned int i=s.mInternal.%s.size();\n",$n->{'name'};
-       if(defined $n->{'array'}->[0] and defined $n->{'array'}->[1])
-       {
-         printf FO "      if(i>%s || i<%s)  return false;\n",$n->{'array'}->[1],$n->{'array'}->[0];
-       }
-       else
-       {
-         printf FO "      if(i<%s) return false;\n",$n->{'array'}->[0] if defined $n->{'array'}->[0];
-         printf FO "      if(i>%s) return false;\n",$n->{'array'}->[1] if defined $n->{'array'}->[1];
-       }
-
-      print FO "      while(i--)\n      {\n";
-    
-      if($n->{'type'} eq 'String')
-      {
-        printf FO "        if(s.mInternal.%s[i].length()>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-      }
-      elsif($n->{'type'} eq 'Integer')
-      {
-        printf FO "        if(s.mInternal.%s[i]>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-        printf FO "        if(s.mInternal.%s[i]<%s)  return false;\n",$n->{'name'},$n->{'min'} if exists $n->{'min'} and $n->{'ctype'} eq 'unsigned int' and $n->{'min'}>0;
-      }
-      elsif($n->{'type'} eq 'Float')
-      {
-        printf FO "        if(s.mInternal.%s[i]>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-        printf FO "        if(s.mInternal.%s[i]<%s)  return false;\n",$n->{'name'},$n->{'min'} if exists $n->{'min'};
-      }
-      elsif($n->{'type'} ne 'Boolean')
-      {
-         printf FO "        if(!%sMarshaller::checkIntegrityConst(s.mInternal.%s[i]))   return false;\n",$n->{'ctype'},$n->{'name'};
-      }
-       printf FO "    }\n    return true;\n";
-     }
-     else
-     {
-      if($n->{'type'} eq 'String')
-       {
-         printf FO "      if(s.mInternal.%s.length()>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-       }
-       elsif($n->{'type'} eq 'Integer')
-       {
-         printf FO "      if(s.mInternal.%s>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-         printf FO "      if(s.mInternal.%s<%s)  return false;\n",$n->{'name'},$n->{'min'} if exists $n->{'min'} and $n->{'ctype'} eq 'unsigned int' and $n->{'min'}>0;
-       }
-       elsif($n->{'type'} eq 'Float')
-       {
-         printf FO "      if(s.mInternal.%s>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-         printf FO "      if(s.mInternal.%s<%s)  return false;\n",$n->{'name'},$n->{'min'} if exists $n->{'min'};
-       }
-       elsif($n->{'type'} ne 'Boolean')
-       {
-          printf FO "      return %sMarshaller::checkIntegrityConst(s.mInternal.%s);\n",$n->{'ctype'},$n->{'name'};
-          next;
-       }
-       printf FO "      return true;\n";
-     }
-     
-   }
-
-  printf FO "  }\n  return false;\n}\n";
- 
-  printf FO "\nJson::Value %sMarshaller::toJSON(const %s& e)\n{\n  Json::Value json(Json::objectValue);\n  ".
-           "if(!checkIntegrityConst(e))\n    return Json::Value(Json::nullValue);\n\n  switch(e.mInternal.mDiscriminator)\n  ".
-           "{\n    case %s::INVALID_ENUM:\n      break;\n\n",$k,$k,$k;
-
-
-  foreach (@tp)
-  {
-    my $n=$_;
-    printf FO "    case %s::%s:\n",$k,$n->{'ename'};
-    if(defined $n->{'array'})
-    {
-      printf FO "      json[\"%s\"]=Json::Value(Json::arrayValue);\n      json[\"%s\"].resize(e.mInternal.%s.size());\n",
-        $n->{'name'},$n->{'name'},$n->{'name'};
-      printf FO "      for(unsigned int i=0;i<e.mInternal.%s.size();i++)\n        json[\"%s\"][i]=",$n->{'name'},$n->{'name'};
-      if($n->{'type'} eq 'Boolean' or $n->{'type'} eq 'Float' or $n->{'type'} eq 'Integer' or $n->{'type'} eq 'String')
-      {
-        printf FO "Json::Value(e.mInternal.%s[i]);\n",$n->{'name'};
-      }
-      else
-      {
-        printf FO "%sMarshaller::toJSON(e.mInternal.%s[i]);\n",$n->{'type'},$n->{'name'};
-      }
-      print FO "      break;\n";
-      next;
-    }
-
-    printf FO "      json[\"%s\"]=",$n->{'name'};
-
-    if($n->{'type'} eq 'Boolean' or $n->{'type'} eq 'Float' or $n->{'type'} eq 'Integer' or $n->{'type'} eq 'String')
-    {
-      printf FO "Json::Value(e.mInternal.%s);\n",$n->{'name'};
-    }
-    else
-    {
-      printf FO "%sMarshaller::toJSON(e.mInternal.%s);\n",$n->{'type'},$n->{'name'};
-    }
-    print FO "      break;\n";
-  }
-
-  print FO "  }\n\n  return json;\n}\n\n";
-
-  printf FO "bool %sMarshaller::fromJSON(const Json::Value& json,%s& c)\n{\n  c.mInternal.mDiscriminator=%s::INVALID_ENUM;\n\n".
-            "  try\n  {\n    if(!json.isObject())  return false;\n\n",$k,$k,$k;
-
-
-  foreach(@tp)
-  {
-    my $n=$_;
-    printf FO "    if(json.isMember(\"%s\"))\n    {\n",$n->{'name'};
-    if(exists $n->{'array'})
-    {
-      printf FO "      const Json::Value& j=json[\"%s\"];\n",$n->{'name'};
-      printf FO "      if(!j.isArray())  return false;\n";
-      printf FO "      c.mInternal.%s.resize(j.size());\n",$n->{'name'};
-      printf FO "      for(unsigned int i=0;i<j.size();i++)\n";
-      
-      if(exists $json{$n->{'type'}})
-      {
-        printf FO "        if(!j[i].is%s())\n",$json2{$n->{'type'}};
-        printf FO "          return false;\n";
-        printf FO "        else\n";
-        printf FO "          c.mInternal.%s[i]=j[i].as%s();\n",$n->{'name'},$json{$n->{'type'}};
-      }
-      else
-      {
-        printf FO "        {\n";
-        printf FO "          %s t;\n",$n->{'type'};
-        printf FO "          if(!%sMarshaller::fromJSON(j[i],t))\n",$n->{'type'};
-        printf FO "            return false;\n";
-        printf FO "          c.mInternal.%s[i]=t;\n",$n->{'name'};
-        printf FO "        }\n";
-      }
-
-      printf FO "      c.mInternal.mDiscriminator=%s::%s;\n      goto leave;\n    }\n",$k,$n->{'ename'};
-      next;
-    }
-    else
-    {
-        printf FO "      const Json::Value& j=json[\"%s\"];\n",$n->{'name'};
-      if(exists $json{$n->{'type'}})
-      {
-        printf FO "      if(!j.is%s())  return false;\n",$json2{$n->{'type'}};
-        printf FO "      c.mInternal.%s=j.as%s();\n",$n->{'name'},$json{$n->{'type'}};
-      }
-      else
-      {
-        printf FO "      if(!%sMarshaller::fromJSON(j,c.mInternal.%s))\n",$n->{'type'},$n->{'name'};
-        printf FO "        return false;\n";
-      }
-        printf FO "      c.mInternal.mDiscriminator=%s::%s;\n",$k, $n->{'ename'};
-        printf FO "      goto leave;\n    }\n";
-    }
-  }
-
-  printf FO "\n  }\n  catch(...)\n  {\n    c.mInternal.mDiscriminator=%s::INVALID_ENUM;\n    return false;\n  }\n".
-  "  c.mInternal.mDiscriminator=%s::INVALID_ENUM;\n  return false;\nleave:\n  return checkIntegrity(c);\n}\n\n",$k,$k;
-
-
-  printf FO "const PerfectHashTable %sMarshaller::mHashTable[%u]=\n{\n",$k,$t;
-
-  my @r;
-  for(my $i=0;$i<@tp;$i++)
-  {
-    push @r,sprintf "  {\"%s\",%u}", @tp[$i]->{'ename'},$i;
-  }
-
-  print FO join(",\n",@r);
-
-  printf FO "\n};\n";
-
-  close FO;
-}
-
-# my coffee ready...
-
-# rock'n'roll!! structures!!!
-# i hope interpreter not understood my comments :-)
-
-sub declare_check
-{
-  my $n=shift;
-  my $rv;
-
-  my $w=$n->{'name'};
-  $w.='[0]' if exists $n->{'opt'};
-
-  if(defined $n->{'array'})
-  {
-     $rv.=sprintf "  if(s.%s)\n",$n->{'name'} if exists $n->{'opt'};
-     $rv.=sprintf "  {\n    unsigned int i=s.%s.size();\n",$w;
-     if(defined $n->{'array'}->[0] and defined $n->{'array'}->[1])
-     {
-       $rv.=sprintf "    if(i>%s || i<%s)  return false;\n",$n->{'array'}->[1],$n->{'array'}->[0];
-     }
-     else
-     {
-       $rv.=sprintf "    if(i<%s) return false;\n",$n->{'array'}->[0] if defined $n->{'array'}->[0];
-       $rv.=sprintf "    if(i>%s) return false;\n",$n->{'array'}->[1] if defined $n->{'array'}->[1];
-     }
-
-     $rv.="    while(i--)\n    {\n";
-    
-    if($n->{'type'} eq 'String')
-    {
-      $rv.=sprintf "      if(s.%s[i].length()>%s)  return false;\n",$w,$n->{'max'} if exists $n->{'max'};
-    }
-    elsif($n->{'type'} eq 'Integer')
-    {
-      $rv.=sprintf "      if(s.%s[i]>%s)  return false;\n",$w,$n->{'max'} if exists $n->{'max'};
-      $rv.=sprintf "      if(s.%s[i]<%s)  return false;\n",$w,$n->{'min'} if exists $n->{'min'} and $n->{'ctype'} eq 'unsigned int' and $n->{'min'}>0;
-    }
-    elsif($n->{'type'} eq 'Float')
-    {
-      $rv.=sprintf "    if(s.%s[i]>%s)  return false;\n",$w,$n->{'max'} if exists $n->{'max'};
-      $rv.=sprintf "    if(s.%s[i]<%s)  return false;\n",$w,$n->{'min'} if exists $n->{'min'};
-    }
-    elsif($n->{'type'} ne 'Boolean')
-    {
-       $rv.=sprintf "    if(!%sMarshaller::checkIntegrityConst(s.%s[i]))   return false;\n",$n->{'ctype'},$w;
-    }
-     $rv.=sprintf "    }\n  }\n";
-   }
-   else
-   {
-    if($n->{'type'} eq 'String')
-    {
-      if(exists $n->{'opt'})
-      {
-        $rv.=sprintf "  if(s.%s && s.%s->length()>%s)  return false;\n",$n->{'name'},$n->{'name'},$n->{'max'} if exists $n->{'max'};
-      }
-      else
-      {
-        $rv.=sprintf "  if(s.%s.length()>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-      } 
-    }
-    elsif($n->{'type'} eq 'Integer')
-    {
-      if(exists $n->{'opt'})
-      {
-        $rv.=sprintf "  if(s.%s && *s.%s>%s)  return false;\n",$n->{'name'},$n->{'name'},$n->{'max'} if exists $n->{'max'};
-        $rv.=sprintf "  if(s.%s && *s.%s<%s)  return false;\n",$n->{'name'},$n->{'name'},$n->{'min'} if exists $n->{'min'} and ($n->{'ctype'} ne 'unsigned int' or $n->{'min'}>0);
-      }
-      else
-      {
-        $rv.=sprintf "  if(s.%s>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-        $rv.=sprintf "  if(s.%s<%s)  return false;\n",$n->{'name'},$n->{'min'} if exists $n->{'min'} and ($n->{'ctype'} ne 'unsigned int' or $n->{'min'}>0);
-      }
-    }
-    elsif($n->{'type'} eq 'Float')
-    {
-      if(exists $n->{'opt'})
-      {
-        $rv.=sprintf "  if(s.%s && *s.%s>%s)  return false;\n",$n->{'name'},$n->{'name'},$n->{'max'} if exists $n->{'max'};
-        $rv.=sprintf "  if(s.%s && *s.%s<%s)  return false;\n",$n->{'name'},$n->{'name'},$n->{'min'} if exists $n->{'min'};
-      }
-      else
-      {
-        $rv.=sprintf "  if(s.%s>%s)  return false;\n",$n->{'name'},$n->{'max'} if exists $n->{'max'};
-        $rv.=sprintf "  if(s.%s<%s)  return false;\n",$n->{'name'},$n->{'min'} if exists $n->{'min'};
-      }
-    }
-    elsif($n->{'type'} ne 'Boolean')
-    {
-      if(exists $n->{'opt'})
-      {
-        $rv.=sprintf "  if(s.%s && !%sMarshaller::checkIntegrityConst(*s.%s))  return false;\n",$n->{'name'},$n->{'ctype'},$n->{'name'};
-      }
-      else
-      {
-        $rv.=sprintf "  if(!%sMarshaller::checkIntegrityConst(s.%s))  return false;\n",$n->{'ctype'},$n->{'name'};
-      }
-    }
- }
-  return $rv;
-}
-
-sub declare_serialize
-{
-  my $n=shift;
-  my $rv;
-
-  if(defined $n->{'array'})
-  {
-    if(exists $n->{'opt'})
-    {
-      my $w="  if(e.#)\n  {\n    unsigned int sz=e.#->size();\n    json[\"#\"]=Json::Value(Json::arrayValue);\n    json[\"#\"].resize(sz);\n".
-            "    for(unsigned int i=0;i<sz;i++)\n      json[\"#\"][i]=";
-
-      if(exists $json{$n->{'type'}})
-      {
-         $w.="Json::Value(e.#[0][i]);\n  }\n";
-      }
-      else
-      {
-         $w.="#type#Marshaller::toJSON(e.#[0][i]);\n  }\n"
-      }
-      
-      my $z=$n->{'type'};
-      $w=~s/#type#/$z/gs;
-      my $z=$n->{'name'};
-      $w=~s/#/$z/gs;
-      $rv.=$w;
-    }
-    else
-    {
-      $rv.=sprintf "  json[\"%s\"]=Json::Value(Json::arrayValue);\n  json[\"%s\"].resize(e.%s.size());\n",
-        $n->{'name'},$n->{'name'},$n->{'name'};
-      $rv.=sprintf "  for(unsigned int i=0;i<e.%s.size();i++)\n    json[\"%s\"][i]=",$n->{'name'},$n->{'name'};
-      if($n->{'type'} eq 'Boolean' or $n->{'type'} eq 'Float' or $n->{'type'} eq 'Integer' or $n->{'type'} eq 'String')
-      {
-        $rv.=sprintf "Json::Value(e.%s[i]);\n",$n->{'name'};
-      }
-      else
-      {
-        $rv.=sprintf "%sMarshaller::toJSON(e.%s[i]);\n",$n->{'type'},$n->{'name'};
-      }
-    }
-    return $rv;
-  }
-
-  if(exists $n->{'opt'})
-  {
-    $rv.=sprintf "  if(e.%s)\n",$n->{'name'};
-    $rv.=sprintf "    json[\"%s\"]=",$n->{'name'};
- 
-    if($n->{'type'} eq 'Boolean' or $n->{'type'} eq 'Float' or $n->{'type'} eq 'Integer' or $n->{'type'} eq 'String')
-    {
-      $rv.=sprintf "Json::Value(*e.%s);\n",$n->{'name'};
-    }
-    else
-    {
-      $rv.=sprintf "%sMarshaller::toJSON(*e.%s);\n",$n->{'type'},$n->{'name'};
-    }
-  }
-  else
-  {
-    $rv.=sprintf "  json[\"%s\"]=",$n->{'name'};
-
-    if($n->{'type'} eq 'Boolean' or $n->{'type'} eq 'Float' or $n->{'type'} eq 'Integer' or $n->{'type'} eq 'String')
-    {
-      $rv.=sprintf "Json::Value(e.%s);\n",$n->{'name'};
-    }
-    else
-    {
-      $rv.=sprintf "%sMarshaller::toJSON(e.%s);\n",$n->{'type'},$n->{'name'};
-    }
-  }
-  return $rv;
-}
-
-sub declare_deserialize
-{
-    my $n=shift;
-    my $rv;
-    
-    if(exists $n->{'opt'})
-    {
-      $rv.=sprintf "    if(json.isMember(\"%s\"))\n    {\n",$n->{'name'};
-
-      if(exists $n->{'array'})
-      {
-        $rv.=sprintf "      const Json::Value& j=json[\"%s\"];\n",$n->{'name'};
-        $rv.=sprintf "      if(!j.isArray())  return false;\n";
-        $rv.=sprintf "      c.%s=new std::vector<%s>();\n",$n->{'name'},$n->{'ctype'};
-        $rv.=sprintf "      c.%s->resize(j.size());\n",$n->{'name'};
-        $rv.=sprintf "      for(unsigned int i=0;i<j.size();i++)\n";
-      
-        if(exists $json{$n->{'type'}})
-        {
-          $rv.=sprintf "        if(!j[i].is%s())\n",$json2{$n->{'type'}};
-          $rv.=sprintf "          return false;\n";
-          $rv.=sprintf "        else\n";
-          $rv.=sprintf "          c.%s[0][i]=j[i].as%s();\n",$n->{'name'},$json{$n->{'type'}};
-        }
-        else
-        {
-          $rv.=sprintf "      {\n";
-          $rv.=sprintf "        %s t;\n",$n->{'type'};
-          $rv.=sprintf "        if(!%sMarshaller::fromJSON(j[i],t))\n",$n->{'type'};
-          $rv.=sprintf "          return false;\n";
-          $rv.=sprintf "        c.%s[0][i]=t;\n",$n->{'name'};
-          $rv.=sprintf "      }\n\n";
-        }
-        $rv.="    }\n";
-        return $rv;
-      }
-      else
-      {
-        $rv.=sprintf "      const Json::Value& j=json[\"%s\"];\n",$n->{'name'};
-        if(exists $json{$n->{'type'}})
-        {
-          $rv.=sprintf "      if(!j.is%s())  return false;\n",$json2{$n->{'type'}};
-          $rv.=sprintf "      c.%s=new %s(j.as%s());\n",$n->{'name'},$n->{'ctype'},$json{$n->{'type'}};
-        }
-        else
-        {
-          $rv.=sprintf "      c.%s=new %s();\n",$n->{'name'},$n->{'ctype'};
-          $rv.=sprintf "      if(!%sMarshaller::fromJSON(j,c.%s[0]))\n",$n->{'type'},$n->{'name'};
-          $rv.=sprintf "        return false;\n";
-        }
-      }
-      
-      $rv.=sprintf "    }\n",$n->{'name'};
-    }
-    else
-    {
-      $rv.=sprintf "    if(!json.isMember(\"%s\"))  return false;\n",$n->{'name'};
-      if(exists $n->{'array'})
-      {
-        $rv.=sprintf "    {\n      const Json::Value& j=json[\"%s\"];\n",$n->{'name'};
-        $rv.=sprintf "      if(!j.isArray())  return false;\n";
-        $rv.=sprintf "      c.%s.resize(j.size());\n",$n->{'name'};
-        $rv.=sprintf "      for(unsigned int i=0;i<j.size();i++)\n";
-      
-        if(exists $json{$n->{'type'}})
-        {
-          $rv.=sprintf "        if(!j[i].is%s())\n",$json2{$n->{'type'}};
-          $rv.=sprintf "          return false;\n";
-          $rv.=sprintf "        else\n";
-          $rv.=sprintf "          c.%s[i]=j[i].as%s();\n",$n->{'name'},$json{$n->{'type'}};
-        }
-        else
-        {
-          $rv.=sprintf "        {\n";
-          $rv.=sprintf "          %s t;\n",$n->{'type'};
-          $rv.=sprintf "          if(!%sMarshaller::fromJSON(j[i],t))\n",$n->{'type'};
-          $rv.=sprintf "            return false;\n";
-          $rv.=sprintf "          c.%s[i]=t;\n",$n->{'name'};
-          $rv.=sprintf "        }\n\n";
-        }
-        $rv.="    }\n";
-        return $rv;
-      }
-      else
-      {
-        $rv.=sprintf "    {\n      const Json::Value& j=json[\"%s\"];\n",$n->{'name'};
-        if(exists $json{$n->{'type'}})
-        {
-          $rv.=sprintf "      if(!j.is%s())  return false;\n",$json2{$n->{'type'}};
-          $rv.=sprintf "      c.%s=j.as%s();\n",$n->{'name'},$json{$n->{'type'}};
-        }
-        else
-        {
-          $rv.=sprintf "      if(!%sMarshaller::fromJSON(j,c.%s))\n",$n->{'type'},$n->{'name'};
-          $rv.=sprintf "        return false;\n";
-        }
-        $rv.="    }\n";
-      }
-    }
-
-  return $rv;
-}
-
-foreach(sort keys %types)
-{
-  my $k=$_;
-  next if $types{$k}->{'type'} ne 'struct';
-  
-  my $cmt=comment($types{$k});
-
-  open(FO,mkpath($path.$k,$sh)) or die;
-  print FO header_h($k);
-  
-  my $t=0+keys %{$types{$k}->{'list'}};
-  
-  my $fields=prepare_fields($k);
-  my @tp=@{$fields->[0]};
-  my $isstr=$fields->[1];
-  my $isarr=$fields->[2];
-
-  print FO "#include <string>\n" if $isstr==1;
-  print FO "#include <vector>\n" if $isarr==1;
-  print FO "\n";
-  
-  foreach(@tp)
-  {
-    next if $_->{'ref'}==0;
-    next if $_->{'ctype'} eq 'std::string';
-    printf FO "#include \"%s.%s\"\n",$_->{'ctype'},$sh;
-  }
-
-  print FO "\n",$hat;
-  print FO "\n";
-  printf FO "namespace %s\n{\n",$ns if $ns ne '';
-  print FO $cmt;
-
-  my $tmpl=sprintf "\nclass %s\n{\npublic:\n\n  %s(const %s& c);\n  %s(void);\n\n".
-  "  bool checkIntegrity(void);\n",$k,$k,$k,$k;
-
-
-  $tmpl=~s/\n/\n  /gs if $ns ne '';
-  printf FO $tmpl;
-  
-  my $isopt=0;
-  foreach(@tp)
-  {
-    $isopt=1 if exists $_->{'opt'};
-  }
-
-  printf FO "\n%s  ~%s(void);\n%s  %s& operator =(const %s&);\n\n",$ind,$k,$ind,$k,$k if $isopt==1;
-
-  print FO "// getters\n\n";
-
-  foreach(@tp)
-  {
-    my $n=$_;
-    if($n->{'ref'}==0 and $n->{'array'}==0)
-    {
-       printf FO "%s  %s%s%s get_%s(void) const;\n",$ind,(exists $n->{'opt'} ? 'const ' : ''),$n->{'ctype'},(exists $n->{'opt'} ? '*' : ''),$n->{'name'};
-    }
-    else
-    {
-      if($n->{'array'}==0)
-      {
-         printf FO "%s  const %s%s get_%s(void) const;\n",$ind,$n->{'ctype'},(exists $n->{'opt'} ? '*' : '&'),$n->{'name'};
-      }
-      else
-      {
-         printf FO "%s  const std::vector<%s>%s get_%s(void) const;\n",$ind,$n->{'ctype'},(exists $n->{'opt'} ? '*' : '&'),$n->{'name'};
-      }
-    }
-  }
-
-  print FO "\n// setters\n\n";
-  
-  foreach(@tp)
-  {
-    my $n=$_;
-    printf FO "%s  void reset_%s(void);\n",$ind,$n->{'name'} if exists $n->{'opt'};
-
-    printf FO "%s  %s\n",$ind,declare_setter($n);
-
-  }
-  
-  printf FO "\n%sprivate:\n\n%s  friend class %sMarshaller;\n\n",$ind,$ind,$k;
-
-  foreach(@tp)
-  {
-#    printf FO "%s  %s\n",$ind,declare_field($_);
-    my $n=$_;
-    my $c='';
-    $c=comment2($n->{'descr'}) if exists $n->{'descr'};
-    printf FO "%s%s    %s\n",$c,$ind,declare_field($n);
-  }
-
-  printf FO "%s};\n",$ind;
-  print FO "\n}\n" if $ns ne '';
-
-  print FO "\n#endif\n";
-  close FO;
-  
-  open(FO,mkpath($pimpl.$k,$sc)) or die;
-  print FO $pragma;
-
-  my $nsc= $ns eq '' ? '' : "using namespace $ns;\n\n";
-  my $hhat=$hat;
-  {
-    if(exists $config{'ee'})
-    {
-      $hhat=~s/^\/\/.*?\n//s;
-      $hhat=getfort().$hhat;
-    }
-  }
-
-
-  printf FO "#include \"%s/%s.%s\"\n",$p2i,$k,$sh;
-  printf FO "#include \"%sMarshaller.%s\"\n",$k,$sh;
-
-  {
-    my %h = map { $_->{'ctype'} ,1} grep { $_->{'ref'}==1 and $_->{'ctype'} ne 'std::string' } @tp;
-    print FO join("\n",map { sprintf '#include "%sMarshaller.%s"',$_,$sh } sort keys %h);
-  }
-
-  print FO $hhat;
-
-  print FO "\n\n";
-  print FO $nsc;
-
-  if($isopt==1)
-  {
-    printf FO "%s& %s::operator =(const %s& c)\n{\n",$k,$k,$k;
-
-    foreach(@tp)
-    {
-      my $n=$_;
-      my $ct=exists $n->{'array'} ? sprintf "std::vector<%s>",$n->{'ctype'} : $n->{'ctype'};
-      if(exists $n->{'opt'})
-      {
-          printf FO "  %s=c.%s ? new %s(c.%s[0]) : 0;\n",$n->{'name'},$n->{'name'},$ct,$n->{'name'};
-      }
-      else
-      {
-          printf FO "  %s=c.%s;\n",$n->{'name'},$n->{'name'};
-      }
-    }
-    print FO "\n  return *this;\n";
-    printf FO "}\n\n\n%s::~%s(void)\n{\n",$k,$k;
-    foreach(@tp)
-    {
-      my $n=$_;
-      next if not exists $n->{'opt'};
-      printf FO "  if(%s)\n    delete %s;\n",$n->{'name'},$n->{'name'};
-    }
-    printf FO "}\n\n\n";
-  }
- 
-  my $tmpl="#name#::#name#(const #name#& c)\n{\n  *this=c;\n}\n\n\nbool #name#::checkIntegrity(void)\n{\n  return #name#Marshaller::checkIntegrity(*this);\n".
-  "}\n\n\n#name#::#name#(void)";
-  $tmpl=~s/#name#/$k/gs;
-  print FO $tmpl;
-
-  if($isopt==1)
-  {
-    print FO " :\n";
-    my @r;
-    foreach(@tp)
-    {
-      next if not exists $_->{'opt'};
-      push @r,sprintf "    %s(0)",$_->{'name'};
-    }
-    print FO join(",\n",@r);
-  }
-
-  print FO "\n{\n}\n";
-
-# setters
-  print FO "\n\n\n";
-  foreach(@tp)
-  {
-    my $n=$_;
-    printf FO "%s",define_setter($n,$k,1);
-# reset
-    next if not exists $n->{'opt'};
-    
-    printf FO "void %s::reset_%s(void)\n{\n  if(%s)\n    delete %s;\n  %s=0;\n}\n\n",$k,$n->{'name'},$n->{'name'},$n->{'name'},$n->{'name'};
-  }
-
-# getters
-
-  print FO "\n\n\n";
-  foreach(@tp)
-  {
-    my $n=$_;
-    if(not exists $n->{'array'} and not exists $n->{'opt'} and $n->{'ref'}==0)
-    {
-      printf FO "%s %s::get_%s(void) const",$n->{'ctype'},$k,$n->{'name'};
-      goto nxt;
-    }
-    my $z=$n->{'ctype'};
-    $z=sprintf "std::vector<%s>",$z if exists $n->{'array'};
-    printf FO "const %s%s %s::get_%s(void) const ",$z,(exists $n->{'opt'} ? '*' : '&'),$k,$n->{'name'};
-nxt:
-    printf FO "\n{\n  return %s;\n}\n\n\n",$n->{'name'};
-  }
-
-  close FO;
-  
-  open(FO,mkpath(sprintf('%s%sMarshaller',$pimpl,$k),$sh)) or die;
-
-  print FO header_h($k.'Marshaller');
-
-  printf FO "#include <string>\n#include <json/json.h>\n\n#include \"%s/%s.%s\"\n\n",
-        $p2i,$k,$sh;
-
-  print FO $hat;
-
-  printf FO "namespace %s\n{\n",$ns if $ns ne '';
-
-  $tmpl='
-struct #name#Marshaller
-{
-  static bool checkIntegrity(#name#& e);
-  static bool checkIntegrityConst(const #name#& e);
-
-  static bool fromString(const std::string& s,#name#& e);
-  static const std::string toString(const #name#& e);
-
-  static bool fromJSON(const Json::Value& s,#name#& e);
-  static Json::Value toJSON(const #name#& e);
-};';
-
-  $tmpl=~s/#name#/$k/gs;
-  $tmpl=~s/\n/\n  /gs  if $ns ne '';
-  print FO $tmpl;
-#  printf FO "%s};\n",$ind;
-  print FO "\n}\n" if $ns ne '';
-
-  print FO "\n#endif\n";
-  close FO;
-
-  open(FO,mkpath(sprintf('%s%sMarshaller',$pimpl,$k),$sc)) or die;
-  print FO $pragma;
-
-  my $nsc= $ns eq '' ? '' : "using namespace $ns;\n\n";
-  my $hhat=$hat;
-  {
-    if(exists $config{'ee'})
-    {
-      $hhat=~s/^\/\/.*?\n//s;
-      $hhat=getfort().$hhat;
-    }
-  }
-
-  printf FO "#include \"%s/%s.%s\"\n",$p2i,$k,$sh;
-
-  {
-    my %h = map { $_->{'ctype'} ,1} grep { $_->{'ref'}==1 and $_->{'ctype'} ne 'std::string' } @tp;
-    print FO join("\n",map { sprintf '#include "%sMarshaller.%s"',$_,$sh } sort keys %h);
-  }
-  
-  printf FO "\n\n#include \"%sMarshaller.%s\"\n\n",$k,$sh,$k;
-
-  print FO $hhat;
-  
-  print FO $nsc;
-
-  $tmpl='
-bool #name#Marshaller::checkIntegrity(#name#& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool #name#Marshaller::fromString(const std::string& s,#name#& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string #name#Marshaller::toString(const #name#& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-';
-  $tmpl=~s/#name#/$k/gs;
-  print FO $tmpl;
-
-  printf FO "\nbool %sMarshaller::checkIntegrityConst(const %s& s)\n{\n",$k,$k;
-
-  printf FO "%s",declare_check($_) foreach @tp;
-
-  printf FO "  return true;\n}\n";
-
-
-  printf FO "\nJson::Value %sMarshaller::toJSON(const %s& e)\n{\n  Json::Value json(Json::objectValue);\n  ".
-           "if(!checkIntegrityConst(e))\n    return Json::Value(Json::nullValue);\n\n",$k,$k;
-
-
-  printf FO "%s\n",declare_serialize($_) foreach @tp;
-
-  print FO "\n  return json;\n}\n\n\n";
-
-# from json
-
-  printf FO "bool %sMarshaller::fromJSON(const Json::Value& json,%s& c)\n{\n",$k,$k;
-  foreach(@tp)
-  {
-     next if not exists $_->{'opt'};
-     printf FO "  if(c.%s)  delete c.%s;\n  c.%s=0;\n\n",$_->{'name'},$_->{'name'},$_->{'name'};
-  }
-
-  printf FO  "  try\n  {\n    if(!json.isObject())  return false;\n\n",$k,$k;
-
-  print FO declare_deserialize($_) foreach @tp;
-
-  printf FO "\n  }\n  catch(...)\n  {\n    return false;\n  }\n".
-  "  return checkIntegrity(c);\n}\n\n",$k,$k;
-
-  close FO;
-
-}
-
-
-# methods. i want sleep, really :-)
-
-my $nsw;
-$nsw=$ns.'::' if $ns ne '';
-
-open(FO,'>',sprintf "%sMarshaller.gp",$pimpl) or die;
-print FO '%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name Marshaller_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct '.$nsw.'Marshaller::localHash
-{
-  const char *name;
-  unsigned int idx;
-  void* method;
-};
-
-%%
-';
-
-for(my $i=0;$i<@table;$i++)
-{
-  printf FO "%s_%s,%u,&%sMarshaller::m%s%s\n",@table[$i]->[0],@table[$i]->[1],$i,$nsw,@table[$i]->[0],
-    (@table[$i]->[1] eq 'notification' ? '' : ('_'.@table[$i]->[1]));
-}
-close FO;
-
-#my $libs= exists $config{'lib'}  ? $config{'lib'} : '../lib/';
-
-
-for(my $i=0;$i<@table;$i++)
-{
-  my $k=@table[$i]->[0];
-  $k.='_'.@table[$i]->[1] if @table[$i]->[1] ne 'notification';
-
-  my $ls=@table[$i]->[2];
-
-  my @tp;
-
-  $ls=[] if not ref $ls;
-  foreach(@$ls)
-  {
-     my $v=$_;
-     my $z=prepare_field($v->{'name'},$v);
-     die sprintf "unknown type %s in %s",$v->{'name'},$k if not defined $z;
-     $z->{'desc'}=$v->{'description'} if exists $v->{'description'};
-     push @tp,$z;
-  }
-  my %tps;
-  my $isstr=0;
-  my $isarr=0;
-  my $isopt=0;
-
-  foreach(@$ls)
-  {
-    $tps{$_->{'type'}}=1 if not exists $json{$_->{'type'}};
-    $isstr=1 if $_->{'type'} eq 'String';
-    $isarr=1 if exists $_->{'array'};
-    $isopt=1 if exists $_->{'mandatory'};
-  }
-
-  my $mt= 'ALRPC'. ucfirst @table[$i]->[1];
-
-  open(FO,mkpath($path.$k,$sh)) or die;
-  print FO header_h($k);
-
-# headers
-
-  printf FO "#include <vector>\n" if $isarr!=0;
-  printf FO "#include <string>\n" if $isstr!=0;
-
-  printf FO "\n";
-  
-  printf FO "#include \"%s.%s\"\n",$_,$sh foreach sort keys %tps;
-
-#  printf FO "#include \"%s%s.hh\"\n\n",$libs,$mt;
-  printf FO "#include \"%s/%s.h\"\n\n",$i2l,$mt;
-
-  print FO $hat;
-
-  printf FO "namespace %s\n{\n",$ns if $ns ne '';
-  print FO comment2(@table[$i]->[3]) if defined @table[$i]->[3];
-
-  my $tmpl1='';
-  $tmpl1="\n  #name#& operator =(const #name#&);\n" if $isopt==1;
-
-  my $tmpl='
-class #name# : public #base#
-{
-public:
-
-  #name#(const #name#& c);
-  #name#(void);
-  
-  virtual ~#name#(void);
-'.$tmpl1.'
-  bool checkIntegrity(void);';
-
-  $tmpl=~s/#name#/$k/gs;
-  $tmpl=~s/#base#/$mt/gs;
-  $tmpl=~s/\n/\n  /gs if $ns ne '';
-
-  print FO $tmpl;
-  print FO "\n\n";
-
-  foreach(@tp)
-  {
-    my $n=$_;
-    if($n->{'ref'}==0 and $n->{'array'}==0)
-    {
-       printf FO "%s  %s%s%s get_%s(void) const;\n",$ind,(exists $n->{'opt'} ? 'const ' : ''),$n->{'ctype'},(exists $n->{'opt'} ? '*' : ''),$n->{'name'};
-    }
-    else
-    {
-      if($n->{'array'}==0)
-      {
-         printf FO "%s  const %s%s get_%s(void) const;\n",$ind,$n->{'ctype'},(exists $n->{'opt'} ? '*' : '&'),$n->{'name'};
-      }
-      else
-      {
-         printf FO "%s  const std::vector<%s>%s get_%s(void) const;\n",$ind,$n->{'ctype'},(exists $n->{'opt'} ? '*' : '&'),$n->{'name'};
-      }
-    }
-  }
-  printf FO "\n";
- 
-  foreach(@tp)
-  {
-    my $n=$_;
-    printf FO "%s  void reset_%s(void);\n",$ind,$n->{'name'} if exists $n->{'opt'};
-    printf FO "%s  %s\n",$ind,declare_setter($n);
-  }
-  
-  $tmpl=sprintf "\nprivate:\n\n  friend class %sMarshaller;",$k;
-  $tmpl=~s/\n/\n  /gs if $ns ne '';
-  $tmpl.="\n\n";
-  
-  print FO $tmpl;
-
-#  printf FO "%s  %s\n",$ind,declare_field($_) foreach @tp;
-
- foreach(@tp)
- {
-   my $n=$_;
-   my $c='';
-   $c=comment2($n->{'descr'}) if exists $n->{'descr'};
-   printf FO "%s%s    %s\n",$c,$ind,declare_field($n);
- } 
-
-
-  printf FO "%s};\n",$ind;
-  print FO "\n}\n" if $ns ne '';
-  print FO "\n#endif\n";
-  close FO;
-
-  open(FO,mkpath($pimpl.$k,$sc)) or die;
-  print FO $pragma;
-
-  my $nsc= $ns eq '' ? '' : "using namespace $ns;\n";
-  my $hhat=$hat;
-
-  if(exists $config{'ee'})
-  {
-     $hhat=~s/^\/\/.*?\n//s;
-     $hhat=getfort().$hhat;
-  }
-
-  printf FO  "#include \"%s/%s.%s\"\n#include \"%sMarshaller.%s\"\n",$p2i,$k,$sh,$k,$sh;
-  printf FO  "#include \"%s/Marshaller.%s\"\n",$p2i,$sh;
-  printf FO  "#include \"%sMarshaller.%s\"\n",$_,$sh foreach sort keys %tps;
-
-  printf FO "\n#define PROTOCOL_VERSION\t%u\n\n",$pver;
-
-  print FO $hhat;
-  print FO $nsc if $ns ne '';
-  
-  if($isopt==1)
-  {
-    printf FO "%s& %s::operator =(const %s& c)\n{\n",$k,$k,$k;
-
-    foreach(@tp)
-    {
-      my $n=$_;
-      my $ct=exists $n->{'array'} ? sprintf "std::vector<%s>",$n->{'ctype'} : $n->{'ctype'};
-      if(exists $n->{'opt'})
-      {
-          printf FO "  %s= c.%s ? new %s(c.%s[0]) : 0;\n",$n->{'name'},$n->{'name'},$ct,$n->{'name'};
-      }
-      else
-      {
-          printf FO "  %s= c.%s;\n",$n->{'name'},$n->{'name'};
-      }
-    }
-    print FO "\n  return *this;}\n\n"
-  }
-
-  printf FO "\n%s::~%s(void)\n{\n",$k,$k;
-  foreach(@tp)
-  {
-    my $n=$_;
-    next if not exists $n->{'opt'};
-    printf FO "  if(%s)\n    delete %s;\n",$n->{'name'},$n->{'name'};
-  }
-  
-  printf FO "}\n\n\n"; 
-  my $tmpl="#name#::#name#(const #name#& c)\n{\n  *this=c;\n}\n\n\nbool #name#::checkIntegrity(void)\n{\n  return #name#Marshaller::checkIntegrity(*this);\n".
-  "}\n\n\n#name#::#name#(void) : #base#(PROTOCOL_VERSION,Marshaller::METHOD_#NAME#)";
-  $tmpl=~s/#name#/$k/gs;
-  my $z=uc $k;
-  $tmpl=~s/#NAME#/$z/gs;
-  $tmpl=~s/#base#/$mt/gs;
-
-#  $z=uc @table[$i]->[1];
-#  $tmpl=~s/#func#/$z/gs;
-  print FO $tmpl;
-
-  if($isopt==1)
-  {
-    print FO ",\n  ";
-    my @r;
-    foreach(@tp)
-    {
-      next if not exists $_->{'opt'};
-      push @r,sprintf "    %s(0)",$_->{'name'};
-    }
-    print FO join(",\n",@r);
-  }
-
-  print FO "\n{\n}\n";
-
-# setters
-  print FO "\n\n\n";
-  foreach(@tp)
-  {
-    my $n=$_;
-    printf FO "%s",define_setter($n,$k,1);
-# reset
-    next if not exists $n->{'opt'};
-    
-    printf FO "void %s::reset_%s(void)\n{\n  if(%s)\n    delete %s;\n  %s=0;\n}\n\n",$k,$n->{'name'},$n->{'name'},$n->{'name'},$n->{'name'};
-  }
-
-# getters
-
-  print FO "\n\n\n";
-  foreach(@tp)
-  {
-    my $n=$_;
-    if(not exists $n->{'array'} and not exists $n->{'opt'} and $n->{'ref'}==0)
-    {
-      printf FO "%s %s::get_%s(void) const",$n->{'ctype'},$k,$n->{'name'};
-      goto nxt;
-    }
-    my $z=$n->{'ctype'};
-    $z=sprintf "std::vector<%s>",$z if exists $n->{'array'};
-    printf FO "const %s%s %s::get_%s(void) const ",$z,(exists $n->{'opt'} ? '*' : '&'),$k,$n->{'name'};
-nxt:
-    printf FO "\n{\n  return %s;\n}\n\n",$n->{'name'};
-  }
-
-  close FO;
-
-  open(FO,mkpath(sprintf('%s%sMarshaller',$pimpl,$k),$sh)) or die;
-
-  print FO header_h($k.'Marshaller');
-
-  printf FO "#include <string>\n#include <json/json.h>\n\n#include \"%s/%s.%s\"\n\n",
-        $p2i,$k,$sh;
-
-  print FO $hat;
-
-  printf FO "namespace %s\n{\n",$ns if $ns ne '';
-
-  $tmpl='
-struct #name#Marshaller
-{
-  static bool checkIntegrity(#name#& e);
-  static bool checkIntegrityConst(const #name#& e);
-
-  static bool fromString(const std::string& s,#name#& e);
-  static const std::string toString(const #name#& e);
-
-  static bool fromJSON(const Json::Value& s,#name#& e);
-  static Json::Value toJSON(const #name#& e);
-};';
-
-  $tmpl=~s/#name#/$k/gs;
-  $tmpl=~s/\n/\n  /gs  if $ns ne '';
-  print FO $tmpl;
-#  printf FO "%s};\n",$ind;
-  print FO "\n}\n" if $ns ne '';
-
-  print FO "\n#endif\n";
-  close FO;
-
-  open(FO,mkpath(sprintf('%s%sMarshaller',$pimpl,$k),$sc)) or die;
-  print FO $pragma;
-
-  my $nsc= $ns eq '' ? '' : "using namespace $ns;\n\n";
-  my $hhat=$hat;
-  {
-    if(exists $config{'ee'})
-    {
-      $hhat=~s/^\/\/.*?\n//s;
-      $hhat=getfort().$hhat;
-    }
-  }
-
-  printf FO "#include \"%s/%s.%s\"\n",$p2i,$k,$sh;
-
-  {
-    my %h = map { $_->{'ctype'} ,1} grep { $_->{'ref'}==1 and $_->{'ctype'} ne 'std::string' } @tp;
-    print FO join("\n",map { sprintf '#include "%sMarshaller.%s"',$_,$sh } sort keys %h);
-  }
-  
-  printf FO "\n\n#include \"%sMarshaller.%s\"\n\n",$k,$sh,$k;
-
-  print FO $hhat;
-  
-  print FO $nsc;
-
-  $tmpl='
-bool #name#Marshaller::checkIntegrity(#name#& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool #name#Marshaller::fromString(const std::string& s,#name#& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string #name#Marshaller::toString(const #name#& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-';
-  $tmpl=~s/#name#/$k/gs;
-  print FO $tmpl;
-
-  printf FO "\nbool %sMarshaller::checkIntegrityConst(const %s& s)\n{\n",$k,$k;
-
-  printf FO "%s",declare_check($_) foreach @tp;
-
-  printf FO "  return true;\n}\n";
-
-
-  printf FO "\nJson::Value %sMarshaller::toJSON(const %s& e)\n{\n  Json::Value json(Json::objectValue);\n  ".
-           "if(!checkIntegrityConst(e))\n    return Json::Value(Json::nullValue);\n\n",$k,$k;
-
-
-  $tmpl='  json["#meth#"]=Json::Value(Json::objectValue);
-  json["#meth#"]["name"]=Json::Value("#name#");
-'. (@table[$i]->[1] eq 'notification' ? '' :  '  json["#meth#"]["correlationID"]=Json::Value(e.getCorrelationID());
-').'
-  Json::Value j=Json::Value(Json::objectValue);
-
-';
-
-  $z=@table[$i]->[1];
-  $tmpl=~s/#meth#/$z/gs;
-  $z=@table[$i]->[0];
-  $tmpl=~s/#name#/$z/gs;
-
-  print FO $tmpl;
-
-  foreach(@tp)
-  {
-    $z=declare_serialize($_);
-    $z=~s/json\[/j[/gs;
-    printf FO "%s\n",$z;
-  }
-  printf FO '  json["%s"]["parameters"]=j;',@table[$i]->[1];
-
-  print FO "\n  return json;\n}\n\n\n";
-
-  printf FO "bool %sMarshaller::fromJSON(const Json::Value& js,%s& c)\n{\n",$k,$k;
-  foreach(@tp)
-  {
-     next if not exists $_->{'opt'};
-     printf FO "  if(c.%s)  delete c.%s;\n  c.%s=0;\n\n",$_->{'name'},$_->{'name'},$_->{'name'};
-  }
-
-  printf FO  "  try\n  {\n    if(!js.isObject())  return false;\n\n",$k,$k;
-
-  my $tmpl2;
-  $tmpl2='    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-' if @table[$i]->[1] ne 'notification';
-
-  $tmpl='    if(!js.isMember("#type#"))  return false;
-
-    if(!js["#type#"].isObject())  return false;
-    const Json::Value& j2=js["#type#"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("#name#"))  return false;
-'.$tmpl2.'
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-';
-
-  $z=@table[$i]->[1];
-  $tmpl=~s/#type#/$z/gs;
-  $z=@table[$i]->[0];
-  $tmpl=~s/#name#/$z/gs;
-  print FO $tmpl;
-  print FO declare_deserialize($_) foreach @tp;
-
-  printf FO "\n  }\n  catch(...)\n  {\n    return false;\n  }\n".
-  "  return checkIntegrity(c);\n}\n\n",$k,$k;
-
-  close FO;
-}
-
-# Marshaller cc/hh
-# last touch
-
-sub mkfuncname
-{
-  my $t=shift;
-  return $_->[1] eq 'notification' ? $_->[0] : sprintf "%s_%s",$_->[0],$_->[1];
-}
-
-open(FO,mkpath($path.'Marshaller',$sh)) or die;
-print FO header_h('Marshaller');
-print FO "#include <string>\n#include <json/json.h>\n\n";
-
-foreach(@table)
-{
-  my $z=$_->[1] eq 'notification' ? $_->[0] : sprintf "%s_%s",$_->[0],$_->[1];
-  printf FO "#include \"%s/%sMarshaller.%s\"\n",$i2p,$z,$sh;
-}
-
-print FO "\n";
-print FO $hat;
-
-printf FO "namespace %s\n{\n",$ns if $ns ne '';
-
-my $tmpl="#class Marshaller\n#{\n#public:\n\n#  enum Methods\n#  {\n#    METHOD_INVALID=-1";
-
-$tmpl=~s/#/$ind/gs;
-
-print FO $tmpl;
-
-my $z;
-
-my @lc=map { uc mkfuncname $_ } @table;
-for(my $i=0;$i<@lc;$i++)
-{
-  printf FO ",\n    %sMETHOD_%s=%u",$ind,@lc[$i],$i;
-}
-printf FO "\n  %s};\n",$ind;
-
-
-$tmpl='
-  Marshaller()					{}
-  ~Marshaller()					{}
-  
-
-  static ALRPCMessage* fromString(const std::string&);
-  static std::string toString(const ALRPCMessage* msg);
-
-protected:
-  static ALRPCMessage* fromJSON(const Json::Value&);
-  static Json::Value toJSON(const ALRPCMessage* msg);';
-  
-$tmpl=~s/\n/\n  /gs if $ns ne '';
-
-print FO $tmpl;
-print FO "\n";
-
-foreach(@table)
-{
-  my $k=$_;
-  my $n=mkfuncname($k);
-  printf FO "\n// %s\n",$n;
-  $tmpl="#  static bool fromString(const std::string& str, #name#& res)\n#  {\n#    return m#name#.fromString(str, res);\n#  }\n\n#  ".
-        "static std::string toString(const #name#& res)\n#  {\n#    return m#name#.toString(res);\n#  }\n";
-  $tmpl=~s/#name#/$n/gs;
-  $tmpl=~s/#/$ind/gs;
-  print FO $tmpl;
-}
-
-$tmpl='
-  struct localHash
-  {
-    const char *name;
-    unsigned int idx;
-    void* marshaller;					// Bingo!!!  old good plain C with direct casting!!!
-  };
-
-private:';
-
-$tmpl=~s/\n/\n  /gs if $ns ne '';
-
-print FO $tmpl;
-print FO "\n\n";
-
-printf FO "%s  static %sMarshaller m%s;\n",$ind,mkfuncname($_),mkfuncname($_) foreach @table;
-
-$tmpl=sprintf '
-  static const char* getName(Methods e)
-  {
-     return (e>=0 && e<%u) ? mHashTable[e].name : NULL;
-  }
-   
-  static const Methods getIndex(const char* s);
-
-  static const localHash mHashTable[%u];
-  
-  friend class Marshaller_intHash;',scalar @table,scalar @table; #,($ns eq '' ? '' : $ns.'::');
-
-$tmpl=~s/\n/\n  /gs if $ns ne '';
-print FO $tmpl;
-
-printf FO "\n%s};\n",$ind;
-print FO "\n}\n" if $ns ne '';
-
-print FO "\n#endif\n";
-close FO;
-
-
-open(FO,mkpath($pimpl.'Marshaller',$sc)) or die;
-print FO $pragma;
-
-my $nsc= $ns eq '' ? '' : "using namespace $ns;\n\n";
-my $hhat=$hat;
-{
-  if(exists $config{'ee'})
-  {
-    $hhat=~s/^\/\/.*?\n//s;
-    $hhat=getfort().$hhat;
-  }
-}
-
-printf FO "#include <cstring>\n\n#include \"%s/Marshaller.%s\"\n",$p2i,$sh;
-printf FO "#include \"%s/%s.%s\"\n",$p2i,mkfuncname($_),$sh foreach @table;
-
-printf FO "namespace %s\n{",$ns if $ns ne '';
-print FO "\n#include \"Marshaller.inc\"\n";
-print FO "}\n" if $ns ne '';
-
-print FO "\n";
-
-print FO $hhat;
-
-print FO $nsc;
-
-print FO '
-const Marshaller::Methods Marshaller::getIndex(const char* s)
-{
-  if(!s)
-    return METHOD_INVALID;
-  const struct localHash* p=Marshaller_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<Methods>(p->idx) : METHOD_INVALID;
-}
-
-
-ALRPCMessage* Marshaller::fromString(const std::string& s)
-{
-  ALRPCMessage* rv=0;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-
-    if(!reader.parse(s,json,false))  return 0;
-    if(!(rv=fromJSON(json)))  return 0;
-  }
-  catch(...)
-  {
-    return 0;
-  }
-  return rv;
-}
-
-std::string Marshaller::toString(const ALRPCMessage* msg)
-{
-  if(!msg)  return "";
-
-  Json::Value json=toJSON(msg);
-
-  if(json.isNull()) return "";
-
-  Json::FastWriter writer;
-  std::string rv;
-  return writer.write(json);
-}
-
-
-ALRPCMessage* Marshaller::fromJSON(const Json::Value& json)
-{
-  if(!json.isObject())  return NULL;
-  Json::Value j=Json::Value(Json::nullValue);
-
-  std::string tp;
-  if(json.isMember("notification")) j=json[tp="notification"];
-
-  if(json.isMember("request"))  j=json[tp="request"];
-  if(json.isMember("response"))  j=json[tp="response"];
-
-  if(!j.isObject()) return NULL;
-  if(!j.isMember("name") || !j["name"].isString()) return NULL;
-
-  std::string ts=j["name"].asString()+"_"+tp;
-
-  Methods m=getIndex(ts.c_str());
-  switch(m)							// let'."'".'s rock, china style
-  {
-    case METHOD_INVALID:
-      return NULL;
-';
-
-foreach(@table)
-{
-  my $n=$_;
-  my $t='
-    case METHOD_#NAME#:
-    {
-      #name#* rv=new #name#;
-      if(#name#Marshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-';
-  my $z=mkfuncname($n);
-  $t=~s/#name#/$z/gs;
-  $z=uc $z;
-  $t=~s/#NAME#/$z/gs;
-  print FO $t;
-}
-print FO "  }\n\n  return NULL;\n}\n\n";
-
-print FO 'Json::Value Marshaller::toJSON(const ALRPCMessage* msg)
-{
-  Json::Value j=Json::Value(Json::nullValue);
-
-  if(!msg) return j;
-  Methods m=static_cast<Methods>(msg->getMethodId());
-
-  switch(m)
-  {';
-
-foreach(@table)
-{
-  my $n=$_;
-  my $t='
-    case METHOD_#NAME#:
-         return #name#Marshaller::toJSON(* static_cast<const #name#*>(msg));
-';
-  my $z=mkfuncname($n);
-  $t=~s/#name#/$z/gs;
-  $z=uc $z;
-  $t=~s/#NAME#/$z/gs;
-  print FO $t;
-}
-
-print FO "\n    case METHOD_INVALID:\n    default:\n      return j;\n  }\n\n  return j;\n}\n\n";
-
-
-printf FO "%sMarshaller Marshaller::m%s;\n",mkfuncname($_),mkfuncname($_) foreach @table;
-
-printf FO "\nconst Marshaller::localHash Marshaller::mHashTable[%u]=\n{\n",scalar @table;
-
-my @lc;
-@lc= map { sprintf '  {"%s_%s",METHOD_%s,&Marshaller::m%s}',$_->[0],$_->[1],uc mkfuncname($_),mkfuncname($_) } @table;
-
-
-print FO join(",\n",@lc);
-
-print FO "\n};\n";
-
-close FO;
-
-
-open(FO,mkpath($path.'RPC',$sh)) or die;
-print FO header_h('RPC');
-print FO "#include <string>\n#include <json/json.h>\n\n";
-
-printf FO "#include \"%s.%s\"\n",$_,$sh foreach sort keys %types;
-
-printf FO "#include \"%s.%s\"\n",mkfuncname($_),$sh foreach @table;
-
-
-print FO "\n";
-print FO $hat;
-
-print FO "\n\n#endif\n";
-
-print STDERR "done\n";
-#die Dumper \%types;
-exit 0;
-
diff --git a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/v4_protocol_v1_2_no_extra.xml b/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/v4_protocol_v1_2_no_extra.xml
deleted file mode 100755
index b2d42aa7e..000000000
--- a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/v4_protocol_v1_2_no_extra.xml
+++ /dev/null
@@ -1,1154 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- edited with XMLSpy v2011 rel. 3 sp1 (x64) (http://www.altova.com) by Olesksandr Leshchenko (HP) -->
-<?xml-stylesheet type="text/xml" href="protocol2html.xsl"?>
-<interface name="Ford Sync RAPI" version="1.2" date="2011-05-17">
-	<enum name="Result">
-		<element name="SUCCESS">
-			<description>The request succeeded</description>
-		</element>
-		<element name="INVALID_DATA">
-			<description>The data sent is invalid. For example</description>
-			<description>Invalid Json syntax</description>
-			<description>Parameters out of bounds (number or enum range)</description>
-			<description>Mandatory parameters not provided</description>
-			<description>Parameter provided with wrong type</description>
-			<description>Invalid characters</description>
-			<description>Empty string</description>
-		</element>
-		<element name="UNSUPPORTED_REQUEST">
-			<description>The request is not supported by Sync</description>
-		</element>
-		<element name="OUT_OF_MEMORY">
-			<description>The system could not process the request because the necessary memory couldn't be allocated</description>
-		</element>
-		<element name="TOO_MANY_PENDING_REQUESTS">
-			<description>There are too many requests pending (means, that the response has not been delivered, yet).</description>
-			<designdescription>There may be a maximum of 1000 pending requests at a time.</designdescription>
-		</element>
-		<element name="INVALID_ID">
-			<description>One of the provided IDs is not valid. For example</description>
-			<description>This applies to CorrelationID, SubscriptionID [@TODO if SubscriptionID is used], CommandID, MenuID, [@TODO: missed one?]</description>
-		</element>
-		<element name="DUPLICATE_NAME">
-			<description>There was a conflict with an registered name (application or menu item) or vr command</description>
-		</element>
-		<element name="TOO_MANY_APPLICATIONS">
-			<description>There are already too many registered applications</description>
-		</element>
-		<element name="APPLICATION_REGISTERED_ALREADY">
-			<description>RegisterApplication has been called again, after a RegisterApplication was successful before.</description>
-		</element>
-		<element name="UNSUPPORTED_VERSION">
-			<description>Sync doesn't support the protocol that is requested by the mobile application</description>
-		</element>
-		<element name="WRONG_LANGUAGE">
-			<description>The requested language is currently not supported.</description>
-			<description>Might be because of a mismatch of the currently active language on Sync and the requested language</description>
-		</element>
-		<element name="APPLICATION_NOT_REGISTERED">
-			<description>An command can not be executed because no application has been registered with RegisterApplication.</description>
-		</element>
-		<element name="IN_USE">
-			<description>The data may not be changed, because it is currently in use.</description>
-			<description>For example when trying to delete a command set that is currently involved in an interaction.</description>
-		</element>
-		<element name="SUBSCRIBED_ALREADY">
-			<description>The item to subscribe to is already subscribed to.</description>
-		</element>
-		<element name="REJECTED">
-			<description>The requested command was rejected, e.g. because mobile app is in background and cannot perform any HMI commands.</description>
-			<description>Or an HMI command (e.g. Speak) is rejected because a higher priority HMI command (e.g. Alert) is playing.</description>
-		</element>
-		<element name="ABORTED">
-			<description>A command was aborted, for example due to user interaction (e.g. user pressed button).</description>
-			<description>Or an HMI command (e.g. Speak) is aborted because a higher priority HMI command (e.g. Alert) was requested.</description>
-		</element>
-		<element name="IGNORED">
-			<description>A command was ignored, because the intended result is already in effect.</description>
-			<description>For example, SetMediaClockTimer was used to pause the media clock although the clock is paused already.</description>
-			<description>NOTE: potentially replaces SUBSCRIBED_ALREADY</description>
-		</element>
-		<element name="UNSUPPORTED_BUTTON">
-			<description>A button that was requested for subscription is not supported under the current system.</description>
-			<description>NOTE: could become a more generic UNSUPPORTED_RESOURCE by merging with VEHIVLE_DATA_NOT_AVAILABLE.</description>
-		</element>
-		<element name="FILE_NOT_FOUND">
-			<description>A specified file could not be found on Sync.</description>
-		</element>
-		<element name="GENERIC_ERROR">
-			<description>Provided data is valid but something went wrong in the lower layers.</description>
-		</element>
-	</enum>
-	<enum name="ButtonPressMode">
-		<element name="LONG">
-			<description>A button was released, after it was pressed for a long time</description>
-			<description>Actual timing is defined by Sync and may vary</description>
-		</element>
-		<element name="SHORT">
-			<description>A button was released, after it was pressed for a short time</description>
-			<description>Actual timing is defined by Sync and may vary</description>
-		</element>
-	</enum>
-	<enum name="ButtonEventMode">
-		<element name="BUTTONUP">
-			<description>A button has been released up</description>
-		</element>
-		<element name="BUTTONDOWN">
-			<description>A button has been pressed down</description>
-		</element>
-	</enum>
-	<enum name="Language">
-		<description>The set of potential languages</description>
-		<element name="EN-US" internal_name="EN_US">
-			<description>US English</description>
-		</element>
-		<element name="ES-MX" internal_name="ES_MX">
-			<description>Mexican Spanish</description>
-		</element>
-		<element name="FR-CA" internal_name="FR_CA">
-			<description>Canadian French</description>
-		</element>
-	</enum>
-	<enum name="UpdateMode">
-		<description>Describes how the media clock timer should behave on the platform</description>
-		<element name="COUNTUP"/>
-		<description>Starts the media clock timer counting upwards, as in time elapsed.</description>
-		<element name="COUNTDOWN"/>
-		<description>Starts the media clock timer counting downwards, as in time remaining.</description>
-		<element name="PAUSE"/>
-		<description>Pauses the media clock timer</description>
-		<element name="RESUME"/>
-		<description>Resume the media clock timer</description>
-	</enum>
-	<enum name="InteractionMode">
-		<description>For application-requested interactions, this mode indicates the method in which the user is notified and uses the interaction.</description>
-		<element name="MANUAL_ONLY"/>
-		<description>This mode causes the interaction to only occur on the display, meaning the choices are provided only via the display.</description>
-		<description>Selections are made with the OK and Seek Right and Left, Tune Up and Down buttons.</description>
-		<element name="VR_ONLY"/>
-		<description>This mode causes the interaction to only occur using V4.</description>
-		<description>Selections are made by saying the command.</description>
-		<element name="BOTH"/>
-		<description>This mode causes both a VR and display selection option for an interaction.</description>
-		<description>Selections can be made either from the menu display or by speaking the command.</description>
-	</enum>
-	<enum name="HMILevel">
-		<description>Enumeraction that describes current levels of HMI.</description>
-		<element name="FULL" internal_name="HMI_FULL"/>
-		<element name="LIMITED" internal_name="HMI_LIMITED"/>
-		<element name="BACKGROUND" internal_name="HMI_BACKGROUND"/>
-		<element name="NONE" internal_name="HMI_NONE"/>
-	</enum>
-	<enum name="AudioStreamingState">
-		<description>Enumeraction that describes possible states of audio streaming.</description>
-		<element name="AUDIBLE"/>
-		<element name="NOT_AUDIBLE"/>
-	</enum>
-	<enum name="SystemContext">
-		<description>Enumeraction that describes possible contexts and app's HMI might be in.</description>
-		<element name="MAIN" internal_name="SYSCTXT_MAIN"/>
-		<element name="VRSESSION" internal_name="SYSCTXT_VRSESSION"/>
-		<element name="MENU" internal_name="SYSCTXT_MENU"/>
-	</enum>
-	<enum name="AppInterfaceUnregisteredReason">
-		<description>Error code, which comes from sync side.</description>
-		<element name="USER_EXIT"/>
-		<element name="IGNITION_OFF"/>
-		<element name="BLUETOOTH_OFF"/>
-		<element name="USB_DISCONNECTED"/>
-		<element name="REQUEST_WHILE_IN_NONE_HMI_LEVEL"/>
-		<element name="TOO_MANY_REQUESTS"/>
-		<element name="DRIVER_DISTRACTION_VIOLATION"/>
-		<element name="LANGUAGE_CHANGE"/>
-		<element name="MASTER_RESET"/>
-		<element name="FACTORY_DEFAULTS"/>
-	</enum>
-	<enum name="TriggerSource">
-		<description>Indicates the source from where the command was triggered.</description>
-		<element name="MENU" internal_name="TS_MENU"/>
-		<element name="VR" internal_name="TS_VR"/>
-	</enum>
-	<enum name="HmiZoneCapabilities">
-		<description>Contains information about the HMI zone capabilities.</description>
-		<description>For future use.</description>
-		<element name="FRONT"/>
-		<element name="BACK"/>
-	</enum>
-	<enum name="SpeechCapabilities">
-		<description>Contains information about the TTS capabilities.</description>
-		<element name="TEXT"/>
-		<element name="SAPI_PHONEMES"/>
-		<element name="LHPLUS_PHONEMES"/>
-		<element name="PRE_RECORDED"/>
-		<element name="SILENCE"/>
-	</enum>
-	<enum name="VrCapabilities">
-		<description>Contains information about the VR capabilities.</description>
-		<element name="Text"/>
-	</enum>
-	<enum name="AudioCaptureQuality" platform="pending">
-		<description>Describes different quality options for PerformAudioCapture.</description>
-		<element name="8KHZ"/>
-		<element name="16KHZ"/>
-	</enum>
-	<enum name="ButtonName">
-		<description>Defines the hard (physical) and soft (touchscreen) buttons available from SYNC</description>
-		<element name="OK"/>
-		<element name="SEEKLEFT"/>
-		<element name="SEEKRIGHT"/>
-		<element name="TUNEUP"/>
-		<element name="TUNEDOWN"/>
-		<element name="PRESET_0"/>
-		<element name="PRESET_1"/>
-		<element name="PRESET_2"/>
-		<element name="PRESET_3"/>
-		<element name="PRESET_4"/>
-		<element name="PRESET_5"/>
-		<element name="PRESET_6"/>
-		<element name="PRESET_7"/>
-		<element name="PRESET_8"/>
-		<element name="PRESET_9"/>
-		<issue creator="rs">Are these all supported buttons?</issue>
-	</enum>
-	<enum name="MediaClockFormat">
-		<element name="CLOCK1">
-			<description>minutesFieldWidth = 2;minutesFieldMax = 19;secondsFieldWidth = 2;secondsFieldMax = 99;maxHours = 19;maxMinutes = 59;maxSeconds = 59;</description>
-			<description>used for Type II and CID headunits</description>
-		</element>
-		<element name="CLOCK2">
-			<description>minutesFieldWidth = 3;minutesFieldMax = 199;secondsFieldWidth = 2;secondsFieldMax = 99;maxHours = 59;maxMinutes = 59;maxSeconds = 59;</description>
-			<description>used for Type V headunit</description>
-		</element>
-		<element name="CLOCKTEXT1">
-			<description>5 characters possible</description>
-			<description>Format:      1|sp   c   :|sp   c   c</description>
-			<description>1|sp : digit "1" or space</description>
-			<description>c    : character out of following character set: sp|0-9|[letters, see TypeII column in XLS. See [@TODO: create file ref]]</description>
-			<description>:|sp : colon or space</description>
-			<description>used for Type II headunit</description>
-		</element>
-		<element name="CLOCKTEXT2">
-			<description>5 chars possible</description>
-			<description>Format:      1|sp   c   :|sp   c   c</description>
-			<description>1|sp : digit "1" or space</description>
-			<description>c    : character out of following character set: sp|0-9|[letters, see CID column in XLS. See [@TODO: create file ref]]</description>
-			<description>:|sp : colon or space</description>
-			<description>used for CID headunit</description>
-			<description>NOTE: difference between CLOCKTEXT1 and CLOCKTEXT2 is the supported character set</description>
-		</element>
-		<element name="CLOCKTEXT3">
-			<description>6 chars possible</description>
-			<description>Format:      1|sp   c   c   :|sp   c   c</description>
-			<description>1|sp : digit "1" or space</description>
-			<description>c    : character out of following character set: sp|0-9|[letters, see Type 5 column in XLS]. See [@TODO: create file ref]</description>
-			<description>:|sp : colon or space</description>
-			<description>used for Type V headunit</description>
-		</element>
-		<issue creator="mf">First complete values draft. Review needed.</issue>
-	</enum>
-	<enum name="DisplayType">
-		<description>See DAES for further infos regarding the displays]</description>
-		<issue creator="rs">Meaningful description is missing</issue>
-		<element name="CID"/>
-		<element name="TYPE2"/>
-		<element name="TYPE5"/>
-		<element name="NGN"/>
-		<element name="GEN2_8_DMA"/>
-		<element name="GEN2_6_DMA"/>
-		<element name="MFD3"/>
-		<element name="MFD4"/>
-		<element name="MFD5"/>
-	</enum>
-	<enum name="TextFieldName">
-		<element name="mainField1">
-			<description>The first line of the main field of persistent display</description>
-			<description>Applies to "Show"</description>
-		</element>
-		<element name="mainField2">
-			<description>The second line of the main field of persistent display</description>
-			<description>Applies to "Show"</description>
-		</element>
-		<element name="statusBar">
-			<description>The status bar on Nav</description>
-			<description>Applies to "Show"</description>
-		</element>
-		<element name="mediaClock">
-			<description>Text value for MediaClock field. Has to be properly formatted by Mobile App according to Sync capabilities.</description>
-			<description>Applies to "Show"</description>
-		</element>
-		<element name="mediaTrack">
-			<description>The track field of NGN type ACMs.</description>
-			<description>This field is only available for media applications.</description>
-			<description>Applies to "Show"</description>
-		</element>
-		<element name="alertText1">
-			<description>The first line of the alert text field</description>
-			<description>Applies to "Alert"</description>
-		</element>
-		<element name="alertText2">
-			<description>The second line of the alert text field</description>
-			<description>Applies to "Alert"</description>
-		</element>
-	</enum>
-	<enum name="CharacterSet">
-		<description>The list of potential character sets</description>
-		<element name="TYPE2SET">
-			<description>See [@TODO: create file ref]</description>
-		</element>
-		<element name="TYPE5SET">
-			<description>See [@TODO: create file ref]</description>
-		</element>
-		<element name="CID1SET">
-			<description>See [@TODO: create file ref]</description>
-		</element>
-		<element name="CID2SET">
-			<description>See [@TODO: create file ref]</description>
-		</element>
-		<issue creator="rs">Real sets have not been defined yet?</issue>
-	</enum>
-	<enum name="TextAlignment">
-		<description>The list of possible alignments, left, right, or centered</description>
-		<element name="LEFT_ALIGNED"/>
-		<element name="RIGHT_ALIGNED"/>
-		<element name="CENTERED"/>
-	</enum>
-	<enum name="TBTState">
-		<description>Enumeration that describes possible states of turn-by-turn module.</description>
-		<element name="ROUTE_UPDATE_REQUEST"/>
-		<element name="ROUTE_ACCEPTED"/>
-		<element name="ROUTE_REFUSED"/>
-		<element name="ROUTE_CANCELLED"/>
-	</enum>
-	<enum name="DriverDistractionState">
-		<description>Enumeration that describes possible states of driver distraction.</description>
-		<element name="DD_ON"/>
-		<element name="DD_OFF"/>
-	</enum>
-	<struct name="Choice">
-		<description>A choice is an option given to the user, which can be selected either by menu, or through voice recognition system.</description>
-		<param name="choiceID" type="Integer" minvalue="0" maxvalue="65535"/>
-		<param name="menuName" type="String" maxlength="500"/>
-		<param name="vrCommands" type="String" minsize="1" maxsize="100" maxlength="99" array="true"/>
-	</struct>
-	<struct name="SyncMsgVersion">
-		<description>Specifies the version number of the SYNC V4 protocol, that is supported by the mobile application</description>
-		<param name="majorVersion" type="Integer" minvalue="1" maxvalue="1">
-			<description>The major version indicates versions that is not-compatible to previous versions.</description>
-		</param>
-		<param name="minorVersion" type="Integer" minvalue="0" maxvalue="1000">
-			<description>The minor version indicates a change to a previous version that should still allow to be run on an older version (with limited functionality)</description>
-		</param>
-	</struct>
-	<enum name="GlobalProperty">
-		<description>The different global properties.</description>
-		<element name="HELPPROMPT">
-			<description>The property helpPrompt of setGlobalProperties</description>
-		</element>
-		<element name="TIMEOUTPROMPT">
-			<description>The property timeoutPrompt of setGlobalProperties</description>
-		</element>
-	</enum>
-	<struct name="StartTime">
-		<param name="hours" type="Integer" minvalue="0" maxvalue="59">
-			<description>The hour of the media clock.</description>
-			<description>Some radios only support a max of 19 hours. If out of range, it will be rejected.</description>
-		</param>
-		<param name="minutes" type="Integer" minvalue="0" maxvalue="59"/>
-		<param name="seconds" type="Integer" minvalue="0" maxvalue="59"/>
-	</struct>
-	<struct name="TextField">
-		<param name="name" type="TextFieldName">
-			<description>The name that identifies the field. See TextFieldName.</description>
-		</param>
-		<param name="characterSet" type="CharacterSet">
-			<description>The character set that is supported in this field. See CharacterSet.</description>
-		</param>
-		<param name="width" type="Integer" minvalue="1" maxvalue="40">
-			<description>The number of characters in one row of this field.</description>
-		</param>
-		<param name="rows" type="Integer" minvalue="1" maxvalue="3">
-			<description>The number of rows of this field.</description>
-		</param>
-	</struct>
-	<struct name="DisplayCapabilities">
-		<description>Contains information about the display capabilities.</description>
-		<param name="displayType" type="DisplayType">
-			<description>The type of the display. See DisplayType</description>
-		</param>
-		<param name="textFields" type="TextField" minsize="1" maxsize="100" array="true">
-			<description>A set of all fields that support text data. See TextField</description>
-		</param>
-		<param name="mediaClockFormats" type="MediaClockFormat" minsize="1" maxsize="100" array="true">
-			<description>A set of all supported formats of the media clock. See MediaClockFormat</description>
-		</param>
-	</struct>
-	<struct name="ButtonCapabilities">
-		<description>Contains information about a buttons capabilities.</description>
-		<param name="name" type="ButtonName">
-			<description>The name of the button. See ButtonName.</description>
-		</param>
-		<param name="shortPressAvailable" type="Boolean">
-			<description>The button supports a short press.</description>
-			<description>Whenever the button is pressed short, onButtonPressed( SHORT) will be invoked.</description>
-		</param>
-		<param name="longPressAvailable" type="Boolean">
-			<description>The button supports a LONG press.</description>
-			<description>Whenever the button is pressed long, onButtonPressed( LONG) will be invoked.</description>
-		</param>
-		<param name="upDownAvailable" type="Boolean">
-			<description>The button supports "button down" and "button up".</description>
-			<description>Whenever the button is pressed, onButtonEvent( DOWN) will be invoked.</description>
-			<description>Whenever the button is released, onButtonEvent( UP) will be invoked.</description>
-		</param>
-	</struct>
-	<struct name="MenuParams">
-		<param name="parentID" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="false">
-			<description>unique ID of the sub menu, the command will be added to.</description>
-			<description>If not provided, it will be provided to the top level of the in application menu.</description>
-		</param>
-		<param name="position" type="Integer" minvalue="0" maxvalue="1000" mandatory="false">
-			<description>Position within the items that are are at top level of the in application menu.</description>
-			<description>0 will insert at the front.</description>
-			<description>1 will insert at the second position.</description>
-			<description>if position is greater or equal than the number of items on top level, the sub menu will be appended to the end.</description>
-			<description>If this param was omitted the entry will be added at the end.</description>
-		</param>
-		<param name="menuName" type="String" maxlength="500">
-			<description>Text to show in the menu for this sub menu.</description>
-		</param>
-	</struct>
-	<struct name="TTSChunk">
-		<description>A TTS chunk, that consists of the text/phonemes to speak and the type (like text or SAPI)</description>
-		<param name="text" maxlength="500" type="String">
-			<description>The text or phonemes to speak.</description>
-			<description>May not be empty.</description>
-		</param>
-		<param name="type" type="SpeechCapabilities">
-			<description>Describes, whether it is text or a specific phoneme set. See SpeechCapabilities</description>
-		</param>
-	</struct>
-	<!-- Requests/Responses -->
-	<function name="RegisterAppInterface" messagetype="request">
-		<description>Establishes an interface with a mobile application.</description>
-		<description>Before registerAppInterface no other commands will be accepted/executed.</description>
-		<param name="syncMsgVersion" type="SyncMsgVersion">
-			<description>See SyncMsgVersion</description>
-		</param>
-		<param name="appName" type="String" maxlength="100">
-			<description>The mobile application name, e.g. "Ford Drive Green".</description>
-			<description>Needs to be unique over all applications.</description>
-			<description>May not be empty.</description>
-			<description>May not start with a new line character.</description>
-			<description>May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)</description>
-			<description>Needs to be unique over all applications. Applications with the same name will be rejected.</description>
-			<description>Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.</description>
-		</param>
-		<param name="ngnMediaScreenAppName" type="String" maxlength="100" mandatory="false">
-			<description>Provides an abbreviated version of the app name (if needed), that will be displayed on the NGN media screen.</description>
-			<description>If not provided, the appName is used instead (and will be truncated if too long)</description>
-			<description>Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.</description>
-		</param>
-		<param name="vrSynonyms" type="String" maxlength="40" minsize="1" maxsize="100" array="true" mandatory="false">
-			<description>Defines an additional voice recognition command.</description>
-			<description>May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)</description>
-			<description>Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.</description>
-		</param>
-		<param name="usesVehicleData" type="Boolean" platform="pending" mandatory="false">
-			<description>If not provided, the default is equal to False"</description>
-			<description>Indicates if the mobile application wants to use vehicle data like GPS or speed.</description>
-		</param>
-		<param name="isMediaApplication" type="Boolean">
-			<description>Indicates if the application is a media or a non-media application.</description>
-			<description>Only media applications will be able to stream audio to Sync that is audible outside of the BT media source.</description>
-		</param>
-		<param name="languageDesired" type="Language">
-			<description>See Language</description>
-			<description>If the language doesn't match the active language on Sync, it will be rejected.</description>
-			<description>If the language is changed, while an app is registered, it will get disconnected.</description>
-		</param>
-		<param name="autoActivateID" type="String" maxlength="16" mandatory="false">
-			<description>Used to support auto activation after an initial successful registerAppInterface (for example after an ignition cycle).</description>
-			<description>The app should always provide the id that was provided by the most recent registerAppInterface response.</description>
-			<description>If this is the first call to registerAppInterface, then do not provide this parameter at all.</description>
-			<description>If not provided or not matching with the id of the last registerAppInterface response, the app will not be automatically put into foreground on startup.</description>
-		</param>
-	</function>
-	<function name="RegisterAppInterface" messagetype="response">
-		<description>The response to registerAppInterface</description>
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="DUPLICATE_NAME"/>
-			<element name="TOO_MANY_APPLICATIONS"/>
-			<element name="APPLICATION_REGISTERED_ALREADY"/>
-			<element name="UNSUPPORTED_VERSION"/>
-			<element name="WRONG_LANGUAGE"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-		<param name="syncMsgVersion" type="SyncMsgVersion" mandatory="false">
-			<description>See SyncMsgVersion</description>
-		</param>
-		<param name="autoActivateID" type="String" maxlength="16" mandatory="false">
-			<description>Provides an id that the app may use on a subsequent registerAppInterface to allow for auto activation (for example after an ignition cycle).</description>
-		</param>
-		<param name="language" type="Language" mandatory="false">
-			<description>The currently active language on Sync. See "Language" for options.</description>
-		</param>
-		<param name="displayCapabilities" type="DisplayCapabilities" mandatory="false">
-			<description>See DisplayCapabilities</description>
-		</param>
-		<param name="buttonCapabilities" type="ButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
-			<description>See ButtonCapabilities</description>
-		</param>
-		<param name="hmiZoneCapabilities" type="HmiZoneCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
-			<issue creator="rs">If not used yet => remove</issue>
-			<description>See HmiZoneCapabilities</description>
-		</param>
-		<param name="speechCapabilities" type="SpeechCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
-			<description>See SpeechCapabilities</description>
-		</param>
-		<param name="vrCapabilities" type="VrCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
-			<description>See VrCapabilities</description>
-		</param>
-	</function>
-	<function name="UnregisterAppInterface" messagetype="request">
-		<description>Closes an interface from a mobile application.</description>
-		<description>After unregisterAppInterface, no commands other than registerAppInterface will be accepted/executed.</description>
-		<description>Will fail, if no registerAppInterface was completed successfully before.</description>
-	</function>
-	<function name="UnregisterAppInterface" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="SetGlobalProperties" messagetype="request">
-		<description>Allows setting global properties.</description>
-		<param name="helpPrompt" type="TTSChunk" minsize="1" maxsize="100" array="true" mandatory="false">
-			<description>The help prompt.</description>
-			<description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-			<description>The array must have at least one item</description>
-		</param>
-		<param name="timeoutPrompt" type="TTSChunk" minsize="1" maxsize="100" array="true" mandatory="false">
-			<description>Help text for a wait timeout.</description>
-			<description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-			<description>The array must have at least one item</description>
-		</param>
-		<issue creator="rs">Do we want to add VR threshold params?</issue>
-	</function>
-	<function name="SetGlobalProperties" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="ResetGlobalProperties" messagetype="request">
-		<description>Allows resetting global properties.</description>
-		<param name="properties" type="GlobalProperty" minsize="1" maxsize="100" array="true">
-			<description>Contains the names of all global properties (like timeoutPrompt) that should be unset. Resetting means, that they have the same value as at start up (default)</description>
-		</param>
-	</function>
-	<function name="ResetGlobalProperties" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="AddCommand" messagetype="request">
-		<description>Adds a command to the in application menu.</description>
-		<description>Either menuParams or vrCommands must be provided.</description>
-		<param name="cmdID" type="Integer" minvalue="0" maxvalue="2000000000">
-			<description>unique ID of the command to add.</description>
-		</param>
-		<param name="menuParams" type="MenuParams" mandatory="false">
-			<description>Optional sub value containing menu parameters</description>
-		</param>
-		<param name="vrCommands" type="String" minsize="1" maxsize="100" maxlength="99" array="true" mandatory="false">
-			<description>An array of strings to be used as VR sysnonyms for this command.</description>
-			<description>If this array is provided, it may not be empty.</description>
-		</param>
-	</function>
-	<function name="AddCommand" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-			<element name="INVALID_ID"/>
-			<element name="DUPLICATE_NAME"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="DeleteCommand" messagetype="request">
-		<description>Deletes all commands from the in-application menu with the specified command id.</description>
-		<param name="cmdID" type="Integer" minvalue="0" maxvalue="2000000000">
-			<description>ID of the command(s) to delete.</description>
-		</param>
-	</function>
-	<function name="DeleteCommand" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-			<element name="INVALID_ID"/>
-			<element name="IN_USE"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="AddSubMenu" messagetype="request">
-		<description>Adds a sub menu to the in-application menu.</description>
-		<param name="menuID" type="Integer" minvalue="0" maxvalue="2000000000">
-			<description>unique ID of the sub menu to add.</description>
-		</param>
-		<param name="position" type="Integer" minvalue="0" maxvalue="1000" mandatory="false">
-			<description>Position within the items that are are at top level of the in application menu.</description>
-			<description>0 will insert at the front.</description>
-			<description>1 will insert at the second position.</description>
-			<description>If position is greater or equal than the number of items on top level, the sub menu will be appended to the end.</description>
-			<description>Position of any submenu will always be located before the return and exit options</description>
-			<description>If this param was omitted the entry will be added at the end.</description>
-		</param>
-		<param name="menuName" maxlength="500" type="String">
-			<description>Text to show in the menu for this sub menu.</description>
-		</param>
-	</function>
-	<function name="AddSubMenu" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-			<element name="INVALID_ID"/>
-			<element name="DUPLICATE_NAME"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="DeleteSubMenu" messagetype="request">
-		<description>Deletes a submenu from the in-application menu.</description>
-		<param name="menuID" type="Integer" minvalue="0" maxvalue="2000000000">
-			<description>The "menuID" of the submenu to delete. (See addSubMenu.menuID)</description>
-		</param>
-	</function>
-	<function name="DeleteSubMenu" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-			<element name="INVALID_ID"/>
-			<element name="IN_USE"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="CreateInteractionChoiceSet" messagetype="request">
-		<description>creates interaction choice set to be used later by performInteraction</description>
-		<param name="interactionChoiceSetID" type="Integer" minvalue="0" maxvalue="2000000000">
-			<description>Unique ID used for this interaction choice set.</description>
-		</param>
-		<param name="choiceSet" type="Choice" minsize="1" maxsize="100" array="true"/>
-	</function>
-	<function name="CreateInteractionChoiceSet" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-			<element name="INVALID_ID"/>
-			<element name="DUPLICATE_NAME"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="PerformInteraction" messagetype="request">
-		<description>Triggers an interaction (e.g. "Permit GPS?" - Yes, no, Always Allow).</description>
-		<param name="initialText" type="String" maxlength="500">
-			<description>Text to be displayed first.</description>
-		</param>
-		<param name="initialPrompt" type="TTSChunk" minsize="1" maxsize="100" array="true">
-			<description>This is the intial prompt spoken to the user at the start of an interaction</description>
-			<description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-			<description>The array must have at least one item</description>
-		</param>
-		<param name="interactionMode" type="InteractionMode">
-			<description>See InteractionMode.</description>
-		</param>
-		<param name="interactionChoiceSetIDList" type="Integer" minsize="1" maxsize="100" minvalue="0" maxvalue="2000000000" array="true">
-			<description>List of interaction choice set IDs to use with an interaction.</description>
-		</param>
-		<param name="helpPrompt" type="TTSChunk" minsize="1" maxsize="100" array="true" mandatory="false">
-			<description>Help text. This is the spoken string when a user speaks "help" when the interaction is occuring.</description>
-			<description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-			<description>The array must have at least one item</description>
-		</param>
-		<param name="timeoutPrompt" type="TTSChunk" minsize="1" maxsize="100" array="true" mandatory="false">
-			<description>Timeout text. This text is spoken when a VR interaction times out.</description>
-			<description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-			<description>The array must have at least one item</description>
-		</param>
-		<param name="timeout" type="Integer" minvalue="5000" maxvalue="100000" mandatory="false">
-			<description>Timeout in milliseconds.</description>
-			<description>If omitted a standard value of 10000 milliseconds is used.</description>
-		</param>
-	</function>
-	<function name="PerformInteraction" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-			<element name="INVALID_ID"/>
-			<element name="DUPLICATE_NAME"/>
-			<element name="REJECTED"/>
-			<element name="ABORTED"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-		<param name="choiceID" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="false">
-			<description>ID of the choice that was selected in response to PerformInteraction.</description>
-		</param>
-		<param name="triggerSource" type="TriggerSource" mandatory="false">
-			<description>See TriggerSource</description>
-		</param>
-	</function>
-	<function name="DeleteInteractionChoiceSet" messagetype="request">
-		<description>Deletes interaction choice set that has been created with "CreateInteractionChoiceSet".</description>
-		<description>The interaction may only be deleted when not currently in use by a "performInteraction".</description>
-		<param name="interactionChoiceSetID" type="Integer" minvalue="0" maxvalue="2000000000">
-			<description>ID of the interaction choice set to delete.</description>
-		</param>
-	</function>
-	<function name="DeleteInteractionChoiceSet" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-			<element name="INVALID_ID"/>
-			<element name="IN_USE"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="Alert" messagetype="request">
-		<description>Shows an alert which typically consists of text-to-speech message and text on the display. At least either alertText1, alertText2 or TTSChunks need to be provided.</description>
-		<param name="alertText1" type="String" maxlength="500" mandatory="false">
-			<description>The first line of the alert text field</description>
-		</param>
-		<param name="alertText2" type="String" maxlength="500" mandatory="false">
-			<description>The second line of the alert text field</description>
-		</param>
-		<param name="ttsChunks" type="TTSChunk" minsize="1" maxsize="100" array="true" mandatory="false">
-			<description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-			<description>The array must have at least one item</description>
-		</param>
-		<param name="duration" type="Integer" minvalue="3000" maxvalue="10000" mandatory="false">
-			<description>Timeout in milliseconds.</description>
-			<description>Typical timeouts are 3-5 seconds</description>
-			<description>If omitted, timeout is set to 5s.</description>
-		</param>
-		<param name="playTone" type="Boolean" mandatory="false">
-			<description>Defines if tone should be played. Tone is played before TTS.</description>
-			<description>If omitted, no tone is played.</description>
-		</param>
-	</function>
-	<function name="Alert" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-			<element name="ABORTED"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="Show" messagetype="request">
-		<description>Updates the persistent display. Supported fields depend on display capabilities.</description>
-		<param name="mainField1" type="String" maxlength="500" mandatory="false">
-			<description>The text that should be displayed in a single or upper display line.</description>
-			<description>If this text is not set, the text of mainField1 stays unchanged.</description>
-			<description>If this text is empty "", the field will be cleared.</description>
-		</param>
-		<param name="mainField2" type="String" maxlength="500" mandatory="false">
-			<description>The text that should be displayed on the second dispay line.</description>
-			<description>If this text is not set, the text of mainField2 stays unchanged.</description>
-			<description>If this text is empty "", the field will be cleared.</description>
-		</param>
-		<param name="alignment" type="TextAlignment" mandatory="false">
-			<description>Specifies how mainField1 and mainField2 texts should be aligned on display.</description>
-			<description>If omitted, texts will be centered</description>
-		</param>
-		<param name="statusBar" type="String" maxlength="500" mandatory="false">
-			<description>Requires investigation regarding the nav display capabilities. Potentially lower lowerStatusBar, upperStatusBar, titleBar, etc.</description>
-		</param>
-		<param name="mediaClock" type="String" maxlength="500" mandatory="false">
-			<description>Text value for MediaClock field. Has to be properly formatted by Mobile App according to Sync capabilities.</description>
-			<description>If this text is set, any automatic media clock updates previously set with SetMediaClockTimer will be stopped.</description>
-		</param>
-		<param name="mediaTrack" type="String" maxlength="500" mandatory="false">
-			<description>The text that should be displayed in the track field.</description>
-			<description>This field is only valid for media applications on NGN type ACMs.</description>
-			<description>If this text is not set, the text of mediaTrack stays unchanged.</description>
-			<description>If this text is empty "", the field will be cleared.</description>
-		</param>
-	</function>
-	<function name="Show" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="Speak" messagetype="request">
-		<description>Speaks a text.</description>
-		<param name="ttsChunks" type="TTSChunk" minsize="1" maxsize="100" array="true">
-			<description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-			<description>The array must have at least one item</description>
-		</param>
-	</function>
-	<function name="Speak" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-			<element name="ABORTED"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="SetMediaClockTimer" messagetype="request">
-		<description>Sets the initial media clock value and automatic update method.</description>
-		<param name="startTime" type="StartTime" mandatory="false">
-			<description>See StartTime</description>
-			<description>startTime must be provided for "run"</description>
-			<description>startTime will be ignored for "pause" and "resum"</description>
-		</param>
-		<param name="updateMode" type="UpdateMode">
-			<description>Enumeration to control the media clock.</description>
-			<description>In case of pause or resume, the start time value is ignored and shall be left out.  For resume, the time continues with the same value as it was when paused.</description>
-		</param>
-	</function>
-	<function name="SetMediaClockTimer" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-			<element name="IGNORED"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="EncodedSyncPData" messagetype="request">
-		<description>Allows encoded data in the form of SyncP packets to be sent to the SYNC module</description>
-		<param name="data" type="String" maxlength="10000" minsize="1" maxsize="100" array="true" mandatory="true">
-			<description>Contains base64 encoded string of SyncP packets.</description>
-			<todo>What is the maxlength</todo>
-		</param>
-	</function>
-	<function name="EncodedSyncPData" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="REJECTED"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="SubscribeButton" messagetype="request">
-		<description>Subscribes to built-in HMI buttons.</description>
-		<description>The application will be notified by the OnButtonEvent and OnButtonPress.</description>
-		<description>To unsubscribe the notifications, use unsubscribeButton.</description>
-		<param name="buttonName" type="ButtonName">
-			<description>Name of the button to subscribe.</description>
-		</param>
-	</function>
-	<function name="SubscribeButton" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="UNSUPPORTED_BUTTON"/>
-			<element name="IGNORED"/>
-			<element name="REJECTED"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="UnsubscribeButton" messagetype="request">
-		<description>Unsubscribes from built-in HMI buttons.</description>
-		<param name="buttonName" type="ButtonName">
-			<description>Name of the button to unsubscribe.</description>
-		</param>
-	</function>
-	<function name="UnsubscribeButton" messagetype="response">
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="SUCCESS"/>
-			<element name="INVALID_DATA"/>
-			<element name="OUT_OF_MEMORY"/>
-			<element name="TOO_MANY_PENDING_REQUESTS"/>
-			<element name="APPLICATION_NOT_REGISTERED"/>
-			<element name="GENERIC_ERROR"/>
-			<element name="UNSUPPORTED_BUTTON"/>
-			<element name="IGNORED"/>
-			<element name="REJECTED"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<function name="GenericResponse" messagetype="response">
-		<description>Generic Response is sent, when the name of a received msg cannot be retrieved. Only used in case of an error.</description>
-		<description>Currently, only resultCode INVALID_DATA is used.</description>
-		<param name="success" type="Boolean">
-			<description>true, if successful</description>
-			<description>false, if failed</description>
-		</param>
-		<param name="resultCode" type="Result">
-			<description>See Result</description>
-			<element name="INVALID_DATA"/>
-		</param>
-		<param name="info" type="String" maxlength="1000" mandatory="false">
-			<description>Provides additional human readable info regarding the result.</description>
-		</param>
-	</function>
-	<!-- Notifications -->
-	<function name="OnHMIStatus" messagetype="notification">
-		<param name="hmiLevel" type="HMILevel">
-			<description>See HMILevel</description>
-		</param>
-		<param name="audioStreamingState" type="AudioStreamingState">
-			<description>See AudioStreamingState</description>
-		</param>
-		<param name="systemContext" type="SystemContext">
-			<description>See SystemContext</description>
-		</param>
-	</function>
-	<function name="OnAppInterfaceUnregistered" messagetype="notification">
-		<param name="reason" type="AppInterfaceUnregisteredReason">
-			<description>See AppInterfaceUnregisteredReason</description>
-		</param>
-	</function>
-	<function name="OnButtonEvent" messagetype="notification">
-		<description>Notifies application of UP/DOWN events for buttons to which the application is subscribed.</description>
-		<param name="buttonName" type="ButtonName"/>
-		<param name="buttonEventMode" type="ButtonEventMode">
-			<description>Indicates whether this is an UP or DOWN event.</description>
-		</param>
-	</function>
-	<function name="OnButtonPress" messagetype="notification">
-		<description>Notifies application of LONG/SHORT press events for buttons to which the application is subscribed.</description>
-		<param name="buttonName" type="ButtonName"/>
-		<param name="buttonPressMode" type="ButtonPressMode">
-			<description>Indicates whether this is a LONG or SHORT button press event.</description>
-		</param>
-	</function>
-	<function name="OnCommand" messagetype="notification">
-		<param name="cmdID" type="Integer" minvalue="0" maxvalue="2000000000">
-			<description>Command ID, which is related to a specific menu entry.</description>
-		</param>
-		<param name="triggerSource" type="TriggerSource">
-			<description>See TriggerSource</description>
-		</param>
-	</function>
-	<function name="OnEncodedSyncPData" messagetype="notification">
-		<description>Callback including encoded data of any SyncP packets that SYNC needs to send back to the mobile device.</description>
-		<param name="data" type="String" maxlength="10000" minsize="1" maxsize="100" mandatory="true" array="true">
-			<description>Contains base64 encoded string of SyncP packets.</description>
-		</param>
-	</function>
-	<function name="OnTBTClientState" messagetype="notification">
-		<description>Provides applications with notifications specific to the current TBT client status on the module</description>
-		<param name="state" type="TBTState">
-			<description>Current State of TBT client</description>
-		</param>
-	</function>
-	<function name="OnDriverDistraction" messagetype="notification">
-		<description>Provides driver distraction state to mobile applications</description>
-		<param name="state" type="DriverDistractionState">
-			<description>Current State of Driver Distraction</description>
-		</param>
-	</function>
-
-
-</interface>
diff --git a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/v4_protocol_v2_0_revP.xml b/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/v4_protocol_v2_0_revP.xml
deleted file mode 100755
index 2f7fd7460..000000000
--- a/SDL_Core/src/components/JSONHandler/sdlinkObjGenerator/v4_protocol_v2_0_revP.xml
+++ /dev/null
@@ -1,3174 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<?xml-stylesheet type="text/xml" href="protocol2html.xsl"?>
-
-<interface name="Ford Sync RAPI" version="2.0O" date="2012-11-02">
-
-  <enum name="Result" internal_scope="base">
-    <element name="SUCCESS">
-      <description>The request succeeded</description>
-    </element>
-    <element name="INVALID_DATA">
-      <description>The data sent is invalid. For example</description>
-      <description>Invalid Json syntax</description>
-      <description>Parameters out of bounds (number or enum range)</description>
-      <description>Mandatory parameters not provided</description>
-      <description>Parameter provided with wrong type</description>
-      <description>Invalid characters</description>
-      <description>Empty string</description>
-    </element>
-    <element name="UNSUPPORTED_REQUEST">
-      <description>The request is not supported by Sync</description>
-    </element>
-    <element name="OUT_OF_MEMORY">
-      <description>The system could not process the request because the necessary memory couldn't be allocated</description>
-    </element>
-    <element name="TOO_MANY_PENDING_REQUESTS">
-      <description>There are too many requests pending (means, that the response has not been delivered, yet).</description>
-      <designdescription>There may be a maximum of 1000 pending requests at a time.</designdescription>
-    </element>
-    <element name="INVALID_ID">
-      <description>One of the provided IDs is not valid. For example</description>
-      <description>This applies to CorrelationID, SubscriptionID [@TODO if SubscriptionID is used], CommandID, MenuID, [@TODO: missed one?]</description>
-    </element>
-    <element name="DUPLICATE_NAME">
-      <description>There was a conflict with an registered name (application or menu item) or vr command</description>
-    </element>
-    <element name="TOO_MANY_APPLICATIONS">
-      <description>There are already too many registered applications</description>
-    </element>
-    <element name="APPLICATION_REGISTERED_ALREADY">
-      <description>RegisterApplication has been called again, after a RegisterApplication was successful before.</description>
-    </element>
-    <element name="UNSUPPORTED_VERSION">
-      <description>Sync doesn't support the protocol that is requested by the mobile application</description>
-    </element>
-    <element name="WRONG_LANGUAGE">
-      <description>The requested language is currently not supported.</description>
-      <description>Might be because of a mismatch of the currently active language on Sync and the requested language</description>
-    </element>
-    <element name="APPLICATION_NOT_REGISTERED">
-      <description>An command can not be executed because no application has been registered with RegisterApplication.</description>
-    </element>
-    <element name="IN_USE">
-      <description>The data may not be changed, because it is currently in use.</description>
-      <description>For example when trying to delete a command set that is currently involved in an interaction.</description>
-    </element>
-    <element name="SUBSCRIBED_ALREADY">
-      <description>The item to subscribe to is already subscribed to.</description>
-    </element>
-    <element name="VEHICLE_DATA_NOT_ALLOWED">
-      <description>The user has turned off access to vehicle data, and it is globally unavailable to mobile applications.</description>
-    </element>
-    <element name="VEHICLE_DATA_NOT_AVAILABLE">
-      <description>The requested vehicle data is not available on this vehicle or is not published.</description>
-    </element>
-    <element name="REJECTED">
-      <description>The requested command was rejected, e.g. because mobile app is in background and cannot perform any HMI commands.</description>
-      <description>Or an HMI command (e.g. Speak) is rejected because a higher priority HMI command (e.g. Alert) is playing.</description>
-    </element>
-    <element name="ABORTED">
-      <description>A command was aborted, for example due to user interaction (e.g. user pressed button).</description>
-      <description>Or an HMI command (e.g. Speak) is aborted because a higher priority HMI command (e.g. Alert) was requested.</description>
-    </element>
-    <element name="IGNORED">
-      <description>A command was ignored, because the intended result is already in effect.</description>
-      <description>For example, SetMediaClockTimer was used to pause the media clock although the clock is paused already.</description>
-      <description>NOTE: potentially replaces SUBSCRIBED_ALREADY</description>
-    </element>
-    <element name="UNSUPPORTED_BUTTON">
-      <description>A button that was requested for subscription is not supported under the current system.</description>
-      <description>NOTE: could become a more generic UNSUPPORTED_RESOURCE by merging with VEHIVLE_DATA_NOT_AVAILABLE.</description>
-    </element>
-    <element name="FILE_NOT_FOUND">
-      <description>A specified file could not be found on Sync.</description>
-    </element>
-    <element name="GENERIC_ERROR">
-      <description>Provided data is valid but something went wrong in the lower layers.</description>
-    </element>
-    <element name="DISALLOWED">
-      <description>RPC is not authorized in local policy table.</description>
-    </element>   
-    <element name="USER_DISALLOWED">
-      <description>RPC is included in a functional group explicitly blocked by the user.</description>
-    </element>
-    <element name="TIMED_OUT">
-      <description>Overlay reached the maximum timeout and closed.</description>
-    </element>
-    <element name="CANCEL_ROUTE">
-      <description>User selected to Cancel Route.</description>
-    </element>
-    <element name="CLOSED">
-      <description>User chose a Close command for the overlay.</description>
-    </element>
-    <element name="ENCRYPTED">
-      <description>The data is being returned through an OnEncodedSYNCPData notification.</description>
-      <description>The data is intended to be passed by the proxy to the designated server URL.</description>
-    </element> 
-    <element name="WARNINGS">
-      <description>The RPC (e.g. SubscribeVehicleData) executed successfully but one or more items have a warning or failure.</description>
-    </element>        
-  </enum>
-
-  <enum name="ButtonPressMode">
-    <element name="LONG">
-      <description>A button was released, after it was pressed for a long time</description>
-      <description>Actual timing is defined by Sync and may vary</description>
-    </element>
-    <element name="SHORT">
-      <description>A button was released, after it was pressed for a short time</description>
-      <description>Actual timing is defined by Sync and may vary</description>
-    </element>
-  </enum>
-
-  <enum name="ButtonEventMode">
-    <element name="BUTTONUP">
-      <description>A button has been released up</description>
-    </element>
-    <element name="BUTTONDOWN">
-      <description>A button has been pressed down</description>
-    </element>
-  </enum>
-
-  <enum name="Language">
-     <element name="EN-US" internal_name="EN_US">
-      <description>US English</description>
-    </element>
-    <element name="ES-MX" internal_name="ES_MX">
-      <description>Mexican Spanish</description>
-    </element>
-    <element name="FR-CA" internal_name="FR_CA">
-      <description>Canadian French</description>
-    </element>
-    <element name="DE-EU" internal_name="DE_EU">
-      <description>EU German</description>     
-    </element>
-     <element name="ES-EU" internal_name="ES_EU">
-      <description>EU Spanish</description>     
-    </element>
-    <element name="EN-EU" internal_name="EN_EU">
-      <description>UK English</description>     
-    </element>
-     <element name="RU-RU" internal_name="RU_RU">
-      <description>Russian</description>     
-    </element>
-     <element name="TR-TR" internal_name="TR_TR">
-      <description>Turkish</description>     
-    </element>
-     <element name="PL-EU" internal_name="PL_EU">
-      <description>EU Polish</description>     
-    </element>
-     <element name="FR-EU" internal_name="FR_EU">
-      <description>French</description>     
-    </element>
-     <element name="IT-EU" internal_name="IT_EU">
-      <description>Italian</description>     
-    </element>
-     <element name="SV-EU" internal_name="SV_EU">
-      <description>Swedish</description>     
-    </element>
-     <element name="PT-EU" internal_name="PT_EU">
-      <description>Portuguese</description>     
-    </element>
-     <element name="NL-EU" internal_name="NL_EU">
-      <description>Dutch (Standard)</description>     
-    </element>
-     <element name="EN-AU" internal_name="EN_AU">
-      <description>Australian English</description>     
-    </element>
-     <element name="ZH-CN" internal_name="ZH_CN">
-      <description>Chinese (Mandarin)</description>     
-    </element>
-     <element name="ZH-TW" internal_name="ZH_TW">
-      <description>Taiwanese (Mandarin)</description>     
-    </element>
-     <element name="JA-JP" internal_name="JA_JP">
-      <description>Japanese</description>     
-    </element>
-     <element name="AR" internal_name="AR">
-      <description>Arabic</description>     
-    </element>
-     <element name="KO-KR" internal_name="KO_KR">
-      <description>Korean</description>     
-    </element>
-</enum>
-
-  <enum name="UpdateMode">
-    <description>Describes how the media clock timer should behave on the platform</description>
-    <element name="COUNTUP" />
-    <description>Starts the media clock timer counting upwards, as in time elapsed.</description>
-    <element name="COUNTDOWN" />
-    <description>Starts the media clock timer counting downwards, as in time remaining.</description>
-    <element name="PAUSE" />
-    <description>Pauses the media clock timer</description>
-    <element name="RESUME" />
-    <description>Resume the media clock timer</description>
-    <element name="CLEAR" />
-    <description>Clears the media clock timer (previously done through Show->mediaClock)</description>   
-  </enum>
-
-  <enum name="TimerMode">
-    <element name="UP" />
-    <description>Causes the media clock timer to update from 0:00 to a specified time</description>
-    <element name="DOWN" />
-    <description>Causes the media clock timer to update from a specified time to 0:00</description>
-    <element name="NONE" />
-    <description>Indicates to not use the media clock timer</description>
-  </enum>
-
-  <enum name="InteractionMode">
-    <description>For application-requested interactions, this mode indicates the method in which the user is notified and uses the interaction.</description>
-    <element name="MANUAL_ONLY" />
-    <description>This mode causes the interaction to only occur on the display, meaning the choices are provided only via the display.</description>
-    <description>Selections are made with the OK and Seek Right and Left, Tune Up and Down buttons.</description>
-    <element name="VR_ONLY" />
-    <description>This mode causes the interaction to only occur using V4.</description>
-    <description>Selections are made by saying the command.</description>
-    <element name="BOTH" />
-    <description>This mode causes both a VR and display selection option for an interaction.</description>
-    <description>Selections can be made either from the menu display or by speaking the command.</description>
-  </enum>
-
-  <enum name="HMILevel">
-    <description>Enumeraction that describes current levels of HMI.</description>
-    <element name="FULL" internal_name="HMI_FULL" />
-    <element name="LIMITED" internal_name="HMI_LIMITED" />
-    <element name="BACKGROUND" internal_name="HMI_BACKGROUND" />
-    <element name="NONE" internal_name="HMI_NONE" />
-  </enum>
-
-  <enum name="AudioStreamingState">
-    <description>Enumeraction that describes possible states of audio streaming.</description>
-    <element name="AUDIBLE" />
-    <element name="ATTENUATED" />    
-    <element name="NOT_AUDIBLE" />
-  </enum>
-
-  <enum name="SystemAction">
-    <description>Enumeration that describes system actions that can be triggered.</description>
-    <element name="DEFAULT_ACTION">
-      <description>Default action occurs.  Standard behavior (e.g. SoftButton clears overlay).</description>
-    </element>
-    <element name="STEAL_FOCUS">
-      <description>App is brought into HMI_FULL.</description>
-    </element>
-    <element name="KEEP_CONTEXT">
-      <description>Current system context is maintained.  An overlay is persisted even though a SoftButton has been pressed and the notification sent.</description>
-    </element>
-  </enum>
-
-  <enum name="SystemContext">
-    <description>Enumeration that describes possible contexts an app's HMI might be in.</description>
-    <description>Communicated to whichever app is in HMI FULL, except Alert.</description>
-    <element name="MAIN" internal_name="SYSCTXT_MAIN">
-      <description>The app's persistent display (whether media/non-media/navigation) is fully visible onscreen.</description>
-    </element>
-    <element name="VRSESSION" internal_name="SYSCTXT_VRSESSION">
-      <description>The system is currently in a VR session (with whatever dedicated VR screen being overlaid onscreen).</description>
-    </element>
-    <element name="MENU" internal_name="SYSCTXT_MENU">
-      <description>The system is currently displaying a system or in-App menu onscreen.</description>
-    </element>
-    <element name="HMI_OBSCURED" internal_name="SYSCTXT_HMI_OBSCURED">
-      <description>The app's display HMI is currently being obscured by either a system or other app's overlay.</description>
-    </element>
-    <element name="ALERT" internal_name="SYSCTXT_ALERT">
-      <description>Broadcast only to whichever app has an alert currently being displayed.</description>
-    </element>
-  </enum>
-
-  <enum name="SoftButtonType">
-    <description>Contains information about the SoftButton capabilities.</description>
-    <element name="TEXT" internal_name="SBT_TEXT"/>
-    <element name="IMAGE" internal_name="SBT_IMAGE"/>
-    <element name="BOTH" internal_name="SBT_BOTH"/>
-  </enum>
-
-  <enum name="AppInterfaceUnregisteredReason">
-    <description>Error code, which comes from sync side.</description>
-    <element name="USER_EXIT" />
-    <element name="IGNITION_OFF" />
-    <element name="BLUETOOTH_OFF" />
-    <element name="USB_DISCONNECTED" />
-    <element name="REQUEST_WHILE_IN_NONE_HMI_LEVEL" />
-    <element name="TOO_MANY_REQUESTS" />
-    <element name="DRIVER_DISTRACTION_VIOLATION" />
-    <element name="LANGUAGE_CHANGE" />
-    <element name="MASTER_RESET" />
-    <element name="FACTORY_DEFAULTS" />
-    <element name="APP_UNAUTHORIZED" />    
-  </enum>
-
-  <enum name="TriggerSource">
-    <description>Indicates the source from where the command was triggered.</description>
-    <element name="MENU" internal_name="TS_MENU" />
-    <element name="VR" internal_name="TS_VR" />
-  </enum>
-
-  <enum name="HmiZoneCapabilities">
-    <description>Contains information about the HMI zone capabilities.</description>
-    <description>For future use.</description>
-    <element name="FRONT" />
-    <element name="BACK" />
-  </enum>
-
-  <enum name="SpeechCapabilities">
-    <description>Contains information about the TTS capabilities.</description>
-    <element name="TEXT" internal_name="SC_TEXT"/>
-    <element name="SAPI_PHONEMES" />
-    <element name="LHPLUS_PHONEMES" />
-    <element name="PRE_RECORDED" />
-    <element name="SILENCE" />
-  </enum>
-
-  <enum name="VrCapabilities">
-    <description>Contains information about the VR capabilities.</description>
-    <element name="TEXT" internal_name="VR_TEXT"/>
-  </enum>
-
-  <enum name="SamplingRate">
-    <description>Describes different sampling options for PerformAudioPassThru.</description>
-    <element name="8KHZ" />
-    <element name="16KHZ" />
-    <element name="22KHZ" />
-    <element name="44KHZ" />
-  </enum>
-
-  <enum name="AudioCaptureQuality">
-    <description>Describes different quality options for PerformAudioPassThru.</description>
-    <element name="8_BIT" />
-    <element name="16_BIT" />
-  </enum>
-
-  <enum name="AudioType">
-    <description>Describes different audio type options for PerformAudioPassThru.</description>
-    <element name="PCM" />
-<!-- TODO: remove?
-    <element name="MP3" />    
-    <element name="WAV" />
--->
-  </enum>
-
-  <enum name="VehicleDataType">
-    <description>Defines the data types that can be published and subscribed to.</description>
-    <element name="VEHICLEDATA_GPS">
-    	<description>Notifies GPSData</description>
-    	<description>may be subscribed</description>
-    </element>
-    <element name="VEHICLEDATA_SPEED" />
-    <element name="VEHICLEDATA_FUELLEVEL" />
-    <element name="VEHICLEDATA_FUELECONOMY" />
-    <element name="VEHICLEDATA_ENGINERPM" />
-    <element name="VEHICLEDATA_BATTVOLTS" />
-    <element name="VEHICLEDATA_RAINSENSOR">
-      <issue creator="rs">Cansignals not identified yet</issue>
-    </element>
-    <element name="VEHICLEDATA_ODOMETER" />
-    <element name="VEHICLEDATA_VIN" />
-    <element name="VEHICLEDATA_EXTERNTEMP" />
-    <element name="VEHICLEDATA_PRNDLSTATUS" />
-    <element name="VEHICLEDATA_TIREPRESSURE" />
-    <element name="VEHICLEDATA_BATTERYPACKVOLTAGE">
-    	<description>Battery pack voltage of hybrid and electrical vehicles</description>
-    </element>
-    <element name="VEHICLEDATA_BATTERYCURRENT">
-    	<description>Battery current of hybrid and electrical vehicles</description>
-    </element>
-    <element name="VEHICLEDATA_BATTERYTEMPERATURE">
-    	<description>Battery temperature of hybrid and electrical vehicles</description>
-    </element>
-    <element name="VEHICLEDATA_SATESN">
-    	<description>Satellite radio serial number (ESN)</description>
-    </element>
-
-  </enum>
-
-  <enum name="ButtonName">
-    <description>Defines the hard (physical) and soft (touchscreen) buttons available from SYNC</description>
-    <element name="OK" />
-    <element name="SEEKLEFT" />
-    <element name="SEEKRIGHT" />
-    <element name="TUNEUP" />
-    <element name="TUNEDOWN" />
-    <element name="PRESET_0" />
-    <element name="PRESET_1" />
-    <element name="PRESET_2" />
-    <element name="PRESET_3" />
-    <element name="PRESET_4" />
-    <element name="PRESET_5" />
-    <element name="PRESET_6" />
-    <element name="PRESET_7" />
-    <element name="PRESET_8" />
-    <element name="PRESET_9" />
-    <element name="CUSTOM_BUTTON" />
-  </enum>
-
-  <enum name="MediaClockFormat">
-    <element name="CLOCK1">
-      <description>minutesFieldWidth = 2;minutesFieldMax = 19;secondsFieldWidth = 2;secondsFieldMax = 99;maxHours = 19;maxMinutes = 59;maxSeconds = 59;</description>
-      <description>used for Type II and CID headunits</description>
-    </element>
-    <element name="CLOCK2">
-      <description>minutesFieldWidth = 3;minutesFieldMax = 199;secondsFieldWidth = 2;secondsFieldMax = 99;maxHours = 59;maxMinutes = 59;maxSeconds = 59;</description>
-	  <description>used for Type V headunit</description>
-    </element>
-    <element name="CLOCKTEXT1">
-      <description>5 characters possible</description>
-      <description>Format:      1|sp   c   :|sp   c   c</description>
-      <description>1|sp : digit "1" or space</description>
-      <description>c    : character out of following character set: sp|0-9|[letters, see TypeII column in XLS. See [@TODO: create file ref]]</description>
-      <description>:|sp : colon or space</description>
-	  <description>used for Type II headunit</description>
-    </element>
-    <element name="CLOCKTEXT2">
-      <description>5 chars possible</description>
-      <description>Format:      1|sp   c   :|sp   c   c</description>
-      <description>1|sp : digit "1" or space</description>
-      <description>c    : character out of following character set: sp|0-9|[letters, see CID column in XLS. See [@TODO: create file ref]]</description>
-      <description>:|sp : colon or space</description>
-	  <description>used for CID headunit</description>	  
-	  <description>NOTE: difference between CLOCKTEXT1 and CLOCKTEXT2 is the supported character set</description>	 	  
-    </element>	  
-    <element name="CLOCKTEXT3">
-      <description>6 chars possible</description>
-      <description>Format:      1|sp   c   c   :|sp   c   c</description>
-      <description>1|sp : digit "1" or space</description>
-      <description>c    : character out of following character set: sp|0-9|[letters, see Type 5 column in XLS]. See [@TODO: create file ref]</description>
-      <description>:|sp : colon or space</description>
-	  <description>used for Type V headunit</description>	  
-    </element>	
-	<issue creator="mf">First complete values draft. Review needed.</issue>
-  </enum>
-
-  <enum name="DisplayType">
-    <description>See DAES for further infos regarding the displays</description>
-    <element name="CID"/>
-    <element name="TYPE2" />
-    <element name="TYPE5" />
-    <element name="NGN" />
-    <element name="GEN2_8_DMA" />
-    <element name="GEN2_6_DMA" />
-    <element name="MFD3" />
-    <element name="MFD4" />
-    <element name="MFD5" />
-  </enum>
-
-  <enum name="TextFieldName">
-    <element name="mainField1">
-      <description>The first line of first set of main fields of the persistent display</description>
-      <description>Applies to "Show"</description>
-    </element>
-
-    <element name="mainField2">
-      <description>The second line of first set of main fields of the persistent display</description>
-      <description>Applies to "Show"</description>
-    </element>
-
-    <element name="mainField3">
-      <description>The first line of second set of main fields of persistent display</description>
-      <description>Applies to "Show"</description>
-    </element>
-
-    <element name="mainField4">
-      <description>The second line of second set of main fields of the persistent display</description>
-      <description>Applies to "Show"</description>
-    </element>
-
-    <element name="statusBar">
-      <description>The status bar on Nav</description>
-      <description>Applies to "Show"</description>
-    </element>
-
-    <element name="mediaClock">
-      <description>Text value for MediaClock field.</description>
-      <description>Applies to "Show"</description>
-    </element>
-
-    <element name="mediaTrack">
-      <description>The track field of NGN type ACMs.</description>
-      <description>This field is only available for media applications.</description>
-      <description>Applies to "Show"</description>
-    </element>
-
-    <element name="alertText1">
-      <description>The first line of the alert text field</description>
-      <description>Applies to "Alert"</description>
-    </element>
-
-    <element name="alertText2">
-      <description>The second line of the alert text field</description>
-      <description>Applies to "Alert"</description>
-    </element>
-
-    <element name="alertText3">
-      <description>The third line of the alert text field</description>
-      <description>Applies to "Alert"</description>
-    </element>
-
-    <element name="scrollableMessageBody">
-      <description> Long form body of text that can include newlines and tabs.</description>
-      <description>Applies to "ScrollableMessage"</description>
-    </element>
-
-    <element name="initialInteractionText">
-      <description> First line suggestion for a user response (in the case of VR enabled interaction</description>
-    </element>
-
-    <element name="navigationText1">
-      <description> First line of navigation text</description>
-    </element>
-
-    <element name="navigationText2">
-      <description> Second line of navigation text</description>
-    </element>
-
-    <element name="ETA">
-      <description> Estimated Time of Arrival time for navigation</description>
-    </element>
-
-    <element name="totalDistance">
-      <description> Total distance to destination for navigation</description>
-    </element>
-
-    <element name="audioPassThruDisplayText1">
-      <description> First line of text for audio pass thru</description>
-    </element>
-
-    <element name="audioPassThruDisplayText2">
-      <description> Second line of text for audio pass thru</description>
-    </element>
-    
-    <element name="sliderHeader">
-      <description> Header text for slider</description>
-    </element>
-
-    <element name="sliderFooter">
-      <description> Footer text for slider</description>
-    </element>
-
-  </enum>
-
-  <enum name="CharacterSet">
-    <description>The list of potential character sets</description>
-    <element name="TYPE2SET">
-      <description>See [@TODO: create file ref]</description>
-    </element>
-    <element name="TYPE5SET">
-      <description>See [@TODO: create file ref]</description>
-    </element>
-    <element name="CID1SET">
-      <description>See [@TODO: create file ref]</description>
-    </element>
-    <element name="CID2SET">
-      <description>See [@TODO: create file ref]</description>
-    </element>
-	<issue creator="rs">Real sets have not been defined yet?</issue>
-  </enum>
-
-  <enum name="TextAlignment">
-    <description>The list of possible alignments, left, right, or centered</description>
-    <element name="LEFT_ALIGNED" />
-    <element name="RIGHT_ALIGNED" />
-    <element name="CENTERED" />
-  </enum>   
-
-  <enum name="TBTState">
-    <description>Enumeration that describes possible states of turn-by-turn client or SmartDeviceLink app.</description>
-    <element name="ROUTE_UPDATE_REQUEST" />
-    <element name="ROUTE_ACCEPTED" />
-    <element name="ROUTE_REFUSED" />
-    <element name="ROUTE_CANCELLED" />
-    <element name="ETA_REQUEST" />
-    <element name="NEXT_TURN_REQUEST" />
-    <element name="ROUTE_STATUS_REQUEST" />
-    <element name="ROUTE_SUMMARY_REQUEST" />
-    <element name="TRIP_STATUS_REQUEST" />
-    <element name="ROUTE_UPDATE_REQUEST_TIMEOUT" />
-  </enum>
-
-  <enum name="DriverDistractionState">
-    <description>Enumeration that describes possible states of driver distraction.</description>
-    	<element name="DD_ON" />
-	<element name="DD_OFF" />
-  </enum>
-
-<!-- TODO: REMOVE  
-  <enum name="DataType">
-    <description>Contains information about the type of data.</description>
-    <element name="HEX" />
-    <element name="BINARY" />
-  </enum>
--->
-  
-  <enum name="ImageType">
-    <description>Contains information about the type of image.</description>
-    <element name="STATIC" />
-    <element name="DYNAMIC" />
-  </enum>
- 
- <struct name="Image">
-    <param name="value" maxlength="65535" type="String">
-      <description>Either the static hex icon value or the binary image file name identifier (sent by PutFile).</description>
-    </param>
-    <param name="imageType" type="ImageType">
-      <description>Describes, whether it is a static or dynamic image.</description>
-    </param>
- </struct> 
-  
- <struct name="SoftButton">
-    <param name="type" type="SoftButtonType">
-      <description>Describes, whether it is text, highlighted text, icon, or dynamic image. See softButtonType</description>
-    </param>
-    <param name="text" maxlength="500" type="String" mandatory="false">
-      <description>Optional text to display (if defined as TEXT or BOTH)</description>
-    </param>
-    <param name="image" type="Image" mandatory="false">
-      <description>Optional image struct for SoftButton (if defined as IMAGE or BOTH)</description>
-    </param>
-    <param name="isHighlighted" type="Boolean">
-    	<description>True, if highlighted</description>
-    	<description>False, if not highlighted</description>
-    </param>
-    <param name="softButtonID" type="Integer" minvalue="0" maxvalue="65536">
-      <description>Value which is returned via OnButtonPress / OnButtonEvent</description>
-    </param>
-    <param name="systemAction" type="SystemAction">
-      <description>Parameter indicating whether selecting a SoftButton shall call a specific system action.  This is intended to allow Notifications to bring the callee into full / focus; or in the case of persistent overlays, the overlay can persist when a SoftButton is pressed.</description>
-    </param>   
- </struct> 
- 
-  <struct name="Choice">
-    <description>A choice is an option given to the user, which can be selected either by menu, or through voice recognition system.</description>
-    <param name="choiceID" type="Integer" minvalue="0" maxvalue="65535" />
-    <param name="menuName" type="String" maxlength="500" />
-    <param name="vrCommands" type="String" minsize="1" maxsize="100" maxlength="99" array="true" />
-    <param name="image" type="Image"/>
-  </struct>
-
-  <struct name="VrHelpItem">
-    <param name="text" maxlength="500" type="String">
-      <description>Text to display for VR Help item</description>
-    </param>
-    <param name="image" type="Image">
-      <description>Image struct for VR Help item</description>
-    </param>
-    <param name="position" type="Integer" minvalue="1" maxvalue="8"> 
-      <description>Position to display item in VR Help list</description>
-      
-    </param>
-  </struct> 
-
-  <struct name="SyncMsgVersion">
-    <description>Specifies the version number of the SYNC V4 protocol, that is supported by the mobile application</description>
-
-    <param name="majorVersion" type="Integer" minvalue="1" maxvalue="10">
-      <description>The major version indicates versions that is not-compatible to previous versions.</description>
-    </param>
-    <param name="minorVersion" type="Integer" minvalue="0" maxvalue="1000">
-      <description>The minor version indicates a change to a previous version that should still allow to be run on an older version (with limited functionality)</description>
-    </param>
-  </struct>
-
-  <enum name="GlobalProperty">
-    <description>The different global properties.</description>
-    <element name="HELPPROMPT">
-    	<description>The property helpPrompt of setGlobalProperties</description>
-    </element>
-    <element name="TIMEOUTPROMPT">
-    	<description>The property timeoutPrompt of setGlobalProperties</description>
-    </element>
-    <element name="VRHELPTITLE">
-    	<description>The property vrHelpTitle of setGlobalProperties</description>
-    </element>
-    <element name="VRHELPITEMS">
-    	<description>The property array of vrHelp of setGlobalProperties</description>
-    </element> 
-  </enum>
-
-  <enum name="CompassDirection">
-    <description>The list of potential compass directions</description>
-    <element name="NORTH">
-    </element>
-    <element name="NORTHWEST">
-    </element>
-    <element name="WEST">
-    </element>
-    <element name="SOUTHWEST">
-    </element>
-    <element name="SOUTH">
-    </element>
-    <element name="SOUTHEAST">
-    </element>
-    <element name="EAST">
-    </element>
-    <element name="NORTHEAST">
-    </element>
-  </enum>
-
-  <enum name="Dimension">
-    <description>The supported dimensions of the GPS</description>
-    <element name="NO_FIX">
-    	<description>No GPS at all</description>
-    </element>
-    <element name="2D">
-    	<description>Longitude and lattitude</description>
-    </element>
-    <element name="3D">
-    	<description>Longitude and lattitude and altitude</description>
-    </element>
-  </enum>
-  
-  <enum name="PRNDL">
-    <description>The selected gear.</description>
-    <element name="PARK">
-    	<description>Parking</description>
-    </element>
-    <element name="REVERSE">
-    	<description>Reverse gear</description>
-    </element>
-    <element name="NEUTRAL">
-    	<description>No gear</description>
-    </element>
-    <element name="LOWGEAR">
-    	<description>1st gear hold</description>
-    </element>
-    <element name="FORWARD_DRIVE_2">
-    </element>
-    <element name="FORWARD_DRIVE_3">
-    </element>
-    <element name="FORWARD_DRIVE_4">
-    	<description>Or Overdrive</description>
-    </element>
-    <element name="FORWARD_DRIVE_5">
-    	<description>Or Overdrive</description>
-    </element>
-    <element name="FORWARD_DRIVE_6">
-    	<description>Or Overdrive</description>
-    </element>
-    <element name="SECOND_GEAR_HOLD">
-    </element>
-    <element name="THIRD_GEAR_HOLD">
-    </element>
-    <element name="FOURTH_GEAR_HOLD">
-    </element>
-    <element name="FIFTH_GEAR_HOLD">
-    </element>
-    <element name="SIXTH_GEAR_HOLD">
-    </element>
-  </enum>
-
-  <enum name="SingleTirePressureStatus">
-    <description>The pressure status of a tire.</description>
-    <element name="UNKNOWN">
-    </element>
-    <element name="NORMAL">
-    </element>
-    <element name="LOW">
-    </element>
-    <element name="FAULT">
-    </element>
-    <element name="NOT_SUPPORTED">
-    </element>
-  </enum>
-  
-  <struct name="SingleTireStatus">
-    <param name="status" type="SingleTirePressureStatus">
-      <description>See SingleTirePressureStatus.</description>
-	</param>    
-    <param name="pressure" type="Integer" minvalue="0" maxvalue="255">
-      <description>The tire pressure in PSI.</description>
-	</param>    
-  </struct>
-
-  <enum name="TirePressureTellTale">
-    <description>Reflects the status of the cluster instrument warning light.</description>
-    <element name="OFF">
-    </element>
-    <element name="ON">
-    </element>
-    <element name="FLASH">
-    </element>
-  </enum>
-
-  <enum name="VehicleDataResultCode">
-    <description>Enumeration that describes possible result codes of a vehicle data entry request.</description>
-    <element name="SUCCESS" internal_name="VDRC_SUCCESS"/>
-    <element name="DISALLOWED" internal_name="VDRC_DISALLOWED"/>
-    <element name="USER_DISALLOWED" internal_name="VDRC_USER_DISALLOWED"/>
-    <element name="INVALID_ID" internal_name="VDRC_INVALID_ID"/>
-    <element name="VEHICLE_DATA_NOT_AVAILABLE" internal_name="VDRC_DATA_NOT_AVAILABLE"/>
-    <element name="DATA_ALREADY_SUBSCRIBED" internal_name="VDRC_DATA_ALREADY_SUBSCRIBED"/>
-    <element name="DATA_NOT_SUBSCRIBED" internal_name="VDRC_DATA_NOT_SUBSCRIBED"/>
-    <element name="IGNORED" internal_name="VDRC_IGNORED"/>    
-  </enum>
-
-  <struct name="TireStatus">
-      <description>The status and pressure of the tires.</description>
-
-    <param name="pressureTellTale" type="TirePressureTellTale">
-      <description>See TirePressureTellTale.</description>
-	</param>    
-    <param name="leftFront" type="SingleTireStatus">
-      <description>The status of the left front tire.</description>
-	</param>    
-    <param name="rightFront" type="SingleTireStatus">
-      <description>The status of the right front tire.</description>
-	</param>    
-    <param name="leftRear" type="SingleTireStatus">
-      <description>The status of the left rear tire.</description>
-	</param>    
-    <param name="rightRear" type="SingleTireStatus">
-      <description>The status of the right rear tire.</description>
-	</param>    
-    <param name="innerLeftRear" type="SingleTireStatus">
-      <description>The status of the inner left rear.</description>
-	</param>    
-    <param name="innerRightRear" type="SingleTireStatus">
-      <description>The status of the inner right rear.</description>
-	</param>    
-  </struct>
-  
-  <struct name="GPSData">
-    <description>Struct with the GPS data.</description>
-	<issue creator="rs">Ford to define, which values are really needed. For efficiency it might make sense to support a basic and extended data type</issue>
-	<param name="longitudeDegrees" type="Integer" minvalue="-1000000000" maxvalue="1000000000">
-		<issue creator="rs">Format needs to be defined explicitely.</issue>
-    </param>
-    <param name="latitudeDegrees" type="Integer" minvalue="-1000000000" maxvalue="1000000000">
-		<issue creator="rs">Format needs to be defined explicitely.</issue>
-    </param>
-    <param name="utcYear" type="Integer" minvalue="2010" maxvalue="2100">
-    	<description>The current UTC year.</description>
-    </param>
-    <param name="utcMonth" type="Integer" minvalue="1" maxvalue="12">
-    	<description>The current UTC month.</description>
-    </param>
-    <param name="utcDay" type="Integer" minvalue="1" maxvalue="31">
-    	<description>The current UTC day.</description>
-    </param>
-    <param name="utcHours" type="Integer" minvalue="0" maxvalue="23">
-    	<description>The current UTC hour.</description>
-    </param>
-    <param name="utcMinutes" type="Integer" minvalue="0" maxvalue="59">
-    	<description>The current UTC minute.</description>
-    </param>
-    <param name="utcSeconds" type="Integer" minvalue="0" maxvalue="59">
-    	<description>The current UTC second.</description>
-    </param>
-    <param name="compassDirection" type="CompassDirection">
-    	<description>See CompassDirection.</description>
-    </param>
-    <param name="pdop" type="Integer" minvalue="0" maxvalue="31">
-    	<description>PDOP.</description>
-    </param>
-    <param name="hdop" type="Integer" minvalue="0" maxvalue="31">
-    	<description>HDOP.</description>
-    </param>
-    <param name="vdop" type="Integer" minvalue="0" maxvalue="31">
-    	<description>VDOP.</description>
-    </param>
-    <param name="actual" type="Boolean">
-    	<description>True, if actual.</description>
-    	<description>False, if infered.</description>
-    </param>
-    <param name="satellites" type="Integer" minvalue="0" maxvalue="31">
-    	<description>Number of satellites in view</description>
-    </param>
-    <param name="dimension" type="Dimension">
-    	<description>See Dimension</description>
-    </param>
-    <param name="altitude" type="Integer" minvalue="-10000" maxvalue="10000">
-    	<description>Altitude in meters</description>
-    </param>
-    <param name="heading" type="Integer" minvalue="0" maxvalue="360">
-    	<description>The heading. North is 0</description>
-    </param>
-    <param name="speed" type="Integer" minvalue="0" maxvalue="400">
-    	<description>The speed in KPH</description>
-    </param>
-  </struct>
-   
-  <struct name="VehicleDataResult">
-    <description>Individual published data request result</description>
-    <param name="dataType" type="VehicleDataType">
-      <description>Defined published data element type.</description>
-    </param>
-    <param name="resultCode" type="VehicleDataResultCode">
-      <description>Published data result code.</description>
-    </param>
-  </struct>
-    
-  <struct name="StartTime">
-    <param name="hours" type="Integer" minvalue="0" maxvalue="59">
-    	<description>The hour of the media clock.</description>
-    	<description>Some radios only support a max of 19 hours. If out of range, it will be rejected.</description>
-   	</param>
-    <param name="minutes" type="Integer" minvalue="0" maxvalue="59" />
-    <param name="seconds" type="Integer" minvalue="0" maxvalue="59" />
-  </struct>
-
-  <struct name="TextField">
-    <param name="name" type="TextFieldName">
-      <description>The name that identifies the field. See TextFieldName.</description>
-    </param>
-    <param name="characterSet" type="CharacterSet">
-      <description>The character set that is supported in this field. See CharacterSet.</description>
-    </param>
-    <param name="width" type="Integer" minvalue="1" maxvalue="500">
-      <description>The number of characters in one row of this field.</description>
-    </param>
-    <param name="rows" type="Integer" minvalue="1" maxvalue="3">
-      <description>The number of rows of this field.</description>
-    </param>
-  </struct>
-
-  <enum name="PermissionStatus">
-    <description>Enumeration that describes possible permission states of a policy table entry.</description>
-    <element name="ALLOWED" internal_name="PS_ALLOWED"/>
-    <element name="DISALLOWED" internal_name="PS_DISALLOWED"/>
-    <element name="USER_DISALLOWED" internal_name="PS_USER_DISALLOWED"/>
-    <element name="USER_CONSENT_PENDING" internal_name="PS_USER_CONSENT_PENDING"/>
-  </enum>
-
-  <struct name="HMIPermissions">
-    <param name="allowed" type="HMILevel" minsize="0" maxsize="100" array="true">
-      <description>A set of all HMI levels that are permitted for this given RPC.</description>
-    </param>
-    <param name="userDisallowed" type="HMILevel" minsize="0" maxsize="100" array="true">
-      <description>A set of all HMI levels that are prohibited for this given RPC.</description>
-    </param>
-  </struct>
-
-  <struct name="ParameterPermissions">
-    <param name="allowed" type="String" minsize="0" maxsize="100" maxlength = "100" array="true">
-      <description>A set of all parameters that are permitted for this given RPC.</description>
-    </param>
-    <param name="userDisallowed" type="String" minsize="0" maxsize="100" array="true">
-      <description>A set of all parameters that are prohibited for this given RPC.</description>
-    </param>
-  </struct>
-
-  <struct name="PermissionItem">
-    <param name="rpcName" type="String" maxlength="100">
-    	<description>Name of the individual RPC in the policy table.</description>
-   	</param>
-    <param name="hmiPermissions" type="HMIPermissions" />
-    <param name="parameterPermissions" type="ParameterPermissions" />
-  </struct>
-
-  <struct name="DisplayCapabilities">
-    <description>Contains information about the display capabilities.</description>
-    <param name="displayType" type="DisplayType">
-      <description>The type of the display. See DisplayType</description>
-    </param>
-    <param name="textFields" type="TextField" minsize="1" maxsize="100" array="true">
-      <description>A set of all fields that support text data. See TextField</description>
-    </param>
-    <param name="mediaClockFormats" type="MediaClockFormat" minsize="1" maxsize="100" array="true">
-      <description>A set of all supported formats of the media clock. See MediaClockFormat</description>
-    </param>
-  </struct>
-
-  <struct name="ButtonCapabilities">
-    <description>Contains information about a button's capabilities.</description>
-    <param name="name" type="ButtonName">
-      <description>The name of the button. See ButtonName.</description>
-    </param>
-    <param name="shortPressAvailable" type="Boolean">
-      <description>The button supports a short press.</description>
-      <description>Whenever the button is pressed short, onButtonPressed( SHORT) will be invoked.</description>
-    </param>
-    <param name="longPressAvailable" type="Boolean">
-      <description>The button supports a LONG press.</description>
-      <description>Whenever the button is pressed long, onButtonPressed( LONG) will be invoked.</description>
-    </param>
-    <param name="upDownAvailable" type="Boolean">
-      <description>The button supports "button down" and "button up".</description>
-      <description>Whenever the button is pressed, onButtonEvent( DOWN) will be invoked.</description>
-      <description>Whenever the button is released, onButtonEvent( UP) will be invoked.</description>
-    </param>
-  </struct>
-
-  <struct name="SoftButtonCapabilities">
-    <description>Contains information about a SoftButton's capabilities.</description>
-    <param name="shortPressAvailable" type="Boolean">
-      <description>The button supports a short press.</description>
-      <description>Whenever the button is pressed short, onButtonPressed( SHORT) will be invoked.</description>
-    </param>
-    <param name="longPressAvailable" type="Boolean">
-      <description>The button supports a LONG press.</description>
-      <description>Whenever the button is pressed long, onButtonPressed( LONG) will be invoked.</description>
-    </param>
-    <param name="upDownAvailable" type="Boolean">
-      <description>The button supports "button down" and "button up".</description>
-      <description>Whenever the button is pressed, onButtonEvent( DOWN) will be invoked.</description>
-      <description>Whenever the button is released, onButtonEvent( UP) will be invoked.</description>
-    </param>
-    <param name="imageSupported" type="Boolean">
-      <description>The button supports referencing a static or dynamic image.</description>
-    </param>   
-  </struct>
-
-  <struct name="PresetBankCapabilities">
-    <description>Contains information about on-screen preset capabilities.</description>
-    <param name="onScreenPresetsAvailable" type="Boolean">
-      <description>Onscreen custom presets are available.</description>
-    </param>
-  </struct>
-
-<!-- TODO: REMOVE
-  <enum name="DisplayLayout">
-    <description>Dynamic enumeration that contains predefined alternate screen layouts as well as app-defined layouts.</description>
-	<issue creator="sb">Can an enumeration be dynamically changed (custom elements added by an app at runtime?)</issue>
-    <element name="ONSCREEN_PRESETS">
-      <description>Custom screen containing app-defined onscreen presets.  Currently defined for GEN2.</description>
-    </element>
-  </enum>
--->
-
-  <struct name="MenuParams">
-    <param name="parentID" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="false">
-      <description>unique ID of the sub menu, the command will be added to.</description>
-      <description>If not provided, it will be provided to the top level of the in application menu.</description>
-    </param>
-
-    <param name="position" type="Integer" minvalue="0" maxvalue="1000" mandatory="false">
-      <description>Position within the items that are are at top level of the in application menu.</description>
-      <description>0 will insert at the front.</description>
-      <description>1 will insert at the second position.</description>
-      <description>if position is greater or equal than the number of items on top level, the sub menu will be appended to the end.</description>
-      <description>If this param was omitted the entry will be added at the end.</description>
-    </param>
-
-    <param name="menuName" type="String" maxlength="500">
-      <description>Text to show in the menu for this sub menu.</description>
-    </param>
-  </struct>
-
-  <struct name="TTSChunk">
-    <description>A TTS chunk, that consists of the text/phonemes to speak and the type (like text or SAPI)</description>
-    <param name="text" maxlength="500" type="String">
-      <description>The text or phonemes to speak.</description>
-      <description>May not be empty.</description>
-    </param>
-    <param name="type" type="SpeechCapabilities">
-      <description>Describes, whether it is text or a specific phoneme set. See SpeechCapabilities</description>
-    </param>
-  </struct> 
-
-  <struct name="DTC">
-    <param name="identifier" type="String" maxlength="500">
-      <description>String containing hexadecimal identifier as well as other common names.</description>
-    </param>
-    <param name="statusByte" type="String" maxlength="500">
-      <description>Hexadecimal byte string.</description>
-    </param>
-  </struct>
-
-  <struct name="Turn">
-    <param name="navigationText" type="String" maxlength="500" mandatory="false">
-    </param>
-    <param name="turnIcon" type="Image">
-    </param>
-  </struct>
-
-  <struct name="VehicleType">
-    <param name="make" type="String" maxlength="500" mandatory="false">
-      <description>Make of the vehicle</description>
-      <description>e.g. Ford</description>
-    </param>
-    <param name="model" type="String" maxlength="500" mandatory="false">
-      <description>Model of the vehicle</description>
-      <description>e.g. Fiesta</description>
-    </param>
-    <param name="modelYear" type="String" maxlength="500" mandatory="false">
-      <description>Model Year of the vehicle</description>
-      <description>e.g. 2013</description>
-    </param>
-    <param name="trim" type="String" maxlength="500" mandatory="false">
-      <description>Trim of the vehicle</description>
-      <description>e.g. SE</description>
-    </param>
-    
-  </struct>
-  
-  <enum name="FileType">
-    <description>Enumeration listing possible file types.</description>
-    <element name="GRAPHIC_BMP" />   
-    <element name="GRAPHIC_JPEG" />   
-    <element name="GRAPHIC_PNG" />
-    <element name="AUDIO_WAVE" />   
-    <element name="AUDIO_MP3" />
-  </enum>
-
-  <enum name="AppType">
-    <description>Enumeration listing possible app types.</description>
-    <element name="DEFAULT" />   
-    <element name="COMMUNICATION" />   
-    <element name="MEDIA" />
-    <element name="MESSAGING" />   
-    <element name="NAVIGATION" />
-    <element name="INFORMATION" />
-    <element name="SOCIAL" />
-    <element name="BACKGROUND_PROCESS" />
-    <element name="TESTING" />
-    <element name="SYSTEM" />
-  </enum>
-  
-  <enum name="FunctionID">
-    <description>Enumeration linking function names with function IDs in WiPro protocol.</description>
-    <description>Assumes enumeration starts at value 0.</description>
-    <element name="RESERVED" value="0" />
-    <element name="RegisterAppInterfaceID" value="1" />
-    <element name="UnregisterAppInterfaceID" value="2" />    
-    <element name="SetGlobalPropertiesID" value="3" />
-    <element name="ResetGlobalPropertiesID" value="4" />
-    <element name="AddCommandID" value="5" />
-    <element name="DeleteCommandID" value="6" />
-    <element name="AddSubMenuID" value="7" />
-    <element name="DeleteSubMenuID" value="8" />
-    <element name="CreateInteractionChoiceSetID" value="9" />
-    <element name="PerformInteractionID" value="10" />
-    <element name="DeleteInteractionChoiceSetID" value="11" />
-    <element name="AlertID" value="12" />
-    <element name="ShowID" value="13" />
-    <element name="SpeakID" value="14" />
-    <element name="SetMediaClockTimerID" value="15" />
-    <element name="EncodedSyncPDataID" value="16" />
-    <element name="DialNumberID" value="17" />
-    <element name="PerformAudioPassThruID" value="18" />
-    <element name="EndAudioPassThruID" value="19" />
-    <element name="SubscribeButtonID" value="20" />
-    <element name="UnsubscribeButtonID" value="21" />
-    <element name="SubscribeVehicleDataID" value="22" />
-    <element name="UnsubscribeVehicleDataID" value="23" />
-    <element name="GetVehicleDataID" value="24" />
-    <element name="ReadDIDID" value="25" />
-    <element name="GetDTCsID" value="26" />
-    <element name="ScrollableMessageID" value="27" />
-    <element name="SliderID" value="28" />
-    <element name="ShowConstantTBTID" value="29" />
-    <element name="AlertManeuverID" value="30" />
-    <element name="UpdateTurnListID" value="31" />
-    <element name="ChangeRegistrationID" value="32" />
-    <element name="GenericResponseID" value="33" />
-    <element name="PutFileID" value="34" />
-    <element name="DeleteFileID" value="35" />
-    <element name="ListFilesID" value="36" />
-    <element name="SetAppIconID" value="37" />
-    <element name="SetDisplayLayoutID" value="38" />
-    <element name="OnHMIStatusID" value="39" />
-    <element name="OnAppInterfaceUnregisteredID" value="40" />
-    <element name="OnButtonEventID" value="41" />
-    <element name="OnButtonPressID" value="42" />
-    <element name="OnVehicleDataID" value="43" />
-    <element name="OnCommandID" value="44" />
-    <element name="OnEncodedSyncPDataID" value="45" />
-    <element name="OnTBTClientStateID" value="46" />
-    <element name="OnDriverDistractionID" value="47" />
-    <element name="OnPermissionsChangeID" value="48" />
-    <element name="OnAudioPassThruID" value="49" />
-    <element name="OnLanguageChangeID" value="50" />
-  </enum>
-  
-  <enum name="messageType">
-    <description>Enumeration linking message types with function types in WiPro protocol.</description>
-    <description>Assumes enumeration starts at value 0.</description>
-    <element name="request" value="0" />
-    <element name="response" value="1" />
-    <element name="notification" value="2" />    
-  </enum>
-  
-  <!-- Requests/Responses -->
-  
-  <function name="RegisterAppInterface" functionID="RegisterAppInterfaceID" messagetype="request">
-    <description>Establishes an interface with a mobile application.</description>
-    <description>Before registerAppInterface no other commands will be accepted/executed.</description>
-    <param name="syncMsgVersion" type="SyncMsgVersion">
-      <description>See SyncMsgVersion</description>
-    </param>
-    <param name="appName" type="String" maxlength="100">
-      <description>The mobile application name, e.g. "Ford Drive Green".</description>
-      <description>Needs to be unique over all applications.</description>
-      <description>May not be empty.</description>
-      <description>May not start with a new line character.</description>
-      <description>May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)</description>
-      <description>Needs to be unique over all applications. Applications with the same name will be rejected.</description>
-      <description>Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.</description>
-    </param>
-    
-    <param name="ttsName" type="TTSChunk" minsize="1" maxsize="100" array="true" mandatory="false" >
-      <description>TTS string for VR recognition of the mobile application name, e.g. "Ford Drive Green".</description>
-      <description>Meant to overcome any failing on speech engine in properly pronouncing / understanding app name.</description>
-      <description>Needs to be unique over all applications.</description>
-      <description>May not be empty.</description>
-      <description>May not start with a new line character.</description>
-      <description>May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)</description>
-      <description>Needs to be unique over all applications. Applications with the same name will be rejected.</description>
-      <description>Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.</description>
-    </param>
-    
-    <param name="ngnMediaScreenAppName" type="String" maxlength="100" mandatory="false">
-      <description>Provides an abbreviated version of the app name (if needed), that will be displayed on the NGN media screen.</description>
-      <description>If not provided, the appName is used instead (and will be truncated if too long)</description>
-      <description>Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.</description>
-    </param>
-  
-    <param name="vrSynonyms" type="String" maxlength="40" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>Defines an additional voice recognition command.</description>
-      <description>May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)</description>
-      <description>Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.</description>
-    </param>
-<!-- deprecating    
-    <param name="usesVehicleData" type="Boolean" defvalue="false" mandatory="false">
-      <description>If not provided, the default is equal to False"</description>
-      <description>Indicates if the mobile application wants to use vehicle data like GPS or speed.</description>
-    </param>
--->    
-    <param name="isMediaApplication" type="Boolean">
-      <description>Indicates if the application is a media or a non-media application.</description>
-      <description>Only media applications will be able to stream audio to Sync that is audible outside of the BT media source.</description>
-    </param>
-    <param name="languageDesired" type="Language" mandatory="true">
-      <description>See Language</description>
-      <description>Current app’s expected VR+TTS language</description>
-      <description>If there is a mismatch with SYNC, the app will be able to change this registration with changeRegistration prior to app being brought into focus.</description>
-    </param>
-    <param name="hmiDisplayLanguageDesired" type="Language" mandatory="true">
-      <description>See Language</description>
-      <description>Current app’s expected display language</description>
-      <description>If there is a mismatch with SYNC, the app will be able to change this registration with changeRegistration prior to app being brought into focus.</description>
-    </param>
-<!-- deprecating        
-    <param name="autoActivateID" type="String" maxlength="16" mandatory="false">
-      <description>Used to support auto activation after an initial successful registerAppInterface (for example after an ignition cycle).</description>
-      <description>The app should always provide the id that was provided by the most recent registerAppInterface response.</description>
-      <description>If this is the first call to registerAppInterface, then do not provide this parameter at all.</description>
-      <description>If not provided or not matching with the id of the last registerAppInterface response, the app will not be automatically put into foreground on startup.</description>
-    </param>
--->
-    <param name="appType" type="AppType" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>See AppType</description>
-      <description>List of all applicable app types stating which classifications to be given to the app.</description>
-      <description>e.g. for platforms like GEN2, this will determine which "corner(s)" the app can populate.</description>
-    </param>    
-    <param name="appID" type="String" maxlength="100" mandatory="true">
-      <description>ID used to validate app with policy table entries</description>
-    </param>
-  </function>
-  
-  <function name="RegisterAppInterface" functionID="RegisterAppInterfaceID" messagetype="response">
-    <description>The response to registerAppInterface</description>
-
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-    
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="GENERIC_ERROR"/>
-      <element name="DUPLICATE_NAME"/>
-      <element name="TOO_MANY_APPLICATIONS"/>
-      <element name="APPLICATION_REGISTERED_ALREADY"/>
-      <element name="UNSUPPORTED_VERSION"/>
-      <element name="WRONG_LANGUAGE"/>
-      <element name="DISALLOWED"/>   
-    </param>
-
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-    
-    <param name="syncMsgVersion" type="SyncMsgVersion" mandatory="false">
-      <description>See SyncMsgVersion</description>
-    </param>
-
-<!-- deprecating        
-    <param name="autoActivateID" type="String" maxlength="16" mandatory="false">
-      <description>Provides an id that the app may use on a subsequent registerAppInterface to allow for auto activation (for example after an ignition cycle).</description>
-    </param>
--->
-    
-    <param name="language" type="Language" mandatory="false">
-      <description>The currently active VR+TTS language on Sync. See "Language" for options.</description>
-    </param>
-
-    <param name="hmiDisplayLanguage" type="Language" mandatory="false">
-    <description>The currently active display language on Sync. See "Language" for       options.</description>
-    </param>
-
-    <param name="displayCapabilities" type="DisplayCapabilities" mandatory="false">
-      <description>See DisplayCapabilities</description>
-    </param>
-
-    <param name="buttonCapabilities" type="ButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>See ButtonCapabilities</description >
-    </param>
-
-    <param name="softButtonCapabilities" type="SoftButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>If returned, the platform supports on-screen SoftButtons.</description>
-      <description>See SoftButtonCapabilities</description >
-    </param>
-
-    <param name="presetBankCapabilities" type="PresetBankCapabilities" mandatory="false">
-      <description>If returned, the platform supports custom on-screen Presets.</description>
-      <description>See PresetBankCapabilities</description >
-    </param>
-
-    <param name="hmiZoneCapabilities" type="HmiZoneCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
-		<issue creator="rs">If not used yet => remove</issue>
-      <description>See HmiZoneCapabilities</description>
-    </param>
-
-    <param name="speechCapabilities" type="SpeechCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>See SpeechCapabilities</description>
-    </param>
-
-    <param name="vrCapabilities" type="VrCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>See VrCapabilities</description>
-    </param>
-
-    <param name="vehicleType" type="VehicleType" mandatory="false">
-      <description>Specifies the vehicle's type. See VehicleType.</description>
-    </param>
-       
-  </function>
-  
-  <function name="UnregisterAppInterface" functionID="UnregisterAppInterfaceID" messagetype="request">
-    <description>Closes an interface from a mobile application.</description>
-    <description>After unregisterAppInterface, no commands other than registerAppInterface will be accepted/executed.</description>
-    <description>Will fail, if no registerAppInterface was completed successfully before.</description>
-  </function>
-  
-  <function name="UnregisterAppInterface" functionID="UnregisterAppInterfaceID" messagetype="response">
-  
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>  
-  
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>      
-      <element name="GENERIC_ERROR"/>
-    </param>
-
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  
-  </function>
-
-  <function name="SetGlobalProperties" functionID="SetGlobalPropertiesID" messagetype="request">
-    <description>Allows setting global properties.</description>
-
-    <param name="helpPrompt" type="TTSChunk" minsize="1" maxsize="100" array="true" mandatory="false" >
-      <description>The help prompt.</description>
-      <description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-      <description>The array must have at least one item</description>
-    </param> 
-
-    <param name="timeoutPrompt" type="TTSChunk" minsize="1" maxsize="100" array="true" mandatory="false" >
-      <description>Help text for a wait timeout.</description>
-      <description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-      <description>The array must have at least one item</description>
-    </param> 
-    
-    <param name="vrHelpTitle" type="String" maxlength="500" mandatory="false">
-      <description>VR Help Title text.</description>
-      <description>If omitted on supported displays, the default SYNC help title shall be used.</description>
-    </param>
-
-    <param name="vrHelp" type="VrHelpItem" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>VR Help Items.</description>
-      <description>If omitted on supported displays, the default SYNC generated help items shall be used.</description>
-      <description>If the list of VR Help Items contains nonsequential positions (e.g. [1,2,4]), the RPC shall be rejected.</description>
-    </param>
-    
-  </function>
-  
-  <function name="SetGlobalProperties" functionID="SetGlobalPropertiesID" messagetype="response">
-
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	</param>    
-    
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>    
-      <element name="REJECTED"/>  
-      <element name="DISALLOWED"/>   
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-    
-  </function>
-
-  <function name="ResetGlobalProperties" functionID="ResetGlobalPropertiesID" messagetype="request">
-    <description>Allows resetting global properties.</description>
-
-    <param name="properties" type="GlobalProperty" minsize="1" maxsize="100" array="true" >
-      <description>Contains the names of all global properties (like timeoutPrompt) that should be unset. Resetting means, that they have the same value as at start up (default)</description>
-    </param> 
-  </function>
-  
-  <function name="ResetGlobalProperties" functionID="ResetGlobalPropertiesID" messagetype="response">
-
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>    
-    
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>        
-      <element name="REJECTED"/> 
-      <element name="DISALLOWED"/>         
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-  <function name="AddCommand" functionID="AddCommandID" messagetype="request">
-    <description>Adds a command to the in application menu.</description>
-    <description>Either menuParams or vrCommands must be provided.</description>
-
-    <param name="cmdID" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="true">
-      <description>unique ID of the command to add.</description>
-    </param>
-
-    <param name="menuParams" type="MenuParams" mandatory="false">
-      <description>Optional sub value containing menu parameters</description>
-    </param>
-
-    <param name="vrCommands" type="String" minsize="1" maxsize="100" maxlength="99" array="true" mandatory="false">
-      <description>An array of strings to be used as VR synonyms for this command.</description>
-      <description>If this array is provided, it may not be empty.</description>
-    </param>
-
-    <param name="cmdIcon" type="Image" mandatory="false">
-       <description>Image struct determining whether static or dynamic icon.</description>
-       <description>If omitted on supported displays, no (or the default if applicable) icon shall be displayed.</description>
-     </param>
-
-  </function>
-  
-  <function name="AddCommand" functionID="AddCommandID" messagetype="response">
-
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>
-      <element name="REJECTED"/>        
-      <element name="INVALID_ID"/>
-      <element name="DUPLICATE_NAME"/>
-      <element name="DISALLOWED"/>   
-    </param>
-
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-    
-  </function>
-  
-  <function name="DeleteCommand" functionID="DeleteCommandID" messagetype="request">
-    <description>Deletes all commands from the in-application menu with the specified command id.</description>
-
-    <param name="cmdID" type="Integer" minvalue="0" maxvalue="2000000000">
-      <description>ID of the command(s) to delete.</description>
-    </param>
-
-  </function>
-  
-  <function name="DeleteCommand" functionID="DeleteCommandID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	  
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/> 
-      <element name="REJECTED"/>     
-      <element name="INVALID_ID"/>
-      <element name="IN_USE"/>
-    </param>
-
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-    
-  </function>
-
-  <function name="AddSubMenu" functionID="AddSubMenuID" messagetype="request">
-    <description>Adds a sub menu to the in-application menu.</description>
-
-    <param name="menuID" type="Integer" minvalue="0" maxvalue="2000000000">
-      <description>unique ID of the sub menu to add.</description>
-    </param>
-
-    <param name="position" type="Integer" minvalue="0" maxvalue="1000" defvalue="1000" mandatory="false">
-      <description>Position within the items that are are at top level of the in application menu.</description>
-      <description>0 will insert at the front.</description>
-      <description>1 will insert at the second position.</description>
-      <description>If position is greater or equal than the number of items on top level, the sub menu will be appended to the end.</description>
-      <description>Position of any submenu will always be located before the return and exit options</description>
-      <description>If this param was omitted the entry will be added at the end.</description>
-    </param>
-
-    <param name="menuName" maxlength="500" type="String">
-      <description>Text to show in the menu for this sub menu.</description>
-    </param>
-  </function>
-  
-  <function name="AddSubMenu" functionID="AddSubMenuID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	  
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>    
-      <element name="REJECTED"/>  
-      <element name="INVALID_ID"/>
-      <element name="DUPLICATE_NAME"/>
-    </param>
-
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-  <function name="DeleteSubMenu" functionID="DeleteSubMenuID" messagetype="request">
-    <description>Deletes a submenu from the in-application menu.</description>
-
-    <param name="menuID" type="Integer" minvalue="0" maxvalue="2000000000">
-      <description>The "menuID" of the submenu to delete. (See addSubMenu.menuID)</description>
-    </param>
-
-  </function>
-  
-  <function name="DeleteSubMenu" functionID="DeleteSubMenuID" messagetype="response">
-    
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	  
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>   
-      <element name="REJECTED"/>  
-      <element name="INVALID_ID"/>
-      <element name="IN_USE"/>      
-    </param>
-
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-
-  </function>
- 
-  <function name="CreateInteractionChoiceSet" functionID="CreateInteractionChoiceSetID" messagetype="request">
-    <description>creates interaction choice set to be used later by performInteraction</description>
-
-    <param name="interactionChoiceSetID" type="Integer" minvalue="0" maxvalue="2000000000">
-      <description>Unique ID used for this interaction choice set.</description>
-    </param>
-
-    <param name="choiceSet" type="Choice" minsize="1" maxsize="100" array="true" />
-  </function>
-  
-  <function name="CreateInteractionChoiceSet" functionID="CreateInteractionChoiceSetID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	  
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>    
-      <element name="REJECTED"/>  
-      <element name="INVALID_ID"/>
-      <element name="DUPLICATE_NAME"/>
-    </param>
-
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-  <function name="PerformInteraction" functionID="PerformInteractionID" messagetype="request">
-    <description>Triggers an interaction (e.g. "Permit GPS?" - Yes, no, Always Allow).</description>
-
-    <param name="initialText" type="String" maxlength="500" >
-      <description>Text to be displayed first.</description>
-    </param>
-
-    <param name="initialPrompt" type="TTSChunk" minsize="1" maxsize="100" array="true">
-      <description>This is the intial prompt spoken to the user at the start of an interaction</description>
-      <description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-      <description>The array must have at least one item</description>
-    </param> 
-
-    <param name="interactionMode" type="InteractionMode">
-      <description>See InteractionMode.</description>
-    </param>
-
-    <param name="interactionChoiceSetIDList" type="Integer" minsize="1" maxsize="100" minvalue="0" maxvalue="2000000000" array="true">
-      <description>List of interaction choice set IDs to use with an interaction.</description>
-    </param>	
-	
-    <param name="helpPrompt" type="TTSChunk" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>Help text. This is the spoken string when a user speaks "help" when the interaction is occuring.</description>
-      <description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-      <description>The array must have at least one item</description>
-    </param> 
-
-    <param name="timeoutPrompt" type="TTSChunk" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>Timeout text. This text is spoken when a VR interaction times out.</description>
-      <description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-      <description>The array must have at least one item</description>
-    </param> 
-
-    <param name="timeout" type="Integer" minvalue="5000" maxvalue="100000" defvalue="10000" mandatory="false">
-      <description>Timeout in milliseconds.</description>
-	  <description>If omitted a standard value of 10000 milliseconds is used.</description>
-    </param>
-
-    <param name="vrHelp" type="VrHelpItem" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>Ability to send suggested VR Help Items to display on-screen during Perform Interaction.</description>
-      <description>If omitted on supported displays, the default SYNC generated list of suggested choices shall be displayed.</description>
-    </param>
-    
-  </function>
-  
-  <function name="PerformInteraction" functionID="PerformInteractionID" messagetype="response">
-
-   <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	  
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>   
-      <element name="REJECTED"/>   
-      <element name="INVALID_ID"/>
-      <element name="DUPLICATE_NAME"/>
-      <element name="TIMED_OUT"/>
-      <element name="ABORTED"/>
-    </param>
-
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-
-    <param name="choiceID" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="false">
-      <description>ID of the choice that was selected in response to PerformInteraction.</description>
-    </param>
-
-    <param name="triggerSource" type="TriggerSource" mandatory="false">
-      <description>See TriggerSource</description>
-    </param>
-    
-  </function>
- 
-  <function name="DeleteInteractionChoiceSet" functionID="DeleteInteractionChoiceSetID" messagetype="request">
-    <description>Deletes interaction choice set that has been created with "CreateInteractionChoiceSet".</description>
-    <description>The interaction may only be deleted when not currently in use by a "performInteraction".</description>
-
-    <param name="interactionChoiceSetID" type="Integer" minvalue="0" maxvalue="2000000000">
-      <description>ID of the interaction choice set to delete.</description>
-    </param>
-  </function>
-  
-  <function name="DeleteInteractionChoiceSet" functionID="DeleteInteractionChoiceSetID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	  
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="REJECTED"/>
-      <element name="INVALID_ID"/>
-      <element name="IN_USE"/>      
-    </param>
-
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-  <function name="Alert" functionID="AlertID" messagetype="request">
-    <description>Shows an alert which typically consists of text-to-speech message and text on the display. At least either alertText1, alertText2 or TTSChunks need to be provided.</description>
-
-    <param name="alertText1" type="String" maxlength="500" mandatory="false">
-      <description>The first line of the alert text field</description>
-    </param>
-
-    <param name="alertText2" type="String" maxlength="500" mandatory="false">
-      <description>The second line of the alert text field</description>
-    </param>
-
-    <param name="alertText3" type="String" maxlength="500" mandatory="false">
-      <description>The optional third line of the alert text field</description>
-    </param>
-
-    <param name="ttsChunks" type="TTSChunk" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-      <description>The array must have at least one item</description>
-    </param> 
-
-    <param name="duration" type="Integer" minvalue="3000" maxvalue="10000" defvalue="5000" mandatory="false">
-      <description>Timeout in milliseconds.</description>
-      <description>Typical timeouts are 3-5 seconds</description>
-      <description>If omitted, timeout is set to 5s.</description>
-    </param>
-    
-    <param name="playTone" type="Boolean" mandatory="false">
-      <description>Defines if tone should be played. Tone is played before TTS.</description>
-      <description>If omitted, no tone is played.</description>
-    </param>
-
-    <param name="softButtons" type="SoftButton" minsize="0" maxsize="4" array="true" mandatory="false">
-      <description>App defined SoftButtons.</description>
-      <description>If omitted on supported displays, the displayed alert shall not have any SoftButtons.</description>
-    </param>   
-
-  </function>
-  
-  <function name="Alert" functionID="AlertID" messagetype="response">
-
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	  
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>  
-      <element name="REJECTED"/>
-      <element name="ABORTED"/>
-      <element name="DISALLOWED"/>
-      <element name="USER_DISALLOWED"/>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-    
-    <param name="tryAgainTime" type="Integer" minvalue="0" maxvalue="2000000000">
-      <description>Amount of time (in seconds) that an app must wait before resending an alert.</description>
-      <description>If provided, another system event or overlay currently has a higher priority than this alert.</description>
-      <description>An app must not send an alert without waiting at least the amount of time dictated.</description>
-    </param>
-
-  </function>
-
-  <function name="Show" functionID="ShowID" messagetype="request">
-    <description>Updates the persistent display. Supported fields depend on display capabilities.</description>
-
-    <param name="mainField1" type="String" maxlength="500" mandatory="false">
-      <description>The text that should be displayed in a single or upper display line.</description>
-      <description>If this text is not set, the text of mainField1 stays unchanged.</description>
-      <description>If this text is empty "", the field will be cleared.</description>
-    </param>
-
-    <param name="mainField2" type="String" maxlength="500" mandatory="false">
-      <description>The text that should be displayed on the second display line.</description>
-      <description>If this text is not set, the text of mainField2 stays unchanged.</description>
-      <description>If this text is empty "", the field will be cleared.</description>
-    </param>
-
-    <param name="mainField3" type="String" maxlength="500" mandatory="false">
-      <description>The text that should be displayed on the second "page" first display line.</description>
-      <description>If this text is not set, the text of mainField3 stays unchanged.</description>
-      <description>If this text is empty "", the field will be cleared.</description>
-    </param>
-
-    <param name="mainField4" type="String" maxlength="500" mandatory="false">
-      <description>The text that should be displayed on the second "page" second display line.</description>
-      <description>If this text is not set, the text of mainField4 stays unchanged.</description>
-      <description>If this text is empty "", the field will be cleared.</description>
-    </param>
-
-    <param name="alignment" type="TextAlignment" mandatory="false">
-      <description>Specifies how mainField1 and mainField2 texts should be aligned on display.</description>
-      <description>If omitted, texts will be centered</description>
-    </param>
-
-    <param name="statusBar" type="String" maxlength="500" mandatory="false">
-      <description>Requires investigation regarding the nav display capabilities. Potentially lower lowerStatusBar, upperStatusBar, titleBar, etc.</description>
-    </param>
-
-    <param name="mediaClock" type="String" maxlength="500" mandatory="false">
-      <description>Text value for MediaClock field. Has to be properly formatted by Mobile App according to Sync capabilities.</description>
-      <description>If this text is set, any automatic media clock updates previously set with SetMediaClockTimer will be stopped.</description>
-       <issue creator="rs">To be deprecated (Clearing should be done in SetMediaClockTimer)</issue>
-    </param>
-
-    <param name="mediaTrack" type="String" maxlength="500" mandatory="false">
-      <description>The text that should be displayed in the track field.</description>
-      <description>This field is only valid for media applications on NGN type ACMs.</description>
-      <description>If this text is not set, the text of mediaTrack stays unchanged.</description>
-      <description>If this text is empty "", the field will be cleared.</description>
-    </param>
-
-     <param name="graphic" type="Image" mandatory="false">
-       <description>Image struct determining whether static or dynamic image to display in app.</description>
-       <description>If omitted on supported displays, the displayed graphic shall not change.</description>       
-     </param>
-
-    <param name="softButtons" type="SoftButton" minsize="0" maxsize="8" array="true" mandatory="false">
-      <description>App defined SoftButtons.</description>
-      <description>If omitted on supported displays, the currently displayed SoftButton values will not change.</description>
-    </param>
-    
-    <param name="customPresets" type="String" maxlength="500" minsize="0" maxsize="6" array="true" mandatory="false">
-      <description>App labeled on-screen presets (i.e. GEN2).</description>
-      <description>If omitted on supported displays, the presets will be shown as not defined.</description>
-    </param>
-    
-  </function>
-  
-  <function name="Show" functionID="ShowID" messagetype="response">
-   
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-    </param>
-
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="REJECTED"/>     
-      <element name="DISALLOWED"/>   
-      <element name="ABORTED"/>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
- 
-  <function name="Speak" functionID="SpeakID" messagetype="request">
-    <description>Speaks a text.</description>
-
-    <param name="ttsChunks" type="TTSChunk" minsize="1" maxsize="100" array="true">
-      <description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-      <description>The array must have at least one item</description>
-    </param> 
-
-  </function>
-  
-  <function name="Speak" functionID="SpeakID" messagetype="response">
-
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-    </param>
-
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="REJECTED"/>     
-      <element name="DISALLOWED"/>   
-      <element name="ABORTED"/>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-
-  </function>
-
-  <function name="SetMediaClockTimer" functionID="SetMediaClockTimerID" messagetype="request">
-    <description>Sets the initial media clock value and automatic update method.</description>
-
-    <param name="startTime" type="StartTime" mandatory="false">
-      <description>See StartTime</description>
-      <description>startTime must be provided for "COUNTUP" and "COUNTDOWN"</description>
-      <description>startTime will be ignored for "PAUSE", "RESUME", and "CLEAR"</description>
-    </param>
-
-    <param name="updateMode" type="UpdateMode" mandatory="true">
-      <description>Enumeration to control the media clock.</description>
-      <description>In case of pause, resume, or clear, the start time value is ignored and shall be left out.  For resume, the time continues with the same value as it was when paused.</description>
-    </param>
-  </function>
-  
-  <function name="SetMediaClockTimer" functionID="SetMediaClockTimerID" messagetype="response">
-   <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-    </param>
-
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="REJECTED"/>
-      <element name="IGNORED"/>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
- </function>
-
-  <function name="EncodedSyncPData" functionID="EncodedSyncPDataID" messagetype="request">
-    <description>Allows encoded data in the form of SyncP packets to be sent to the SYNC module</description>
-
-    <param name="data" type="String" maxlength="10000" minsize="1" maxsize="100" array="true" mandatory="true">
-      <description>Contains base64 encoded string of SyncP packets.</description>
-      <todo>What is the maxlength</todo>
-    </param> 
-  </function>
-
-  <function name="EncodedSyncPData" functionID="EncodedSyncPDataID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-    
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>
-      <element name="REJECTED"/> 
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>    
-  </function>
-
-  <function name="DialNumber" functionID="DialNumberID" messagetype="request">
-    <description>Dials a phone number and switches to phone application.</description>
-
-    <param name="number" type="String" maxlength="500">
-		<issue creator="rs">Should it really be a simple string?</issue>
-      <description>Phone number is a string consisting of only the digits and "+", which can be up to 40 chars.</description>
-    </param>
-  </function>
-  
-  <function name="DialNumber" functionID="DialNumberID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	  
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="REJECTED"/>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-   <function name="PerformAudioPassThru" functionID="PerformAudioPassThruID" messagetype="request">
-    <description>Starts audio pass thru session </description>
-    <param name="initialPrompt" type="TTSChunk" minsize="1" maxsize="100" array="true">
-      <description>SYNC will speak this prompt before opening the audio pass thru session</description>
-      <description>An array of text chunks of type TTSChunk. See TTSChunk</description>
-      <description>The array must have at least one item</description>
-    </param> 
-    <param name="audioPassThruDisplayText1" type="String" mandatory="false" maxlength="500">
-      <description>First line of text displayed during audio capture.</description>
-    </param> 
-    <param name="audioPassThruDisplayText2" type="String" mandatory="false" maxlength="500">
-      <description>Second line of text displayed during audio capture.</description>
-    </param> 
-    <param name="samplingRate" type="SamplingRate" mandatory="true">
-      <description> This value shall be allowed at 8 khz or 16 or 22 or 44 khz.</description>
-    </param> 
-    <param name="maxDuration" type="Integer" minvalue="0" maxvalue="1000000" mandatory="true">
-      <description>The maximum duration of audio recording in milliseconds. </description>
-    </param> 
-    <param name="bitsPerSample" type="AudioCaptureQuality" mandatory="true">
-      <description>Specifies the quality the audio is recorded. Currently 8 bit or 16 bit.</description>
-    </param>
-    <param name="audioType" type="AudioType" mandatory="true">
-      <description>Specifies the type of audio data being requested.</description>
-    </param>    
-  </function>
-
-  <function name="PerformAudioPassThru" functionID="PerformAudioPassThruID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-    </param>
-
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="DISALLOWED"/>   
-      <element name="REJECTED"/>
-      <element name="ABORTED"/>
-      <element name="RETRY"/>
-    </param>
-        
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-  <function name="EndAudioPassThru" functionID="EndAudioPassThruID" messagetype="request">
-    <description>When this request is invoked, the audio capture stops.</description>
-  </function>
-  
-  <function name="EndAudioPassThru" functionID="EndAudioPassThruID" messagetype="response">
-     <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-    </param>
-
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="REJECTED"/>
-      <element name="DISALLOWED"/>   
-    </param>
-        
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-  <function name="SubscribeButton" functionID="SubscribeButtonID" messagetype="request">
-    <description>Subscribes to built-in HMI buttons.</description>
-    <description>The application will be notified by the OnButtonEvent and OnButtonPress.</description>
-    <description>To unsubscribe the notifications, use unsubscribeButton.</description>
-
-    <param name="buttonName" type="ButtonName">
-      <description>Name of the button to subscribe.</description>
-    </param>
-  </function>
-  
-  <function name="SubscribeButton" functionID="SubscribeButtonID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	  
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="UNSUPPORTED_BUTTON" />
-      <element name="IGNORED" />     
-      <element name="REJECTED"/> 
-    </param>
-
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-  <function name="UnsubscribeButton" functionID="UnsubscribeButtonID" messagetype="request">
-    <description>Unsubscribes from built-in HMI buttons.</description>
-
-    <param name="buttonName" type="ButtonName">
-      <description>Name of the button to unsubscribe.</description>
-    </param>
-  </function>
-  
-  <function name="UnsubscribeButton" functionID="UnsubscribeButtonID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	  
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="UNSUPPORTED_BUTTON" />
-      <element name="IGNORED" />
-      <element name="REJECTED"/>
-    </param>
-
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-  <function name="SubscribeVehicleData" functionID="SubscribeVehicleDataID" messagetype="request">
-    <description>Subscribes for specific published data items.</description>
-    <description>The data will be only sent if it has changed.</description>
-    <description>The application will be notified by the onVehicleData notification whenever new data is available.</description>
-    <description>To unsubscribe the notifications, use unsubscribe with the same subscriptionType.</description>
-
-    <param name="dataType" type="VehicleDataType" array="true" mandatory="true" minsize="1" maxsize="100">
-      <description>List of defined vehicle data elements.</description>
-      <description>See VehicleDataType</description>
-    </param>
-
-  </function>
-  
-  <function name="SubscribeVehicleData" functionID="SubscribeVehicleDataID" messagetype="response">
-   <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>  
-	
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="WARNINGS"/>      
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>    
-      <element name="IGNORED" />
-      <element name="DISALLOWED"/>
-      <element name="USER_DISALLOWED"/>   
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-    
-    <param name="dataResult" type="VehicleDataResult" mandatory="false" array="true" minsize="1" maxsize="100">
-      <description>Permission status of vehicle data element.</description>
-    </param>
-
-  </function>
-
-  <function name="UnsubscribeVehicleData" functionID="UnsubscribeVehicleDataID" messagetype="request">
-    <description>This function is used to unsubscribe the notifications from the subscribeVehicleData function.</description>
-
-    <param name="dataType" type="VehicleDataType" array="true" mandatory="true" minsize="1" maxsize="100">
-      <description>Refers to the vehicle data elements specified by subscribeVehicleData.</description>
-      <description>See VehicleDataType</description>
-    </param>
-  </function>
-
-  <function name="UnsubscribeVehicleData" functionID="UnsubscribeVehicleDataID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-    </param>
-
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="WARNINGS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="IGNORED" />
-      <element name="DISALLOWED"/>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-    
-    <param name="dataResult" type="VehicleDataResult" mandatory="false" array="true" minsize="1" maxsize="100">
-      <description>Permission status of vehicle data element.</description>
-    </param>
-
-  </function>
-
-  <function name="GetVehicleData" functionID="GetVehicleDataID" messagetype="request">
-    <description>Non periodic vehicle data read request.</description>
-
-    <param name="dataType" type="VehicleDataType">
-      <description>Complex signals like "GPS" should not be transferred as separate notifications, but all together in one notification.</description>
-    </param>
-  </function>
-  
-  <function name="GetVehicleData" functionID="GetVehicleDataID" messagetype="response">
-
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	</param>  
-	
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>    
-      <element name="REJECTED"/>  
-      <element name="VEHICLE_DATA_NOT_ALLOWED"/>
-      <element name="VEHICLE_DATA_NOT_AVAILABLE"/>
-      <element name="USER_DISALLOWED"/>   
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-
-    <param name="gps" type="GPSData" mandatory="false">
-      <description>See GPSData</description>
-      <description>Subscribable</description>
-    </param>
-    <param name="speed" type="Float" minvalue="-100" maxvalue="500" mandatory="false">
-      <description>The vehicle speed in kilometers per hour</description>
-      <description>Subscribable</description>
-    </param>
-    <param name="rpm" type="Integer" minvalue="0" maxvalue="20000" mandatory="false">
-      <description>The number of revolutions per minute of the engine</description>
-      <description>Subscribable</description>
-    </param>
-    <param name="fuelLevel" type="Float" minvalue="0" maxvalue="100" mandatory="false">
-      <description>The fuel level</description>
-    </param>
-    <param name="avgFuelEconomy" type="Float" minvalue="0" maxvalue="7000" mandatory="false">
-      <description>The average fuel economy in litres/100km</description>
-    </param>
-    <param name="batteryVoltage" type="Float" minvalue="0" maxvalue="26" mandatory="false">
-      <description>The voltage in Volts</description>
-    </param>
-    <param name="externalTemperature" type="Float" minvalue="-40" maxvalue="100" mandatory="false">
-      <description>The external temperature in degrees celsius.</description>
-    </param>
-    <param name="vin" type="String" maxlength="17" mandatory="false">
-      <description>Vehicle identification number.</description>
-    </param>
-    <param name="prndl" type="PRNDL" mandatory="false">
-      <description>See PRNDL.</description>
-      <description>Subscribable</description>
-      <issue creator="rs">Is this a good name? Wouldn't be selectedGear better?</issue>
-    </param>
-    <param name="tirePressure" type="TireStatus" mandatory="false">
-      <description>See TireStatus.</description>
-      <description>Subscribable</description>
-    </param>
-    <param name="batteryPackVoltage" type="Float" minvalue="-1000" maxvalue="1000" mandatory="false">
-    	<description>Battery pack voltage of hybrid and electrical vehicles in volts</description>
-    </param>
-    <param name="batteryPackCurrent" type="Float" minvalue="-1000" maxvalue="1000" mandatory="false">
-    	<description>Battery current of hybrid and electrical vehicles in amperes</description>
-    </param>
-    <param name="batteryPackTemperature" type="Integer" minvalue="-50" maxvalue="250" mandatory="false">
-    	<description>Battery temperature of hybrid and electrical vehicles in degrees celsius</description>
-    </param>
-    <param name="engineTorque" type="Integer" minvalue="-10000" maxvalue="55000" mandatory="false">
-    	<description>Engine torque in Nm</description>
-      <description>Subscribable</description>
-    </param>
-    <param name="odometer" type="Integer" minvalue="0" maxvalue="2000000" mandatory="false">
-    	<description>Odometer in km</description>
-    </param>
-    <param name="tripOdometer" type="Integer" minvalue="0" maxvalue="2000000" mandatory="false">
-    	<description>Odometer of trip in km</description>
-      	<issue creator="rs">This mixes up "Trip A" and "Total distance during this trip". Shall we seperate these two instead</issue>
-    </param>
-    <param name="satRadioESN" type="String" maxlength="500" mandatory="false">
-      <description>The hexadecimal ESN of the satellite radio (if supported).</description>
-    </param>
-    
-  </function>
-
-  <function name="ReadDID" functionID="ReadDIDID" messagetype="request">
-    <description>Non periodic vehicle data read request.</description>
-
-    <param name="ecuName" type="Integer" minvalue="0" maxvalue="65535" mandatory="true">
-      <description>Name of ECU.</description>
-    </param>
-    <param name="didLocation" type="Integer" minvalue="0" maxvalue="65535" minsize="0" maxsize="1000" array="true" mandatory="true">
-      <description>Get raw data from vehicle data DID location(s).</description>
-    </param>
-    <param name="encrypted" type="Boolean" mandatory="false">
-      <description>If not provided, the default is equal to False"</description>
-      <description>Indicates if the DID data requested should be returned as encrypted through an OnEncodedSYNCPData response.</description>
-      <description>If set to true, the data will return instead through OnEncodedSYNCPData and be passed through the proxy to the designated server URL.</description>
-    </param>
-        
-  </function>
-  
-  <function name="ReadDID" functionID="ReadDIDID" messagetype="response">
-
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>  
-	
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>    
-      <element name="REJECTED"/>  
-      <element name="DISALLOWED"/>
-      <element name="ENCRYPTED"/>      
-      <element name="USER_DISALLOWED"/>   
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-
-    <param name="dataResult" type="VehicleDataResultCode" minsize="0" maxsize="1000" array="true" mandatory="false">
-      <description>Permission status of data element.</description>
-    </param>
-
-    <param name="data" type="String" maxlength="5000" minsize="0" maxsize="1000" array="true" mandatory="false">
-      <description>Raw DID-based data returned for requested element.</description>
-    </param>
-
-  </function>
-
-  <function name="GetDTCs" functionID="GetDTCsID" messagetype="request">
-    <description>Vehicle module diagnostic trouble code request.</description>
-
-    <param name="ecuName" type="Integer" minvalue="0" maxvalue="65535" mandatory="true">
-      <description>Name of ECU.</description>
-    </param>
-
-    <param name="encrypted" type="Boolean" defvalue="false" mandatory="false">
-      <description>If not provided, the default is equal to False"</description>
-      <description>Indicates if the DTC data requested should be returned as encrypted through an OnEncodedSYNCPData response.</description>
-      <description>If set to true, the data will return instead through OnEncodedSYNCPData and be passed through the proxy to the designated server URL.</description>
-    </param>
-
-  </function>
-  
-  <function name="GetDTCs" functionID="GetDTCsID" messagetype="response">
-
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>  
-	
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>    
-      <element name="REJECTED"/>  
-      <element name="DISALLOWED"/>   
-      <element name="USER_DISALLOWED"/>   
-      <element name="ENCRYPTED"/>      
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-
-    <param name="dtcList" type="DTC" mandatory="false" array="true" minsize="1" maxsize="100">
-      <description>Array of all reported DTCs on module.</description>
-    </param>
-
-  </function>
-
-  <function name="ScrollableMessage" functionID="ScrollableMessageID" messagetype="request">
-    <description>Creates a full screen overlay containing a large block of formatted text that can be scrolled with up to 8 SoftButtons defined</description>
-    <param name="scrollableMessageBody" type="String" maxlength="500">
-      <description>Body of text that can include newlines and tabs.</description>
-    </param>   
-    <param name="timeout" type="Integer" minvalue="0" maxvalue="65535" defvalue="30000" mandatory="false">
-      <description>App defined timeout.</description>
-    </param>   
-    <param name="softButtons" type="SoftButton" minsize="0" maxsize="8" array="true" mandatory="false">
-      <description>App defined SoftButtons.</description>
-      <description>If omitted on supported displays, only the system defined "Close" SoftButton will be displayed.</description>
-    </param>   
-  </function>
-
-  <function name="ScrollableMessage" functionID="ScrollableMessageID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="CHAR_LIMIT_EXCEEDED"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>   
-      <element name="DISALLOWED"/>   
-      <element name="REJECTED"/>   
-      <element name="ABORTED"/>
-    </param>  
-  </function>
-
-  <function name="Slider" functionID="SliderID" messagetype="request">
-    <description>Creates a full screen or pop-up overlay (depending on platform) with a single user controlled slider.</description>
-    <param name="numTicks" type="Integer" minvalue="2" maxvalue="26" mandatory="true">
-      <description>Number of selectable items on a horizontal axis</description>
-    </param>   
-    <param name="position" type="Integer" minvalue="1" maxvalue="26" madatory="true">
-      <description>Initial position of slider control (cannot exceed numTicks)</description>
-    </param>   
-    <param name="sliderHeader" type="String" maxlength="500" mandatory="true">
-      <description>Text header to display</description>
-    </param>   
-    <param name="sliderFooter" type="String" maxlength="500"  minsize="1" maxsize="26" array="true" mandatory="false">
-      <description>Text footer to display (meant to display min/max threshold descriptors).</description>
-      <description>For a static text footer, only one footer string shall be provided in the array.</description>
-      <description>For a dynamic text footer, the number of footer text string in the array must match the numTicks value.</description>
-      <description>For a dynamic text footer, text array string should correlate with potential slider position index.</description>
-      <description>If omitted on supported displays, no footer text shall be displayed.</description>
-    </param>   
-    <param name="timeout" type="Integer" minvalue="0" maxvalue="65535" defvalue="10000">
-      <description>App defined timeout.</description>
-    </param>    
-  </function>
-
-  <function name="Slider" functionID="SliderID" messagetype="response">
-      <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SAVED"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>   
-      <element name="DISALLOWED"/>   
-      <element name="REJECTED"/>   
-      <element name="ABORTED"/>
-    </param>
-    <param name="sliderPosition" type="Integer" minvalue="1" maxvalue="26">
-      <description>Current slider value returned when saved or canceled</description>
-    </param>    
-  </function>
-  
-  <function name="ShowConstantTBT" functionID="ShowConstantTBTID" messagetype="request">
-    <param name="navigationText1" type="String" maxlength="500" mandatory="false">
-    </param>
-    <param name="navigationText2" type="String" maxlength="500" mandatory="false">
-    </param>
-    <param name="eta" type="String" maxlength="500" mandatory="false">
-    </param>
-    <param name="totalDistance" type="String" maxlength="500" mandatory="false">
-    </param>
-    <param name="turnIcon" type="Image">
-    </param>
-    <param name="distanceToManeuver" type="Float" minvalue="0" maxvalue="1000000000">
-      <description>Distance till next maneuver (starting from) from previous maneuver.</description>
-      <description>Used to calculate progress bar.</description>
-    </param>
-    <param name="distanceToManeuverScale" type="Float" minvalue="0" maxvalue="1000000000">
-      <description>Fraction of distance till next maneuver (starting from when AlertManeuver is triggered).</description>
-      <description>Used to calculate progress bar.</description>
-    </param>
-    <param name="maneuverComplete" type="Boolean" mandatory="false">
-      <description>If and when a maneuver has completed while an AlertManeuver is active, the app must send this value set to TRUE in order to clear the AlertManeuver overlay.</description>
-      <description>If omitted the value will be assumed as FALSE.</description>
-    </param>
-    <param name="softButtons" type="SoftButton" minsize="0" maxsize="3" array="true">
-      <description>Three dynamic SoftButtons available (second SoftButton is fixed to "Turns").</description>
-      <description>If omitted on supported displays, the currently displayed SoftButton values will not change.</description>
-    </param>
-  </function>
-
-  <function name="ShowConstantTBT" functionID="ShowConstantTBTID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-        <description>true, if successful</description> 
-        <description>false, if failed</description> 
-    </param>
-    <param name="resultCode" type="Result" platform="documentation">
-        <description>See Result</description>
-        <element name="SUCCESS"/>
-        <element name="INVALID_DATA"/>
-        <element name="OUT_OF_MEMORY"/>
-        <element name="TOO_MANY_PENDING_REQUESTS"/>
-        <element name="APPLICATION_NOT_REGISTERED"/>
-        <element name="GENERIC_ERROR"/>    
-        <element name="REJECTED"/>  
-        <element name="DISALLOWED"/>
-    </param>
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-        <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-  <function name="AlertManeuver" functionID="AlertManeuverID" messagetype="request">
-    <param name="ttsChunks" type="TTSChunk" minsize="1" maxsize="100" array="true">
-        <description>An array of text chunks of type TTSChunk. See TTSChunk</description> 
-    </param>
-    <param name="softButtons" type="SoftButton" minsize="0" maxsize="3" array="true">
-      <description>If omitted on supported displays, only the system defined "Close" SoftButton shall be displayed.</description>
-    </param>
-  </function>
-
-  <function name="AlertManeuver" functionID="AlertManeuverID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-        <description>true, if successful</description> 
-        <description>false, if failed</description> 
-    </param>
-    <param name="resultCode" type="Result" platform="documentation">
-        <description>See Result</description>
-        <element name="SUCCESS"/>
-        <element name="INVALID_DATA"/>
-        <element name="OUT_OF_MEMORY"/>
-        <element name="TOO_MANY_PENDING_REQUESTS"/>
-        <element name="APPLICATION_NOT_REGISTERED"/>
-        <element name="GENERIC_ERROR"/>    
-        <element name="REJECTED"/>  
-        <element name="IGNORED"/>
-        <element name="DISALLOWED"/>
-        <element name="ABORTED"/> 
-    </param>
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-        <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-  <function name="UpdateTurnList" functionID="UpdateTurnListID" messagetype="request">
-    <param name="turnList" type="Turn" minsize="1" maxsize="100" array="true"> 
-    </param>
-    <param name="softButtons" type="SoftButton" minsize="0" maxsize="1" array="true">
-      <description>If omitted on supported displays, app-defined SoftButton will be left blank.</description>   
-    </param>
-  </function>
-
-  <function name="UpdateTurnList" functionID="UpdateTurnListID" messagetype="response">
-    <param name="success" type="Boolean" platform="documentation">
-        <description>true, if successful</description> 
-        <description>false, if failed</description> 
-    </param>
-    <param name="resultCode" type="Result" platform="documentation">
-        <description>See Result</description>
-        <element name="SUCCESS"/>
-        <element name="INVALID_DATA"/>
-        <element name="OUT_OF_MEMORY"/>
-        <element name="TOO_MANY_PENDING_REQUESTS"/>
-        <element name="APPLICATION_NOT_REGISTERED"/>
-        <element name="GENERIC_ERROR"/>    
-        <element name="REJECTED"/>  
-        <element name="DISALLOWED"/>
-    </param>
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-        <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-  <function name="ChangeRegistration" functionID="ChangeRegistrationID" messagetype="request">
-    <param name="language" type="Language" mandatory="true">
-        <description>Requested SYNC voice engine (VR+TTS) language registration</description>
-    </param>
-    <param name="hmiDisplayLanguage" type="Language" mandatory="true">
-      <description>Request display language registration</description>
-    </param>
-  </function>
-
-  <function name="ChangeRegistration" functionID="ChangeRegistrationID" messagetype="response">
-
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>    
-    
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>    
-      <element name="REJECTED"/>  
-      <element name="DISALLOWED"/>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-        
-  </function>
-
-  <function name="GenericResponse" functionID="GenericResponseID" messagetype="response">
-    <description>Generic Response is sent, when the name of a received msg cannot be retrieved. Only used in case of an error.</description>
-	<description>Currently, only resultCode INVALID_DATA is used.</description>
-   <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="INVALID_DATA"/>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-
-<!--  
-  <function name="GetFile" messagetype="request">
-    <param name="syncFileName" type="String" >
-      <description>File source on sync.</description>
-    </param>
-
-  </function>
--->
-<!--  
-  <function name="GetFile" messagetype="response">
-    <description>Response is sent, when the file data was copied (success case). Or when an error occured.</description>
-
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>  
-      <element name="REJECTED"/>    
-      <element name="FILE_NOT_FOUND"/>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
--->
-
-  <function name="PutFile" functionID="PutFileID" messagetype="request" platform="gen2">
-    <description>Used to push a binary data onto the SYNC module from a mobile device, such as icons and album art</description>
-    <description>Not supported on first generation SYNC vehicles. </description>
-
-    <param name="syncFileName" type="String" maxlength="500" mandatory="true">
-      <description>File reference name.</description>
-    </param>
-
-    <param name="fileType" type="FileType">
-      <description>Selected file type.</description>
-    </param>
-
-    <param name="persistentFile" type="Boolean" defvalue="false" mandatory="false">
-      <description>Indicates if the file is meant to persist between sessions / ignition cycles.</description>
-      <description>If set to TRUE, then the system will aim to persist this file through session / cycles.</description>
-      <description>While files with this designation will have priority over others, they are subject to deletion by the system at any time.</description>
-      <description>In the event of automatic deletion by the system, the app will receive a rejection and have to resend the file.</description>
-      <description>If omitted, the value will be set to false.</description>
-    </param>
-
-    <param name="fileData" type="String" mandatory="false" >
-      <description>Binary data.</description>
-    </param>
-  </function>
-  
-  <function name="PutFile" functionID="PutFileID" messagetype="response" platform="gen2">
-    <description>Response is sent, when the file data was copied (success case). Or when an error occured.</description>
-    <description>Not supported on First generation SYNC vehicles. </description>
-   <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="REJECTED"/>
-    </param>
-    
-    <param name="spaceAvailable" type="Integer" minvalue="0" maxvalue="2000000000">
-          <description>Provides the total local space available on SYNC for the registered app.</description>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-  
-    <function name="DeleteFile" functionID="DeleteFileID" messagetype="request" platform="gen2">
-    <description>Used to delete a file resident on the SYNC module in the app's local cache.</description>
-    <description>Not supported on first generation SYNC vehicles. </description>
-
-    <param name="syncFileName" type="String" maxlength="500" mandatory="true">
-      <description>File reference name.</description>
-    </param>
-
-  </function>
-  
-  <function name="DeleteFile" functionID="DeleteFileID" messagetype="response" platform="gen2">
-    <description>Response is sent, when the file data was deleted (success case). Or when an error occured.</description>
-    <description>Not supported on First generation SYNC vehicles. </description>
-   <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="REJECTED"/>
-    </param>
-    
-    <param name="spaceAvailable" type="Integer" minvalue="0" maxvalue="2000000000">
-          <description>Provides the total local space available on SYNC for the registered app.</description>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
- 
-   <function name="ListFiles" functionID="ListFilesID" messagetype="request" platform="gen2">
-    <description>Requests the current list of resident filenames for the registered app</description>
-    <description>Not supported on first generation SYNC vehicles. </description>
-  </function>
-  
-  <function name="ListFiles" functionID="ListFilesID" messagetype="response" platform="gen2">
-    <description>Returns the current list of resident filenames for the registered app along with the current space available</description>
-    <description>Not supported on First generation SYNC vehicles. </description>
-   <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="REJECTED"/>
-    </param>
-    
-    <param name="filenames" type="String" maxlength="500" minsize="0" maxsize="1000" array="true" mandatory="false">
-      <description>An array of all filenames resident on SYNC for the given registered app.</description>
-      <description>If omitted, then no files currently reside on the system.</description>
-    </param>
-    
-    <param name="spaceAvailable" type="Integer" minvalue="0" maxvalue="2000000000">
-          <description>Provides the total local space available on SYNC for the registered app.</description>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
-   
-  <function name="SetAppIcon" functionID="SetAppIconID" messagetype="request" platform="gen2">
-    <description>Used to set existing local file on SYNC as the app's icon</description>
-    <description>Not supported on first generation SYNC vehicles. </description>
-
-    <param name="syncFileName" type="String" maxlength="500" mandatory="true">
-      <description>File reference name.</description>
-    </param>
- 
-  </function>
-  
-  <function name="SetAppIcon" functionID="SetAppIconID" messagetype="response" platform="gen2">
-    <description>Response is sent, when the file data was copied (success case). Or when an error occured.</description>
-    <description>Not supported on First generation SYNC vehicles. </description>
-    <description>Response is sent, when the file data was copied (success case). Or when an error occured.</description>
-    <description>Not supported on First generation SYNC vehicles. </description>
-    
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="REJECTED"/>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-
-  </function>
-  
-  <function name="SetDisplayLayout" functionID="SetDisplayLayoutID" messagetype="request" platform="gen2">
-    <description>Used to set an alternate display layout.</description>
-    <description>If not sent, default screen for given platform will be shown.</description>
-
-    <param name="displayLayout" type="String" mandatory="true">
-      <description>Predefined or dynamically created screen layout.</description>
-      <description>Currently only predefined screen layouts are defined.</description>     
-      <description>Predefined layouts include:</description>
-      <description>  "ONSCREEN_PRESETS"</description>
-      <description>    Custom screen containing app-defined onscreen presets.  Currently defined for GEN2.</description>
-    </param>
- 
-  </function>
-  
-  <function name="SetDisplayLayout" functionID="SetDisplayLayoutID" messagetype="response" platform="gen2">
-    
-    <param name="success" type="Boolean" platform="documentation">
-		  <description>true, if successful</description>
-		  <description>false, if failed</description>
-	  </param>
-	
-    <param name="resultCode" type="Result" platform="documentation">
-      <description>See Result</description>
-      <element name="SUCCESS"/>
-      <element name="INVALID_DATA"/>
-      <element name="OUT_OF_MEMORY"/>
-      <element name="TOO_MANY_PENDING_REQUESTS"/>
-      <element name="APPLICATION_NOT_REGISTERED"/>
-      <element name="GENERIC_ERROR"/>      
-      <element name="REJECTED"/>
-    </param>
-    
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-
-  </function>
-  
-  <!-- Notifications -->
-
-  <function name="OnHMIStatus" functionID="OnHMIStatusID" messagetype="notification">
-    <param name="hmiLevel" type="HMILevel">
-      <description>See HMILevel</description>
-    </param>
-
-    <param name="audioStreamingState" type="AudioStreamingState">
-      <description>See AudioStreamingState</description>
-    </param>
-    
-    <param name="systemContext" type="SystemContext">
-      <description>See SystemContext</description>
-    </param>
-  </function>
-
-  <function name="OnAppInterfaceUnregistered" functionID="OnAppInterfaceUnregisteredID" messagetype="notification">
-    <param name="reason" type="AppInterfaceUnregisteredReason">
-      <description>See AppInterfaceUnregisteredReason</description>
-    </param>
-  </function>
-
-  <function name="OnButtonEvent" functionID="OnButtonEventID" messagetype="notification">
-    <description>Notifies application of UP/DOWN events for buttons to which the application is subscribed.</description>
-    <param name="buttonName" type="ButtonName"/>
-    <param name="buttonEventMode" type="ButtonEventMode">
-      <description>Indicates whether this is an UP or DOWN event.</description>
-    </param>
-    <param name="customButtonID" type="Integer" minvalue="0" maxvalue="65536">
-      <description>If ButtonName is “CUSTOM_BUTTON", this references the integer ID passed by a custom button. (e.g. softButton ID)</description>
-    </param>
-  </function>
-
-  <function name="OnButtonPress" functionID="OnButtonPressID" messagetype="notification">
-    <description>Notifies application of LONG/SHORT press events for buttons to which the application is subscribed.</description>
-    <param name="buttonName" type="ButtonName"/>
-    <param name="buttonPressMode" type="ButtonPressMode">
-      <description>Indicates whether this is a LONG or SHORT button press event.</description>
-    </param>
-    <param name="customButtonID" type="Integer" minvalue="0" maxvalue="65536">
-      <description>If ButtonName is “CUSTOM_BUTTON", this references the integer ID passed by a custom button. (e.g. softButton ID)</description>
-    </param>
-  </function>
-
-  <function name="OnVehicleData" functionID="OnVehicleDataID" messagetype="notification">
-    <description>Callback for the periodic and non periodic vehicle data read function.</description>
-    <param name="gps" type="GPSData" mandatory="false">
-      <description>See GPSData</description>
-      <description>Subscribable</description>
-    </param>
-    <param name="speed" type="Float" minvalue="-100" maxvalue="500" mandatory="false">
-      <description>The vehicle speed in kilometers per hour</description>
-      <description>Subscribable</description>
-    </param>
-    <param name="rpm" type="Integer" minvalue="0" maxvalue="20000" mandatory="false">
-      <description>The number of revolutions per minute of the engine</description>
-      <description>Subscribable</description>
-    </param>
-    <param name="fuelLevel" type="Float" minvalue="0" maxvalue="100" mandatory="false">
-      <description>The fuel level</description>
-    </param>
-    <param name="avgFuelEconomy" type="Float" minvalue="0" maxvalue="7000" mandatory="false">
-      <description>The average fuel economy in litres/100km</description>
-    </param>
-    <param name="batteryVoltage" type="Float" minvalue="0" maxvalue="26" mandatory="false">
-      <description>The voltage in Volts</description>
-    </param>
-    <param name="externalTemperature" type="Float" minvalue="-40" maxvalue="100" mandatory="false">
-      <description>The external temperature in degrees celsius.</description>
-    </param>
-    <param name="vin" type="String" maxlength="17" mandatory="false">
-      <description>Vehicle identification number.</description>
-    </param>
-    <param name="prndl" type="PRNDL" mandatory="false">
-      <description>See PRNDL.</description>
-      <description>Subscribable</description>
-      <issue creator="rs">Is this a good name? Wouldn't be selectedGear better?</issue>
-    </param>
-    <param name="tirePressure" type="TireStatus" mandatory="false">
-      <description>See TireStatus.</description>
-      <description>Subscribable</description>
-    </param>
-    <param name="batteryPackVoltage" type="Float" minvalue="-1000" maxvalue="1000" mandatory="false">
-    	<description>Battery pack voltage of hybrid and electrical vehicles in volts</description>
-    </param>
-    <param name="batteryPackCurrent" type="Float" minvalue="-1000" maxvalue="1000" mandatory="false">
-    	<description>Battery current of hybrid and electrical vehicles in amperes</description>
-    </param>
-    <param name="batteryPackTemperature" type="Integer" minvalue="-50" maxvalue="250" mandatory="false">
-    	<description>Battery temperature of hybrid and electrical vehicles in degrees celsius</description>
-    </param>
-    <param name="engineTorque" type="Integer" minvalue="-10000" maxvalue="55000" mandatory="false">
-    	<description>Engine torque in Nm</description>
-      <description>Subscribable</description>
-    </param>
-    <param name="odometer" type="Integer" minvalue="0" maxvalue="2000000" mandatory="false">
-    	<description>Odometer in km</description>
-    </param>
-    <param name="tripOdometer" type="Integer" minvalue="0" maxvalue="2000000" mandatory="false">
-    	<description>Odometer of trip in km</description>
-      	<issue creator="rs">This mixes up "Trip A" and "Total distance during this trip". Shall we seperate these two instead</issue>
-    </param>
-    <param name="genericbinary" type="String" maxlength="500" mandatory="false">
-      <description>The hex value string is a string of hexadecimal chars, for example "FE12" or "1234ABCD".</description>
-     </param>
-  </function>
-
-  <function name="OnCommand" functionID="OnCommandID" messagetype="notification">
-    <param name="cmdID" type="Integer" minvalue="0" maxvalue="2000000000">
-      <description>Command ID, which is related to a specific menu entry.</description>
-    </param>
-
-    <param name="triggerSource" type="TriggerSource">
-      <description>See TriggerSource</description>
-    </param>
-  </function>
-
-  <function name="OnEncodedSyncPData" functionID="OnEncodedSyncPDataID" messagetype="notification">
-    <description>Callback including encoded data of any SyncP packets that SYNC needs to send back to the mobile device.</description>
-    <param name="data" type="String" maxlength="10000" minsize="1" maxsize="100" mandatory="true" array="true">
-      <description>Contains base64 encoded string of SyncP packets.</description>
-    </param>
-    <param name="URL" type="String" maxlength="1000" mandatory="false">
-      <description>If blank, the SyncP data shall be forwarded to the app.</description>
-      <description>If not blank, the SyncP data shall be forwarded to the provided URL.</description>
-    </param>
-    <param name="Timeout" type="Integer" minvalue="-2000000000" maxvalue="2000000000" mandatory="false">
-      <description>If blank, the SyncP data shall be forwarded to the app.</description>
-      <description>If not blank, the SyncP data shall be forwarded with the provided timeout in seconds.</description>
-    </param>  
-  </function>
-
-  <function name="OnTBTClientState" functionID="OnTBTClientStateID" messagetype="notification" >
-    <description>Provides applications with notifications specific to the current TBT client status on the module</description>
-    <param name="state" type="TBTState">
-      <description>Current State of TBT client</description>
-    </param>
-  </function>
-
-  <function name="OnDriverDistraction" functionID="OnDriverDistractionID" messagetype="notification" >
-    <description>Provides driver distraction state to mobile applications</description>
-    <param name="state" type="DriverDistractionState">
-      <description>Current State of Driver Distraction</description>
-    </param>
-  </function> 
-
-  <function name="OnPermissionsChange" functionID="OnPermissionsChangeID" messagetype="notification" >
-    <description>Provides update to app of which policy-table-enabled functions are available</description>
-    <param name="permissionItem" type="PermissionItem" minsize="1" maxsize="100" array="true">
-      <description>Change in permissions for a given set of RPCs.</description>
-    </param>
-  </function>
-
-  <function name="OnAudioPassThru" functionID="OnAudioPassThruID" messagetype="notification">
-<!-- TODO: REMOVE
-    <param name="audioPacket" type="DataType">
-        <description>Binary packet of APT data.</description>
-    </param>
--->    
-  </function>
-
-  <function name="OnLanguageChange" functionID="OnLanguageChangeID" messagetype="notification">
-    <param name="language" type="Language">
-        <description>Current SYNC voice engine (VR+TTS) language</description>
-    </param>
-    <param name="hmiDisplayLanguage" type="Language">
-      <description>Current display language</description>
-    </param>
-  </function>
-
-
-  <struct name="HMIApplication">
-                <description>Data type containing information about application needed by HMI.</description>
-                <param name="appName" type="String" maxlength="100"/>
-                <param name="ngnMediaScreenAppName" type="String" maxlength="100" mandatory="false"/>
-                <param name="icon" type="String" mandatory="false"/>
-        <param name="deviceName" type="String"/>
-        <param name="vrSynonyms" type="String" array="true" minsize="1" maxsize="100" maxlength="40" mandatory="false"/>
-        <param name="appId" type="Integer"/>
-        <param name="languageDesired" type="Language"/>
-        <param name="hmiDisplayLanguageDesired" type="Language"/>
-        <param name="ttsName" type="TTSChunk" minsize="1" maxsize="100" array="true" mandatory="false"/>
-        <param name="isMediaApplication" type="Boolean"/>
-        <param name="appType" type="AppType" minsize="1" maxsize="100" array="true" mandatory="false"/>
-</struct>
-<enum name="DeactivateReason">
-  <description>Enum of reasons of user navigating from application used by HMI.</description>
-  <element name="AUDIO">
-      <description>Navigated to audio(radio, etc)</description>
-  </element>
-  <element name="PHONECALL">
-      <description>Navigated to make a call.</description>
-  </element>
-  <element name="NAVIGATIONMAP">
-      <description>Navigated to navigation screen.</description>
-  </element>
-  <element name="PHONEMENU">
-      <description>Navigated to phone menu.</description>
-  </element>
-  <element name="SYNCSETTINGS">
-      <description>Navigated to settings menu.</description>
-  </element>
-  <element name="GENERAL">
-      <description>Other screens navigation apart from other mobile app.</description>
-  </element>
-</enum>
-
-  </interface>
diff --git a/SDL_Core/src/components/JSONHandler/src/JSONHandler.cpp b/SDL_Core/src/components/JSONHandler/src/JSONHandler.cpp
deleted file mode 100644
index 9fc11422b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/JSONHandler.cpp
+++ /dev/null
@@ -1,704 +0,0 @@
-/**
-* \file JSONHandler.cpp
-* \brief JSONHandler class source file.
-* Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <stdio.h>
-#include <algorithm>
-#include <string.h>
-#include <pthread.h>
-#include <signal.h>
-#include <json/reader.h>
-#include <json/writer.h>
-#include "JSONHandler/JSONHandler.h"
-#include "JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-namespace
-{
-    enum ProtocolVersion
-    {
-        INVALID_PROTOCOL = 0,
-        V1 = 1,
-        V2 = 2
-    };
-
-    // TODO(AK): Remove this after new code generation.
-    class InvalidResponseFactory
-    {
-    public:
-        typedef std::map<std::string, NsSmartDeviceLinkRPC::Marshaller::Methods> Responses;
-
-        typedef NsSmartDeviceLinkRPCV2::FunctionID::FunctionIDInternal FunctionID;
-        typedef NsSmartDeviceLinkRPC::Marshaller::Methods Methods;
-
-        static NsSmartDeviceLinkRPC::SDLRPCResponse* getResponse(FunctionID functionId,
-                                                        int correlationId)
-        {
-            NsSmartDeviceLinkRPC::SDLRPCResponse* response = NULL;
-
-            switch (functionId)
-            {
-            case FunctionID::AlertID:
-                response = new NsSmartDeviceLinkRPCV2::Alert_response();
-                break;
-            case FunctionID::DeleteFileID:
-                response = new NsSmartDeviceLinkRPCV2::DeleteFile_response();
-                break;
-            case FunctionID::GetDTCsID:
-                response = new NsSmartDeviceLinkRPCV2::GetDTCs_response();
-                break;
-            case FunctionID::GetVehicleDataID:
-                response = new NsSmartDeviceLinkRPCV2::GetVehicleData_response();
-                break;
-            case FunctionID::ListFilesID:
-                response = new NsSmartDeviceLinkRPCV2::ListFiles_response();
-                break;
-            case FunctionID::PerformInteractionID:
-                response = new NsSmartDeviceLinkRPCV2::PerformInteraction_response();
-                break;
-            case FunctionID::PutFileID:
-                response = new NsSmartDeviceLinkRPCV2::PutFile_response();
-                break;
-            case FunctionID::ReadDIDID:
-                response = new NsSmartDeviceLinkRPCV2::ReadDID_response();
-                break;
-            case FunctionID::RegisterAppInterfaceID:
-                response = new NsSmartDeviceLinkRPCV2::RegisterAppInterface_response();
-                break;
-            case FunctionID::SliderID:
-                response = new NsSmartDeviceLinkRPCV2::Slider_response();
-                break;
-            case FunctionID::SubscribeVehicleDataID:
-                response = new NsSmartDeviceLinkRPCV2::SubscribeVehicleData_response();
-                break;
-            case FunctionID::UnsubscribeVehicleDataID:
-                response = new NsSmartDeviceLinkRPCV2::UnsubscribeVehicleData_response();
-                break;
-            default:
-                response = new NsSmartDeviceLinkRPC::SDLRPCResponse(V2, functionId);
-                break;
-            }
-
-            response->setMethodId(static_cast<FunctionID>(functionId));
-            response->setCorrelationID(correlationId);
-            response->set_success(false);
-            response->set_resultCode(NsSmartDeviceLinkRPCV2::Result::INVALID_DATA);
-            return response;
-        }
-
-        static NsSmartDeviceLinkRPC::SDLRPCResponse* getResponse(const std::string& jsonString)
-        {
-            Responses responses;
-            responses.insert(std::make_pair("PerformInteraction", Methods::METHOD_PERFORMINTERACTION_RESPONSE));
-            responses.insert(std::make_pair("RegisterAppInterface", Methods::METHOD_REGISTERAPPINTERFACE_RESPONSE));
-
-            std::string methodName;
-            int correlationID = -1;
-
-            try
-            {
-                Json::Reader reader;
-                Json::Value json;
-                if (!reader.parse(jsonString, json, false) ||
-                    !json.isObject() ||
-                    !json.isMember("request") ||
-                    !json["request"].isObject())
-                {
-                    return NULL;
-                }
-
-                const Json::Value& jsonResponse = json["request"];
-
-                if (!jsonResponse.isMember("name") || !jsonResponse["name"].isString())
-                {
-                    return NULL;
-                }
-                methodName = jsonResponse["name"].asString();
-
-                if (!jsonResponse.isMember("correlationID") || !jsonResponse["correlationID"].isInt())
-                {
-                    return NULL;
-                }
-                correlationID = jsonResponse["correlationID"].asInt();
-            }
-            catch (...)
-            {
-                return NULL;
-            }
-
-            Methods methodId = Methods::METHOD_INVALID;
-            Responses::const_iterator item = responses.find(methodName);
-            if (item != responses.end())
-            {
-                methodId = item->second;
-            }
-
-            NsSmartDeviceLinkRPC::SDLRPCResponse* response = NULL;
-            switch (methodId)
-            {
-            case Methods::METHOD_PERFORMINTERACTION_RESPONSE:
-                response = new NsSmartDeviceLinkRPC::PerformInteraction_response();
-                break;
-            case Methods::METHOD_REGISTERAPPINTERFACE_RESPONSE:
-                response = new NsSmartDeviceLinkRPC::RegisterAppInterface_response();
-                break;
-            default:
-                response = new NsSmartDeviceLinkRPC::SDLRPCResponse(V1, methodId);
-                break;
-            }
-
-            response->set_success(false);
-            response->set_resultCode(NsSmartDeviceLinkRPCV2::Result::INVALID_DATA);
-            response->setCorrelationID(correlationID);
-            return response;
-        }
-
-    private:
-        InvalidResponseFactory();
-        ~InvalidResponseFactory();
-    };
-}
-
-
-log4cplus::Logger JSONHandler::mLogger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("JSONHandler"));
-
-JSONHandler::JSONHandler(NsProtocolHandler::ProtocolHandler* protocolHandler) :
-    mProtocolHandler(protocolHandler)
-{
-    pthread_create(&mWaitForIncomingMessagesThread, NULL, &JSONHandler::waitForIncomingMessages, (void*)this);
-    pthread_create(&mWaitForOutgoingMessagesThread, NULL, &JSONHandler::waitForOutgoingMessages, (void*)this);
-}
-
-JSONHandler::~JSONHandler()
-{
-    pthread_kill(mWaitForIncomingMessagesThread, 1);
-    pthread_kill(mWaitForOutgoingMessagesThread, 1);
-    mProtocolHandler = 0;
-    mMessagesObserver = 0;
-}
-
-/*Methods for IRPCMessagesObserver*/
-void JSONHandler::setRPCMessagesObserver(IRPCMessagesObserver* messagesObserver)
-{
-    if (!messagesObserver)
-    {
-        LOG4CPLUS_ERROR(mLogger, "Invalid (null) pointer to IRPCMessagesObserver.");
-    }
-    mMessagesObserver = messagesObserver;
-}
-
-void JSONHandler::sendRPCMessage(const NsSmartDeviceLinkRPC::SDLRPCMessage* message, int connectionKey)
-{
-    LOG4CPLUS_INFO(mLogger, "An outgoing message has been received");
-    if (message)
-    {
-        mOutgoingMessages.push(std::make_pair(connectionKey, message));
-    }
-}
-/*End of methods for IRPCMessagesObserver*/
-void JSONHandler::setProtocolHandler(NsProtocolHandler::ProtocolHandler* protocolHandler)
-{
-    if (!protocolHandler)
-    {
-        LOG4CPLUS_ERROR(mLogger, "Invalid (null) pointer to ProtocolHandler.");
-        return;
-    }
-    mProtocolHandler = protocolHandler;
-}
-
-void JSONHandler::onDataReceivedCallback(const NsProtocolHandler::SmartDeviceLinkRawMessage* message)
-{
-    if (!message)
-    {
-        LOG4CPLUS_ERROR(mLogger, "Received invalid message from ProtocolHandler.");
-        return;
-    }
-
-    LOG4CPLUS_INFO(mLogger, "Received message from mobile App: " << message->getData()
-                   << " of size " << message->getDataSize());
-
-    mIncomingMessages.push(message);
-}
-/*end of methods from IProtocolObserver*/
-
-std::string JSONHandler::clearEmptySpaces(const std::string& input)
-{
-    std::string str = input;
-    str.erase(std::remove(str.begin(), str.end(), '\n'), str.end());
-    return str;
-}
-
-void* JSONHandler::waitForIncomingMessages(void* params)
-{
-    JSONHandler* handler = static_cast<JSONHandler*>(params);
-    if (!handler)
-    {
-        pthread_exit(0);
-    }
-
-    while (1)
-    {
-        while (! handler -> mIncomingMessages.empty())
-        {
-            LOG4CPLUS_INFO(mLogger, "Incoming mobile message received.");
-            const NsProtocolHandler::SmartDeviceLinkRawMessage* message = handler -> mIncomingMessages.pop();
-
-            NsSmartDeviceLinkRPC::SDLRPCMessage* currentMessage = 0;
-
-            LOG4CPLUS_INFO_EXT(mLogger, "Message of protocol version " << message -> getProtocolVersion());
-
-            if (message -> getProtocolVersion() == 1)
-            {
-                currentMessage = handler -> handleIncomingMessageProtocolV1(message);
-            }
-            else if (message -> getProtocolVersion() == 2)
-            {
-                currentMessage = handler -> handleIncomingMessageProtocolV2(message);
-            }
-            else
-            {
-                LOG4CPLUS_WARN(mLogger, "Message of wrong protocol version received.");
-                continue;
-            }
-
-            if (!currentMessage)
-            {
-                LOG4CPLUS_ERROR(mLogger, "Invalid mobile message received.");
-                continue;
-            }
-
-            currentMessage -> setProtocolVersion(message -> getProtocolVersion());
-
-            if (!handler -> mMessagesObserver)
-            {
-                LOG4CPLUS_ERROR(mLogger, "Cannot handle mobile message: MessageObserver doesn't exist.");
-                pthread_exit(0);
-            }
-
-            handler -> mMessagesObserver -> onMessageReceivedCallback(currentMessage, message -> getConnectionKey());
-
-            LOG4CPLUS_INFO(mLogger, "Incoming mobile message handled.");
-        }
-        handler -> mIncomingMessages.wait();
-    }
-}
-
-NsSmartDeviceLinkRPC::SDLRPCMessage* JSONHandler::handleIncomingMessageProtocolV1(
-    const NsProtocolHandler::SmartDeviceLinkRawMessage* message)
-{
-    std::string jsonMessage = std::string((const char*)message->getData(), message->getDataSize());
-
-    if (jsonMessage.length() == 0)
-    {
-        LOG4CPLUS_ERROR(mLogger, "Received invalid json packet.");
-        return 0;
-    }
-
-    std::string jsonCleanMessage = clearEmptySpaces(jsonMessage);
-
-    NsSmartDeviceLinkRPC::SDLRPCMessage* messageObject = NsSmartDeviceLinkRPC::Marshaller::fromString(jsonCleanMessage);
-    LOG4CPLUS_INFO_EXT(mLogger, "Received a message from mobile side: "
-                       << std::endl << NsSmartDeviceLinkRPC::Marshaller::toJSON(messageObject));
-
-    if (!messageObject)
-    {
-        LOG4CPLUS_WARN(mLogger, "Invalid mobile message received.");
-
-        NsSmartDeviceLinkRPC::SDLRPCResponse* response = InvalidResponseFactory::getResponse(jsonMessage);
-        if (!response)
-        {
-            LOG4CPLUS_ERROR(mLogger, "new NsSmartDeviceLinkRPC::ALRPCMessage failed...");
-            return NULL;
-        }
-
-        sendRPCMessage(response, message->getConnectionKey());
-        return NULL;
-    }
-
-    return messageObject;
-}
-
-NsSmartDeviceLinkRPC::SDLRPCMessage* JSONHandler::handleIncomingMessageProtocolV2(
-    const NsProtocolHandler::SmartDeviceLinkRawMessage* message)
-{
-    unsigned char* receivedData = message->getData();
-    unsigned char offset = 0;
-    unsigned char firstByte = receivedData[offset++];
-
-    int rpcType = -1;
-    unsigned char rpcTypeFlag = firstByte >> 4u;
-    switch (rpcTypeFlag)
-    {
-    case RPC_REQUEST:
-        rpcType = 0;
-        break;
-    case RPC_RESPONSE:
-        rpcType = 1;
-        break;
-    case RPC_NOTIFICATION:
-        rpcType = 2;
-        break;
-    }
-    LOG4CPLUS_INFO_EXT(mLogger, "RPC Type of the message is " << rpcType << " from flag " << rpcTypeFlag);
-
-    unsigned int functionId = firstByte >> 8u;
-
-    functionId <<= 24u;
-    functionId |= receivedData[offset++] << 16u;
-    functionId |= receivedData[offset++] << 8u;
-    functionId |= receivedData[offset++];
-
-    LOG4CPLUS_INFO_EXT(mLogger, "FunctionId is " << functionId);
-
-    unsigned int correlationId = receivedData[offset++] << 24u;
-    correlationId |= receivedData[offset++] << 16u;
-    correlationId |= receivedData[offset++] << 8u;
-    correlationId |= receivedData[offset++];
-
-    LOG4CPLUS_INFO_EXT(mLogger, "\t\t\tCorrelation id " << correlationId);
-
-    unsigned int jsonSize = receivedData[offset++] << 24u;
-    jsonSize |= receivedData[offset++] << 16u;
-    jsonSize |= receivedData[offset++] << 8u;
-    jsonSize |= receivedData[offset++];
-
-    LOG4CPLUS_INFO_EXT(mLogger, "Json size is " << jsonSize);
-
-    if (jsonSize > message->getDataSize())
-    {
-        LOG4CPLUS_ERROR(mLogger, "Received invalid json packet header.");
-        return 0;
-    }
-
-    std::string jsonMessage = std::string((const char*)receivedData + offset, jsonSize);
-    if (jsonMessage.length() == 0)
-    {
-        LOG4CPLUS_ERROR(mLogger, "Received invalid json packet.");
-        return 0;
-    }
-
-    std::string jsonCleanMessage = clearEmptySpaces(jsonMessage);
-
-    Json::Reader reader;
-    Json::Value json;
-
-    if (!reader.parse(jsonCleanMessage, json, false))
-    {
-        LOG4CPLUS_ERROR(mLogger, "Received invalid json string.");
-        return 0;
-    }
-    //TODO (PV): temporary solution, will be fixed after changes to codegeneration
-    LOG4CPLUS_INFO_EXT(mLogger, "Received from mobile side: " << std::endl << json);
-
-    Json::Value tempSolution;
-    tempSolution["parameters"] = json;
-
-    LOG4CPLUS_INFO_EXT(mLogger, "Added params: " << std::endl << tempSolution);
-
-    /*NsSmartDeviceLinkRPC::SDLRPCMessage * messageObject = NsSmartDeviceLinkRPCV2::Marshaller::fromString(
-        jsonCleanMessage,
-        static_cast<NsSmartDeviceLinkRPCV2::FunctionID::FunctionIDInternal>(functionId),
-        static_cast<NsSmartDeviceLinkRPCV2::messageType::messageTypeInternal>(rpcType) );*/
-
-    NsSmartDeviceLinkRPC::SDLRPCMessage* messageObject = NsSmartDeviceLinkRPCV2::Marshaller::fromJSON(
-                tempSolution,
-                static_cast<NsSmartDeviceLinkRPCV2::FunctionID::FunctionIDInternal>(functionId),
-                static_cast<NsSmartDeviceLinkRPCV2::messageType::messageTypeInternal>(rpcType));
-
-    //LOG4CPLUS_INFO_EXT(mLogger, "Received a message from mobile side: " <<
-    // std::endl << NsSmartDeviceLinkRPCV2::Marshaller::toJSON(
-    //   messageObject, static_cast<NsSmartDeviceLinkRPCV2::FunctionID::FunctionIDInternal>(functionId),
-    //   static_cast<NsSmartDeviceLinkRPCV2::messageType::messageTypeInternal>(rpcType)));
-
-    if (message -> getDataSize() > offset + jsonSize)
-    {
-        // unsigned int binarySize = message->getDataSize() - offset - jsonSize;
-        std::vector<unsigned char> binaryData(receivedData + offset + jsonSize,
-                                              receivedData + message->getDataSize());
-        LOG4CPLUS_INFO_EXT(mLogger, "Binary data is present in message.");
-        messageObject -> setBinaryData(binaryData);
-    }
-
-    if (!messageObject)
-    {
-        LOG4CPLUS_WARN(mLogger, "Invalid mobile message received.");
-        NsSmartDeviceLinkRPC::SDLRPCResponse* response = InvalidResponseFactory::getResponse(
-                static_cast<NsSmartDeviceLinkRPCV2::FunctionID::FunctionIDInternal>(functionId), correlationId);
-        if (!response)
-        {
-            LOG4CPLUS_ERROR(mLogger, "new NsSmartDeviceLinkRPC::ALRPCMessage failed...");
-            return NULL;
-        }
-
-        sendRPCMessage(response, message->getConnectionKey());
-        return NULL;
-    }
-    else
-    {
-        messageObject->setMethodId(functionId);
-    }
-
-    if (RPC_REQUEST == rpcTypeFlag || RPC_RESPONSE == rpcTypeFlag)
-    {
-        messageObject->setCorrelationID(correlationId);
-    }
-
-    return messageObject;
-}
-
-void* JSONHandler::waitForOutgoingMessages(void* params)
-{
-    JSONHandler* handler = static_cast<JSONHandler*>(params);
-    if (!handler)
-    {
-        pthread_exit(0);
-    }
-    while (1)
-    {
-        while (! handler -> mOutgoingMessages.empty())
-        {
-            std::pair<int, const NsSmartDeviceLinkRPC::SDLRPCMessage*> messagePair = handler -> mOutgoingMessages.pop();
-            const NsSmartDeviceLinkRPC::SDLRPCMessage*   message = messagePair.second;
-            LOG4CPLUS_INFO(mLogger, "Outgoing mobile message " << message->getMethodId() << " received.");
-
-            NsProtocolHandler::SmartDeviceLinkRawMessage* msgToProtocolHandler = 0;
-            if (message -> getProtocolVersion() == 1)
-            {
-                msgToProtocolHandler = handler -> handleOutgoingMessageProtocolV1(messagePair.first, message);
-            }
-            else if (message -> getProtocolVersion() == 2)
-            {
-                LOG4CPLUS_INFO_EXT(mLogger, "method id "
-                   << static_cast<NsSmartDeviceLinkRPCV2::FunctionID::FunctionIDInternal>(message -> getMethodId())
-                   << "; message type "
-                   << static_cast<NsSmartDeviceLinkRPCV2::messageType::messageTypeInternal>(message -> getMessageType()));
-
-                msgToProtocolHandler = handler -> handleOutgoingMessageProtocolV2(messagePair.first, message);
-            }
-
-            if (!msgToProtocolHandler)
-            {
-                LOG4CPLUS_ERROR(mLogger, "Faile to create message string.");
-                continue;
-            }
-
-            if (!handler -> mProtocolHandler)
-            {
-                LOG4CPLUS_ERROR(mLogger, "Cannot handle mobile message: ProtocolHandler doesn't exist.");
-                pthread_exit(0);
-            }
-
-            LOG4CPLUS_INFO_EXT(mLogger, "Sending to ProtocolHandler: " << msgToProtocolHandler->getData()
-                               << " of size " << msgToProtocolHandler->getDataSize());
-            handler -> mProtocolHandler -> sendData(msgToProtocolHandler);
-
-            delete message;
-            LOG4CPLUS_INFO(mLogger, "Outgoing mobile message handled.");
-        }
-        handler -> mOutgoingMessages.wait();
-    }
-}
-
-NsProtocolHandler::SmartDeviceLinkRawMessage* JSONHandler::handleOutgoingMessageProtocolV1(int connectionKey,
-        const NsSmartDeviceLinkRPC::SDLRPCMessage*   message)
-{
-    LOG4CPLUS_INFO_EXT(mLogger, "handling a message " << message->getMethodId() << " protocol 1");
-    LOG4CPLUS_INFO_EXT(mLogger, "message text: " << std::endl << NsSmartDeviceLinkRPC::Marshaller::toJSON(message));
-    std::string messageString = NsSmartDeviceLinkRPC::Marshaller::toString(message);
-
-    if (messageString.length() == 0)
-    {
-        LOG4CPLUS_ERROR(mLogger, "Failed to serialize ALRPCMessage object version 1.");
-        return 0;
-    }
-
-    unsigned char* rawMessage = new unsigned char[messageString.length() + 1];
-    memcpy(rawMessage, messageString.c_str(), messageString.length() + 1);
-
-    NsProtocolHandler::SmartDeviceLinkRawMessage* msgToProtocolHandler = new NsProtocolHandler::SmartDeviceLinkRawMessage(
-        connectionKey,
-        1,
-        rawMessage,
-        messageString.length() + 1);
-
-    return msgToProtocolHandler;
-}
-
-NsProtocolHandler::SmartDeviceLinkRawMessage* JSONHandler::handleOutgoingMessageProtocolV2(int connectionKey,
-        const NsSmartDeviceLinkRPC::SDLRPCMessage*   message)
-{
-    LOG4CPLUS_INFO_EXT(mLogger, "handling a message " << message->getMethodId() << " protocol 2");
-    Json::Value json = NsSmartDeviceLinkRPCV2::Marshaller::toJSON(message,
-                       static_cast<NsSmartDeviceLinkRPCV2::FunctionID::FunctionIDInternal>(message -> getMethodId()),
-                       static_cast<NsSmartDeviceLinkRPCV2::messageType::messageTypeInternal>(message -> getMessageType()));
-
-    if (json.isNull())
-    {
-        if (NsSmartDeviceLinkRPCV2::FunctionID::FunctionIDInternal::OnAudioPassThruID == message->getMethodId())
-        {
-            LOG4CPLUS_INFO_EXT(mLogger, "Handling OnAudioPassThru message with 0 length!");
-            // akara
-            // Workaround to have no JSON string in OnAudioPassThru notification
-            // This notification contains audio data only.
-            const uint MAX_HEADER_SIZE = 12;
-            unsigned int jsonSize = 0;
-            unsigned int binarySize = 0;
-            if (message->getBinaryData())
-            {
-                binarySize = message->getBinaryData()->size();
-            }
-            unsigned char* dataForSending = new unsigned char[MAX_HEADER_SIZE + jsonSize + binarySize];
-            unsigned char offset = 0;
-
-            unsigned char rpcTypeFlag = RPC_NOTIFICATION;
-
-            unsigned int functionId = message->getMethodId();
-            dataForSending[offset++] = ((rpcTypeFlag << 4) & 0xF0) | (functionId >> 24);
-            dataForSending[offset++] = functionId >> 16;
-            dataForSending[offset++] = functionId >> 8;
-            dataForSending[offset++] = functionId;
-
-            unsigned int correlationId = message->getCorrelationID();
-            LOG4CPLUS_INFO_EXT(mLogger, "\t\t\tCorrelation ID is " << correlationId);
-            dataForSending[offset++] = correlationId >> 24;
-            dataForSending[offset++] = correlationId >> 16;
-            dataForSending[offset++] = correlationId >> 8;
-            dataForSending[offset++] = correlationId;
-
-            dataForSending[offset++] = jsonSize >> 24;
-            dataForSending[offset++] = jsonSize >> 16;
-            dataForSending[offset++] = jsonSize >> 8;
-            dataForSending[offset++] = jsonSize;
-
-            if (message->getBinaryData())
-            {
-                const std::vector<unsigned char>& binaryData = *(message->getBinaryData());
-                unsigned char* currentPointer = dataForSending + offset + jsonSize;
-                for (unsigned int i = 0; i < binarySize; ++i)
-                {
-                    currentPointer[i] = binaryData[i];
-                }
-            }
-
-            NsProtocolHandler::SmartDeviceLinkRawMessage* msgToProtocolHandler = new NsProtocolHandler::SmartDeviceLinkRawMessage(
-                connectionKey,
-                2,
-                dataForSending,
-                MAX_HEADER_SIZE + jsonSize + binarySize);
-
-            return msgToProtocolHandler;
-        }
-        else
-        {
-            LOG4CPLUS_ERROR(mLogger, "Failed to serialize ALRPCMessage object version 2.");
-            return 0;
-        }
-    }
-
-    LOG4CPLUS_INFO_EXT(mLogger, "Message to be sent to mobile app \n" << json["parameters"]);
-
-    //TODO (PV): temporary solution, will be fixed after changes to codegeneration
-    Json::FastWriter writer;
-    std::string messageString = writer.write(json["parameters"]);/*NsSmartDeviceLinkRPCV2::Marshaller::toString( message,
-                        static_cast<NsSmartDeviceLinkRPCV2::FunctionID::FunctionIDInternal>(message -> getMethodId()),
-                        static_cast<NsSmartDeviceLinkRPCV2::messageType::messageTypeInternal>(message -> getMessageType()) );*/
-
-    //LOG4CPLUS_INFO_EXT(mLogger, "message text: " << std::endl << json );
-    if (messageString.length() == 0)
-    {
-        LOG4CPLUS_ERROR(mLogger, "Failed to serialize ALRPCMessage object version 2.");
-        return 0;
-    }
-
-    const uint MAX_HEADER_SIZE = 12;
-    unsigned int jsonSize = messageString.length() + 1;
-    unsigned int binarySize = 0;
-    if (message->getBinaryData())
-    {
-        binarySize = message->getBinaryData()->size();
-    }
-    unsigned char* dataForSending = new unsigned char[MAX_HEADER_SIZE + jsonSize + binarySize];
-    unsigned char offset = 0;
-
-    unsigned char rpcTypeFlag = 0;
-    switch (message->getMessageType())
-    {
-    case 0:
-        rpcTypeFlag = RPC_REQUEST;
-        break;
-    case 1:
-        rpcTypeFlag = RPC_RESPONSE;
-        break;
-    case 2:
-        rpcTypeFlag = RPC_NOTIFICATION;
-        break;
-    }
-
-    unsigned int functionId = message->getMethodId();
-    dataForSending[offset++] = ((rpcTypeFlag << 4) & 0xF0) | (functionId >> 24);
-    dataForSending[offset++] = functionId >> 16;
-    dataForSending[offset++] = functionId >> 8;
-    dataForSending[offset++] = functionId;
-
-    unsigned int correlationId = message->getCorrelationID();
-    LOG4CPLUS_INFO_EXT(mLogger, "\t\t\tCorrelation ID is " << correlationId);
-    dataForSending[offset++] = correlationId >> 24;
-    dataForSending[offset++] = correlationId >> 16;
-    dataForSending[offset++] = correlationId >> 8;
-    dataForSending[offset++] = correlationId;
-
-    dataForSending[offset++] = jsonSize >> 24;
-    dataForSending[offset++] = jsonSize >> 16;
-    dataForSending[offset++] = jsonSize >> 8;
-    dataForSending[offset++] = jsonSize;
-
-    memcpy(dataForSending + offset, messageString.c_str(), jsonSize);
-
-    if (message->getBinaryData())
-    {
-        const std::vector<unsigned char>& binaryData = *(message->getBinaryData());
-        unsigned char* currentPointer = dataForSending + offset + jsonSize;
-        for (unsigned int i = 0; i < binarySize; ++i)
-        {
-            currentPointer[i] = binaryData[i];
-        }
-    }
-
-    NsProtocolHandler::SmartDeviceLinkRawMessage* msgToProtocolHandler = new NsProtocolHandler::SmartDeviceLinkRawMessage(
-        connectionKey,
-        2,
-        dataForSending,
-        MAX_HEADER_SIZE + jsonSize + binarySize);
-
-    return msgToProtocolHandler;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/JSONRPC2Handler.cpp b/SDL_Core/src/components/JSONHandler/src/JSONRPC2Handler.cpp
deleted file mode 100644
index 47a0de19a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/JSONRPC2Handler.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
-* \file JSONRPC2Handler.cpp
-* \brief JSONRPC2Handler class source file.
-* Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "JSONHandler/JSONRPC2Handler.h"
-#include "JSONHandler/RPC2Objects/Marshaller.h"
-
-log4cplus::Logger JSONRPC2Handler::mLogger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("JSONRPC2Handler"));
-
-JSONRPC2Handler::JSONRPC2Handler( const std::string& address, uint16_t port ) :
-NsMessageBroker::CMessageBrokerController( address, port, "BasicCommunication" )
-{
-    pthread_create( &mWaitForCommandsFromHMI, NULL, &JSONRPC2Handler::waitForCommandsFromHMI, (void *)this );
-    pthread_create( &mWaitForRequestsToHMI, NULL, &JSONRPC2Handler::waitForRequestsToHMI, (void *)this );
-    pthread_create( &mWaitForResponsesToHMI, NULL, &JSONRPC2Handler::waitForResponsesToHMI, (void *)this );
-    pthread_create( &mWaitForNotificationsToHMI, NULL, &JSONRPC2Handler::waitForNotificationsToHMI, (void *)this );
-    pthread_create( &mWaitForResponsesFromHMI, NULL, &JSONRPC2Handler::waitForResponsesFromHMI, (void *)this );
-}
-
-JSONRPC2Handler::~JSONRPC2Handler()
-{
-}
-
-void JSONRPC2Handler::processResponse(std::string method, Json::Value& root)
-{
-    LOG4CPLUS_INFO_EXT( mLogger, "Received response from RPCBus" );
-    ResponseContainer response;
-    response.methodName = method;
-    response.response = root;
-    mResponsesFromHMI.push( response );
-}
-    
-void JSONRPC2Handler::processRequest(Json::Value& root)
-{
-    LOG4CPLUS_INFO_EXT(mLogger, "Received request from RPCBus");
-    mCommandsFromHMI.push( root );
-}
-    
-void JSONRPC2Handler::processNotification(Json::Value& root)
-{
-    LOG4CPLUS_INFO_EXT( mLogger, "Received notification from RPCBus." );
-    mCommandsFromHMI.push( root );
-}
-
-void JSONRPC2Handler::subscribeToNotifications()
-{
-    subscribeTo( "Buttons.OnButtonEvent" );
-    subscribeTo( "Buttons.OnButtonPress" );
-    subscribeTo( "UI.OnCommand" );
-    subscribeTo( "VR.OnCommand" );
-    subscribeTo( "UI.OnReady" );
-    subscribeTo( "UI.OnDriverDistraction" );
-    subscribeTo( "UI.OnSystemContext" );
-    subscribeTo( "UI.OnAppActivated" );
-    subscribeTo( "BasicCommunication.OnAppDeactivated" );
-    subscribeTo( "UI.OnDeviceChosen");
-    subscribeTo( "UI.OnLanguageChange" );
-    subscribeTo( "VR.OnLanguageChange" );
-    subscribeTo( "TTS.OnLanguageChange" );
-    subscribeTo( "VehicleInfo.OnVehicleData" );
-    subscribeTo( "UI.OnTBTClientState" );
-}
-
-void JSONRPC2Handler::setRPC2CommandsObserver( 
-            IRPC2CommandsObserver * commandsObserver )
-{
-    mCommandsObserver = commandsObserver;
-}
-
-void JSONRPC2Handler::sendNotification( const NsRPC2Communication::RPC2Notification * command )
-{
-    mNotificationsToHMI.push( command );
-}
-    
-void JSONRPC2Handler::sendResponse( const NsRPC2Communication::RPC2Response * command )
-{
-    mResponsesToHMI.push( command );
-}
-    
-void JSONRPC2Handler::sendRequest( const NsRPC2Communication::RPC2Request * command )
-{
-    mRequestsToHMI.push( command );
-}
-
-void * JSONRPC2Handler::waitForCommandsFromHMI( void * params )
-{
-    JSONRPC2Handler * handler = static_cast<JSONRPC2Handler*>( params );
-    if ( !handler )
-    {
-        pthread_exit( 0 );
-    }
-    LOG4CPLUS_INFO(mLogger, "JSONRPC2Handler::waitForCommandsFromHMI");
-    while ( 1 )
-    {
-        while ( !handler -> mCommandsFromHMI.empty() )
-        {
-            Json::Value jsonMessage = handler -> mCommandsFromHMI.pop();
-            LOG4CPLUS_INFO_EXT(mLogger, "JSONRPC2Handler::waitForCommandsFromHMI: received command: " << jsonMessage);
-            NsRPC2Communication::RPC2Command * currentCommand = NsRPC2Communication::Marshaller::fromJSON( jsonMessage );
-            
-            if ( !currentCommand )
-            {
-                LOG4CPLUS_ERROR( mLogger, "Invalid RPCBus message received." );
-                continue;
-            }
-            LOG4CPLUS_INFO(mLogger, "JSONRPC2Handler::waitForCommandsFromHMI: handle command" );
-
-            if ( !handler -> mCommandsObserver )
-            {
-                LOG4CPLUS_ERROR( mLogger, "Cannot handle RPCBus message: CommandsObserver doesn't exist." );
-                pthread_exit( 0 );
-            }
-            handler -> mCommandsObserver -> onCommandReceivedCallback( currentCommand );
-        }
-        handler -> mCommandsFromHMI.wait();
-    }
-
-    return 0;
-}
-
-void * JSONRPC2Handler::waitForResponsesFromHMI( void * params )
-{
-    JSONRPC2Handler * handler = static_cast<JSONRPC2Handler*>( params );
-    if ( !handler )
-    {
-        pthread_exit( 0 );
-    }
-    LOG4CPLUS_INFO(mLogger, "JSONRPC2Handler::waitForResponsesFromHMI\n");
-    while ( 1 )
-    {
-        while ( !handler -> mResponsesFromHMI.empty() )
-        {            
-            ResponseContainer response = handler -> mResponsesFromHMI.pop();
-            LOG4CPLUS_INFO_EXT(mLogger, "JSONRPC2Handler::waitForResponsesFromHMI: received response to a method " << response.methodName << std::endl << response.response );
-            NsRPC2Communication::RPC2Command * currentCommand = NsRPC2Communication::Marshaller::fromJSON( response.response );
-            
-            if ( !currentCommand )
-            {
-                LOG4CPLUS_ERROR( mLogger, "Invalid RPCBus message received." );
-                continue;
-            }
-            LOG4CPLUS_INFO(mLogger, "JSONRPC2Handler::waitForResponsesFromHMI: handle response");
-            if ( !handler -> mCommandsObserver )
-            {
-                LOG4CPLUS_ERROR( mLogger, "Cannot handle RPCBus message: CommandsObserver doesn't exist." );
-                pthread_exit( 0 );
-            }
-            handler -> mCommandsObserver -> onCommandReceivedCallback( currentCommand );
-        }
-        handler -> mResponsesFromHMI.wait();
-    }
-
-    return 0;
-}
-
-void * JSONRPC2Handler::waitForResponsesToHMI( void * params )
-{
-    JSONRPC2Handler * handler = static_cast<JSONRPC2Handler*>( params );
-    if ( !handler )
-    {
-        pthread_exit( 0 );
-    }
-    LOG4CPLUS_INFO(mLogger, "JSONRPC2Handler::waitForResponsesToHMI");
-    while ( 1 )
-    {
-        while ( !handler -> mResponsesToHMI.empty() )
-        {            
-            const NsRPC2Communication::RPC2Response * command = handler -> mResponsesToHMI.pop();
-
-            Json::Value commandJson = NsRPC2Communication::Marshaller::toJSON( command );
-            LOG4CPLUS_INFO_EXT(mLogger, "JSONRPC2Handler::waitForResponsesToHMI: received response " << command->getId() << commandJson);
-
-            if ( commandJson.isNull() )
-            {
-                LOG4CPLUS_ERROR( mLogger, "Invalid RPCBus message received." );
-                continue;
-            }
-            LOG4CPLUS_INFO(mLogger, "JSONRPC2Handler::waitForResponsesToHMI: processed command" );
-
-            //handler -> prepareMessage( commandJson );
-            handler -> sendJsonMessage( commandJson );
-
-            delete command;
-        }
-        handler -> mResponsesToHMI.wait();
-    }
-
-    return 0;
-}
-    
-void * JSONRPC2Handler::waitForRequestsToHMI( void * params )
-{
-    JSONRPC2Handler * handler = static_cast<JSONRPC2Handler*>( params );
-    if ( !handler )
-    {
-        pthread_exit( 0 );
-    }
-    LOG4CPLUS_INFO(mLogger, "JSONRPC2Handler::waitForRequestsToHMI");
-    while ( 1 )
-    {
-        while ( !handler -> mRequestsToHMI.empty() )
-        {
-            const NsRPC2Communication::RPC2Command * command = handler -> mRequestsToHMI.pop();
-            Json::Value commandJson = NsRPC2Communication::Marshaller::toJSON( command );
-            LOG4CPLUS_INFO(mLogger, "JSONRPC2Handler::waitForRequestsToHMI: received request " << commandJson);
-
-            if ( commandJson.isNull() )
-            {
-                LOG4CPLUS_ERROR( mLogger, "Invalid RPCBus message received." );
-                continue;
-            }
-            LOG4CPLUS_INFO(mLogger, "JSONRPC2Handler::waitForRequestsToHMI: processed command" );
-
-            //handler -> prepareMessage( commandJson );
-            handler -> sendJsonMessage( commandJson );
-
-            delete command;
-        }
-        handler -> mRequestsToHMI.wait();
-    }
-
-    return 0;
-}
-    
-void * JSONRPC2Handler::waitForNotificationsToHMI( void * params )
-{
-    JSONRPC2Handler * handler = static_cast<JSONRPC2Handler*>( params );
-    if ( !handler )
-    {
-        pthread_exit( 0 );
-    }
-    LOG4CPLUS_INFO(mLogger, "JSONRPC2Handler::waitForNotificationsToHMI");
-    while ( 1 )
-    {
-        while ( !handler -> mNotificationsToHMI.empty() )
-        {
-            const NsRPC2Communication::RPC2Command * command = handler -> mNotificationsToHMI.pop();
-            Json::Value commandJson = NsRPC2Communication::Marshaller::toJSON( command );
-            LOG4CPLUS_INFO(mLogger, "JSONRPC2Handler::waitForNotificationsToHMI: received notification " << commandJson);
-
-            if ( commandJson.isNull() )
-            {
-                LOG4CPLUS_ERROR( mLogger, "Invalid RPCBus message received." );
-                continue;
-            }
-            LOG4CPLUS_INFO(mLogger, "JSONRPC2Handler::waitForNotificationsToHMI: processed command" );
-
-            handler -> sendJsonMessage( commandJson );
-
-            delete command;
-        }
-        handler -> mNotificationsToHMI.wait();
-    }
-
-    return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2Command.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2Command.cpp
deleted file mode 100644
index baf9dab25..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2Command.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
-* \file RPC2Command.cpp
-* \brief RPC2Command class source file.
-* Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "JSONHandler/RPC2Command.h"
-
-using namespace NsRPC2Communication;
-
-RPC2Command::RPC2Command( ) :
-mCommandType(UNDEFINED)
-, mMethod(-1)
-{
-}
-
-RPC2Command::RPC2Command( CommandType type ) :
-mCommandType(type)
-, mMethod(-1)
-{
-}
-
-RPC2Command::RPC2Command( CommandType type, int method ) :
-mCommandType(type)
-, mMethod( method )
-{}
-
-RPC2Command::~RPC2Command()
-{
-}
-
-
-void RPC2Command::setCommandType( CommandType commandType )
-{
-  mCommandType=commandType;
-}
-
-RPC2Command::CommandType RPC2Command::getCommandType( ) const
-{
-  return mCommandType;
-}
-
-int RPC2Command::getMethod() const
-{
-  return mMethod;
-}
-
-void RPC2Command::setMethod(int method)
-{
-  mMethod=method;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2Error.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2Error.cpp
deleted file mode 100644
index 7b389430c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2Error.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
-* \file RPC2Error.cpp
-* \brief RPC2Error class source file.
-* Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "JSONHandler/RPC2Error.h"
-
-using namespace NsRPC2Communication;
-
-RPC2Error::RPC2Error(void) :
-RPC2Command(ERROR)
-, mId(0)
-, mCode(0)
-, mMessage("")
-{
-}
-
-RPC2Error::RPC2Error(int code, const std::string& message,int id ) :
-RPC2Command(ERROR)
-, mId(id)
-, mCode(code)
-, mMessage(message)
-{
-}
-
-RPC2Error::RPC2Error(int code, const std::string& message) :
-RPC2Command(ERROR)
-, mId(0)
-, mCode(code)
-, mMessage(message)
-{
-}
-
-RPC2Error::~RPC2Error()
-{
-}
-
-RPC2Error::RPC2Error(const RPC2Error& r) :
-RPC2Command(ERROR)
-{
-  *this=r;
-}
-
-void RPC2Error::setId(int id)
-{
-  mId=id;
-}
-
-void RPC2Error::resetId(void)
-{
-  mId=0;
-}
-
-int RPC2Error::getId() const
-{
-  return mId;
-}
-
-int RPC2Error::getErrorCode() const
-{
-  return mCode;
-}
-
-void RPC2Error::setErrorCode(int code)
-{
-  mCode=code;
-}
-
-
-const std::string& RPC2Error::getErrorString() const
-{
-  return mMessage;
-}
-
-void RPC2Error::setErrorString(const std::string& message)
-{
-  mMessage=message;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ErrorMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ErrorMarshaller.cpp
deleted file mode 100644
index 7fc718b73..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ErrorMarshaller.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
-* \file RPC2ErrorMarshaller.cpp
-* \brief RPC2ErrorMarshaller class source file.
-* Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include <cstdlib>
-#include <cstring>
-#include "JSONHandler/RPC2ErrorMarshaller.h"
-
-using namespace NsRPC2Communication;
-
-
-bool RPC2ErrorMarshaller::fromString(const std::string& s,RPC2Error& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string RPC2ErrorMarshaller::toString(const RPC2Error& e)
-{
-  Json::FastWriter writer;
-  return writer.write(toJSON(e));
-}
-
-
-Json::Value RPC2ErrorMarshaller::toJSON(const RPC2Error& e)
-{
-  Json::Value json(Json::objectValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-
-  json["id"]= e.mId ? Json::Value(e.mId) : Json::Value(Json::nullValue);
-
-  json["error"]=Json::Value(Json::objectValue);
-
-  json["error"]["code"]=Json::Value(e.mCode);
-  json["error"]["message"]=Json::Value(e.mMessage);
-
-  return json;
-}
-
-
-bool RPC2ErrorMarshaller::fromJSON(const Json::Value& json,RPC2Error& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("error")) return false;
-    Json::Value js=json["error"];
-
-    if(json.isMember("id") && !json["id"].isNull())
-    {
-      if(!json["id"].isInt())
-        return false;
-      c.mId=json["id"].asInt();
-    }
-    else
-      c.mId=0;
-
-    if(!js.isObject())  return false;
-    if(!js.isMember("code"))  return false;
-    if(!js.isMember("message"))  return false;
-    if(!js["code"].isInt())  return false;
-    if(!js["message"].isString())  return false;
-    
-    c.mCode=js["code"].asInt();
-    c.mMessage=js["message"].asString();
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2Notification.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2Notification.cpp
deleted file mode 100644
index 8bb7e9553..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2Notification.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
-* \file RPC2Notification.cpp
-* \brief RPC2Notification class source file.
-* Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "JSONHandler/RPC2Notification.h"
-
-using namespace NsRPC2Communication;
-
-RPC2Notification::RPC2Notification(void) :
-RPC2Command(NOTIFICATION)
-{
-}
-
-RPC2Notification::RPC2Notification(int method) :
-RPC2Command(NOTIFICATION, method)
-{
-}
-
-
-RPC2Notification::~RPC2Notification()
-{
-}
-
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.cpp
deleted file mode 100644
index 3b1b7aff0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.cpp
+++ /dev/null
@@ -1,1304 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/ActivateApp.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/ActivateAppResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/GetAppList.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/GetAppListResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/GetDeviceList.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/GetDeviceListResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/OnAppDeactivated.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/OnAppRegistered.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/OnAppUnregistered.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/OnDeviceListUpdated.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/SendData.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/BasicCommunication/SendDataResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/Buttons/GetCapabilities.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/Buttons/GetCapabilitiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/Buttons/OnButtonEvent.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/Buttons/OnButtonPress.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/ChangeRegistration.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/ChangeRegistrationResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/GetCapabilities.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/GetCapabilitiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/GetLanguage.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/GetLanguageResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/GetSupportedLanguages.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/GetSupportedLanguagesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/OnLanguageChange.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/Speak.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/TTS/SpeakResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AddCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AddCommandResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AddSubMenu.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AddSubMenuResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/Alert.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AlertResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AlertManeuver.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/AlertManeuverResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ChangeRegistration.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ChangeRegistrationResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/CreateInteractionChoiceSet.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/CreateInteractionChoiceSetResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DeleteCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DeleteCommandResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DeleteInteractionChoiceSet.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DeleteInteractionChoiceSetResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DeleteSubMenu.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DeleteSubMenuResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DialNumber.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/DialNumberResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/EndAudioPassThru.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/EndAudioPassThruResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/GetCapabilities.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/GetCapabilitiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/GetLanguage.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/GetLanguageResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/GetSupportedLanguages.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/GetSupportedLanguagesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnDeviceChosen.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnDriverDistraction.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnLanguageChange.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnReady.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnSystemContext.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/OnTBTClientState.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/PerformAudioPassThru.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/PerformAudioPassThruResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/PerformInteraction.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/PerformInteractionResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ResetGlobalProperties.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ResetGlobalPropertiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ScrollableMessage.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ScrollableMessageResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetAppIcon.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetAppIconResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetDisplayLayout.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetDisplayLayoutResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetGlobalProperties.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetGlobalPropertiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetMediaClockTimer.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SetMediaClockTimerResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/Show.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ShowResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ShowConstantTBT.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/ShowConstantTBTResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/Slider.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/SliderResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/UpdateTurnList.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/UI/UpdateTurnListResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/AddCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/AddCommandResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/ChangeRegistration.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/ChangeRegistrationResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/DeleteCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/DeleteCommandResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/GetCapabilities.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/GetCapabilitiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/GetLanguage.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/GetLanguageResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/GetSupportedLanguages.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/GetSupportedLanguagesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/OnCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VR/OnLanguageChange.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/GetDTCs.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/GetDTCsResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/GetVehicleData.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/GetVehicleDataResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/GetVehicleType.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/GetVehicleTypeResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/OnVehicleData.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/ReadDID.h"
-#include "../src/../include/JSONHandler/RPC2Objects//NsRPC2Communication/VehicleInfo/ReadDIDResponse.h"
-
-#include "../src/../src/RPC2ObjectsImpl/Marshaller.inc"
-
-/*
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication;
-
-
-const Marshaller::Methods Marshaller::getIndex(const char* s)
-{
-  if(!s)
-    return METHOD_INVALID;  const struct localHash* p=Marshaller_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<Methods>(p->idx) : METHOD_INVALID;
-}
-
-RPC2Command* Marshaller::fromString(const std::string& s)
-{
-  RPC2Command* rv=0;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-
-    if(!reader.parse(s,json,false))  return 0;    if(!(rv=fromJSON(json)))  return 0;
-  }
-  catch(...)
-  {
-    return 0;
-  }
-  return rv;
-}
-
-std::string Marshaller::toString(const RPC2Command* msg)
-{
-  if(!msg)  return "";
-
-  Json::Value json=toJSON(msg);
-
-  if(json.isNull()) return "";
-
-  Json::FastWriter writer;
-  std::string rv;
-  return writer.write(json);
-}
-
-RPC2Command* Marshaller::fromJSON(const Json::Value& json)
-{
-  if(!json.isObject())  return 0;
-  if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return 0;
-
-  if(json.isMember("error"))				// error
-  {
-    RPC2Error rv;
-    if(!RPC2ErrorMarshaller::fromJSON(json,rv))  return 0;
-
-    return new RPC2Error(rv);
-  }
-
-  if(!json.isMember("id"))				// notification
-  {
-    if(!json.isMember("method") || !json["method"].isString())  return 0;
-
-    Methods m=getIndex(json["method"].asString().c_str());
-
-    switch(m)
-    {
-      case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPDEACTIVATED:
-      {
-        NsRPC2Communication::BasicCommunication::OnAppDeactivated *rv=new NsRPC2Communication::BasicCommunication::OnAppDeactivated;
-        return NsRPC2Communication::BasicCommunication::OnAppDeactivatedMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPREGISTERED:
-      {
-        NsRPC2Communication::BasicCommunication::OnAppRegistered *rv=new NsRPC2Communication::BasicCommunication::OnAppRegistered;
-        return NsRPC2Communication::BasicCommunication::OnAppRegisteredMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPUNREGISTERED:
-      {
-        NsRPC2Communication::BasicCommunication::OnAppUnregistered *rv=new NsRPC2Communication::BasicCommunication::OnAppUnregistered;
-        return NsRPC2Communication::BasicCommunication::OnAppUnregisteredMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONDEVICELISTUPDATED:
-      {
-        NsRPC2Communication::BasicCommunication::OnDeviceListUpdated *rv=new NsRPC2Communication::BasicCommunication::OnDeviceListUpdated;
-        return NsRPC2Communication::BasicCommunication::OnDeviceListUpdatedMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_BUTTONS__ONBUTTONEVENT:
-      {
-        NsRPC2Communication::Buttons::OnButtonEvent *rv=new NsRPC2Communication::Buttons::OnButtonEvent;
-        return NsRPC2Communication::Buttons::OnButtonEventMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_BUTTONS__ONBUTTONPRESS:
-      {
-        NsRPC2Communication::Buttons::OnButtonPress *rv=new NsRPC2Communication::Buttons::OnButtonPress;
-        return NsRPC2Communication::Buttons::OnButtonPressMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_TTS__ONLANGUAGECHANGE:
-      {
-        NsRPC2Communication::TTS::OnLanguageChange *rv=new NsRPC2Communication::TTS::OnLanguageChange;
-        return NsRPC2Communication::TTS::OnLanguageChangeMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__ONCOMMAND:
-      {
-        NsRPC2Communication::UI::OnCommand *rv=new NsRPC2Communication::UI::OnCommand;
-        return NsRPC2Communication::UI::OnCommandMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__ONDEVICECHOSEN:
-      {
-        NsRPC2Communication::UI::OnDeviceChosen *rv=new NsRPC2Communication::UI::OnDeviceChosen;
-        return NsRPC2Communication::UI::OnDeviceChosenMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__ONDRIVERDISTRACTION:
-      {
-        NsRPC2Communication::UI::OnDriverDistraction *rv=new NsRPC2Communication::UI::OnDriverDistraction;
-        return NsRPC2Communication::UI::OnDriverDistractionMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__ONLANGUAGECHANGE:
-      {
-        NsRPC2Communication::UI::OnLanguageChange *rv=new NsRPC2Communication::UI::OnLanguageChange;
-        return NsRPC2Communication::UI::OnLanguageChangeMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__ONREADY:
-      {
-        NsRPC2Communication::UI::OnReady *rv=new NsRPC2Communication::UI::OnReady;
-        return NsRPC2Communication::UI::OnReadyMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__ONSYSTEMCONTEXT:
-      {
-        NsRPC2Communication::UI::OnSystemContext *rv=new NsRPC2Communication::UI::OnSystemContext;
-        return NsRPC2Communication::UI::OnSystemContextMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__ONTBTCLIENTSTATE:
-      {
-        NsRPC2Communication::UI::OnTBTClientState *rv=new NsRPC2Communication::UI::OnTBTClientState;
-        return NsRPC2Communication::UI::OnTBTClientStateMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VR__ONCOMMAND:
-      {
-        NsRPC2Communication::VR::OnCommand *rv=new NsRPC2Communication::VR::OnCommand;
-        return NsRPC2Communication::VR::OnCommandMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VR__ONLANGUAGECHANGE:
-      {
-        NsRPC2Communication::VR::OnLanguageChange *rv=new NsRPC2Communication::VR::OnLanguageChange;
-        return NsRPC2Communication::VR::OnLanguageChangeMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__ONVEHICLEDATA:
-      {
-        NsRPC2Communication::VehicleInfo::OnVehicleData *rv=new NsRPC2Communication::VehicleInfo::OnVehicleData;
-        return NsRPC2Communication::VehicleInfo::OnVehicleDataMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      default:
-        return 0;
-    }
-    return 0;
-  }
-
-  if(json.isMember("method"))				// request
-  {
-    if(!json["id"].isInt())  return 0;
-
-    Methods m=getIndex(json["method"].asString().c_str());
-    switch(m)
-    {
-      case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ACTIVATEAPP:
-      {
-        NsRPC2Communication::BasicCommunication::ActivateApp *rv=new NsRPC2Communication::BasicCommunication::ActivateApp;
-        return NsRPC2Communication::BasicCommunication::ActivateAppMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETAPPLIST:
-      {
-        NsRPC2Communication::BasicCommunication::GetAppList *rv=new NsRPC2Communication::BasicCommunication::GetAppList;
-        return NsRPC2Communication::BasicCommunication::GetAppListMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETDEVICELIST:
-      {
-        NsRPC2Communication::BasicCommunication::GetDeviceList *rv=new NsRPC2Communication::BasicCommunication::GetDeviceList;
-        return NsRPC2Communication::BasicCommunication::GetDeviceListMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-
-      case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__SENDDATA:
-      {
-        NsRPC2Communication::BasicCommunication::SendData *rv=new NsRPC2Communication::BasicCommunication::SendData;
-        return NsRPC2Communication::BasicCommunication::SendDataMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_BUTTONS__GETCAPABILITIES:
-      {
-        NsRPC2Communication::Buttons::GetCapabilities *rv=new NsRPC2Communication::Buttons::GetCapabilities;
-        return NsRPC2Communication::Buttons::GetCapabilitiesMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_TTS__CHANGEREGISTRATION:
-      {
-        NsRPC2Communication::TTS::ChangeRegistration *rv=new NsRPC2Communication::TTS::ChangeRegistration;
-        return NsRPC2Communication::TTS::ChangeRegistrationMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_TTS__GETCAPABILITIES:
-      {
-        NsRPC2Communication::TTS::GetCapabilities *rv=new NsRPC2Communication::TTS::GetCapabilities;
-        return NsRPC2Communication::TTS::GetCapabilitiesMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_TTS__GETLANGUAGE:
-      {
-        NsRPC2Communication::TTS::GetLanguage *rv=new NsRPC2Communication::TTS::GetLanguage;
-        return NsRPC2Communication::TTS::GetLanguageMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_TTS__GETSUPPORTEDLANGUAGES:
-      {
-        NsRPC2Communication::TTS::GetSupportedLanguages *rv=new NsRPC2Communication::TTS::GetSupportedLanguages;
-        return NsRPC2Communication::TTS::GetSupportedLanguagesMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_TTS__SPEAK:
-      {
-        NsRPC2Communication::TTS::Speak *rv=new NsRPC2Communication::TTS::Speak;
-        return NsRPC2Communication::TTS::SpeakMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__ADDCOMMAND:
-      {
-        NsRPC2Communication::UI::AddCommand *rv=new NsRPC2Communication::UI::AddCommand;
-        return NsRPC2Communication::UI::AddCommandMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__ADDSUBMENU:
-      {
-        NsRPC2Communication::UI::AddSubMenu *rv=new NsRPC2Communication::UI::AddSubMenu;
-        return NsRPC2Communication::UI::AddSubMenuMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__ALERT:
-      {
-        NsRPC2Communication::UI::Alert *rv=new NsRPC2Communication::UI::Alert;
-        return NsRPC2Communication::UI::AlertMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__ALERTMANEUVER:
-      {
-        NsRPC2Communication::UI::AlertManeuver *rv=new NsRPC2Communication::UI::AlertManeuver;
-        return NsRPC2Communication::UI::AlertManeuverMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__CHANGEREGISTRATION:
-      {
-        NsRPC2Communication::UI::ChangeRegistration *rv=new NsRPC2Communication::UI::ChangeRegistration;
-        return NsRPC2Communication::UI::ChangeRegistrationMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__CREATEINTERACTIONCHOICESET:
-      {
-        NsRPC2Communication::UI::CreateInteractionChoiceSet *rv=new NsRPC2Communication::UI::CreateInteractionChoiceSet;
-        return NsRPC2Communication::UI::CreateInteractionChoiceSetMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__DELETECOMMAND:
-      {
-        NsRPC2Communication::UI::DeleteCommand *rv=new NsRPC2Communication::UI::DeleteCommand;
-        return NsRPC2Communication::UI::DeleteCommandMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__DELETEINTERACTIONCHOICESET:
-      {
-        NsRPC2Communication::UI::DeleteInteractionChoiceSet *rv=new NsRPC2Communication::UI::DeleteInteractionChoiceSet;
-        return NsRPC2Communication::UI::DeleteInteractionChoiceSetMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__DELETESUBMENU:
-      {
-        NsRPC2Communication::UI::DeleteSubMenu *rv=new NsRPC2Communication::UI::DeleteSubMenu;
-        return NsRPC2Communication::UI::DeleteSubMenuMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__DIALNUMBER:
-      {
-        NsRPC2Communication::UI::DialNumber *rv=new NsRPC2Communication::UI::DialNumber;
-        return NsRPC2Communication::UI::DialNumberMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__ENDAUDIOPASSTHRU:
-      {
-        NsRPC2Communication::UI::EndAudioPassThru *rv=new NsRPC2Communication::UI::EndAudioPassThru;
-        return NsRPC2Communication::UI::EndAudioPassThruMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__GETCAPABILITIES:
-      {
-        NsRPC2Communication::UI::GetCapabilities *rv=new NsRPC2Communication::UI::GetCapabilities;
-        return NsRPC2Communication::UI::GetCapabilitiesMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__GETLANGUAGE:
-      {
-        NsRPC2Communication::UI::GetLanguage *rv=new NsRPC2Communication::UI::GetLanguage;
-        return NsRPC2Communication::UI::GetLanguageMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__GETSUPPORTEDLANGUAGES:
-      {
-        NsRPC2Communication::UI::GetSupportedLanguages *rv=new NsRPC2Communication::UI::GetSupportedLanguages;
-        return NsRPC2Communication::UI::GetSupportedLanguagesMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__PERFORMAUDIOPASSTHRU:
-      {
-        NsRPC2Communication::UI::PerformAudioPassThru *rv=new NsRPC2Communication::UI::PerformAudioPassThru;
-        return NsRPC2Communication::UI::PerformAudioPassThruMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__PERFORMINTERACTION:
-      {
-        NsRPC2Communication::UI::PerformInteraction *rv=new NsRPC2Communication::UI::PerformInteraction;
-        return NsRPC2Communication::UI::PerformInteractionMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__RESETGLOBALPROPERTIES:
-      {
-        NsRPC2Communication::UI::ResetGlobalProperties *rv=new NsRPC2Communication::UI::ResetGlobalProperties;
-        return NsRPC2Communication::UI::ResetGlobalPropertiesMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__SCROLLABLEMESSAGE:
-      {
-        NsRPC2Communication::UI::ScrollableMessage *rv=new NsRPC2Communication::UI::ScrollableMessage;
-        return NsRPC2Communication::UI::ScrollableMessageMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__SETAPPICON:
-      {
-        NsRPC2Communication::UI::SetAppIcon *rv=new NsRPC2Communication::UI::SetAppIcon;
-        return NsRPC2Communication::UI::SetAppIconMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__SETDISPLAYLAYOUT:
-      {
-        NsRPC2Communication::UI::SetDisplayLayout *rv=new NsRPC2Communication::UI::SetDisplayLayout;
-        return NsRPC2Communication::UI::SetDisplayLayoutMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__SETGLOBALPROPERTIES:
-      {
-        NsRPC2Communication::UI::SetGlobalProperties *rv=new NsRPC2Communication::UI::SetGlobalProperties;
-        return NsRPC2Communication::UI::SetGlobalPropertiesMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__SETMEDIACLOCKTIMER:
-      {
-        NsRPC2Communication::UI::SetMediaClockTimer *rv=new NsRPC2Communication::UI::SetMediaClockTimer;
-        return NsRPC2Communication::UI::SetMediaClockTimerMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__SHOW:
-      {
-        NsRPC2Communication::UI::Show *rv=new NsRPC2Communication::UI::Show;
-        return NsRPC2Communication::UI::ShowMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__SHOWCONSTANTTBT:
-      {
-        NsRPC2Communication::UI::ShowConstantTBT *rv=new NsRPC2Communication::UI::ShowConstantTBT;
-        return NsRPC2Communication::UI::ShowConstantTBTMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__SLIDER:
-      {
-        NsRPC2Communication::UI::Slider *rv=new NsRPC2Communication::UI::Slider;
-        return NsRPC2Communication::UI::SliderMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_UI__UPDATETURNLIST:
-      {
-        NsRPC2Communication::UI::UpdateTurnList *rv=new NsRPC2Communication::UI::UpdateTurnList;
-        return NsRPC2Communication::UI::UpdateTurnListMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VR__ADDCOMMAND:
-      {
-        NsRPC2Communication::VR::AddCommand *rv=new NsRPC2Communication::VR::AddCommand;
-        return NsRPC2Communication::VR::AddCommandMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VR__CHANGEREGISTRATION:
-      {
-        NsRPC2Communication::VR::ChangeRegistration *rv=new NsRPC2Communication::VR::ChangeRegistration;
-        return NsRPC2Communication::VR::ChangeRegistrationMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VR__DELETECOMMAND:
-      {
-        NsRPC2Communication::VR::DeleteCommand *rv=new NsRPC2Communication::VR::DeleteCommand;
-        return NsRPC2Communication::VR::DeleteCommandMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VR__GETCAPABILITIES:
-      {
-        NsRPC2Communication::VR::GetCapabilities *rv=new NsRPC2Communication::VR::GetCapabilities;
-        return NsRPC2Communication::VR::GetCapabilitiesMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VR__GETLANGUAGE:
-      {
-        NsRPC2Communication::VR::GetLanguage *rv=new NsRPC2Communication::VR::GetLanguage;
-        return NsRPC2Communication::VR::GetLanguageMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VR__GETSUPPORTEDLANGUAGES:
-      {
-        NsRPC2Communication::VR::GetSupportedLanguages *rv=new NsRPC2Communication::VR::GetSupportedLanguages;
-        return NsRPC2Communication::VR::GetSupportedLanguagesMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETDTCS:
-      {
-        NsRPC2Communication::VehicleInfo::GetDTCs *rv=new NsRPC2Communication::VehicleInfo::GetDTCs;
-        return NsRPC2Communication::VehicleInfo::GetDTCsMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLEDATA:
-      {
-        NsRPC2Communication::VehicleInfo::GetVehicleData *rv=new NsRPC2Communication::VehicleInfo::GetVehicleData;
-        return NsRPC2Communication::VehicleInfo::GetVehicleDataMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLETYPE:
-      {
-        NsRPC2Communication::VehicleInfo::GetVehicleType *rv=new NsRPC2Communication::VehicleInfo::GetVehicleType;
-        return NsRPC2Communication::VehicleInfo::GetVehicleTypeMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__READDID:
-      {
-        NsRPC2Communication::VehicleInfo::ReadDID *rv=new NsRPC2Communication::VehicleInfo::ReadDID;
-        return NsRPC2Communication::VehicleInfo::ReadDIDMarshaller::fromJSON(json,*rv) ? rv : 0;
-      }
-      default:
-        return 0;
-    }
-    return 0;
-  }
-							// response
-  if(!json.isMember("result"))  return 0;
-
-  if(!json["id"].isInt()) return 0;
-
-// here is extension of protocol, two fields added: _Result and _Method
-  if(!json["result"].isMember("resultCode") || !json["result"]["resultCode"].isString())  return 0;
-  if(!json["result"].isMember("method") || !json["result"]["method"].isString())  return 0;
-
-  Methods m=getIndex(json["result"]["method"].asString().c_str());
-
-  switch(m)
-  {
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ACTIVATEAPPRESPONSE:
-    {
-      NsRPC2Communication::BasicCommunication::ActivateAppResponse *rv=new NsRPC2Communication::BasicCommunication::ActivateAppResponse;
-      return NsRPC2Communication::BasicCommunication::ActivateAppResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETAPPLISTRESPONSE:
-    {
-      NsRPC2Communication::BasicCommunication::GetAppListResponse *rv=new NsRPC2Communication::BasicCommunication::GetAppListResponse;
-      return NsRPC2Communication::BasicCommunication::GetAppListResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETDEVICELISTRESPONSE:
-    {
-      NsRPC2Communication::BasicCommunication::GetDeviceListResponse *rv=new NsRPC2Communication::BasicCommunication::GetDeviceListResponse;
-      return NsRPC2Communication::BasicCommunication::GetDeviceListResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__SENDDATARESPONSE:
-    {
-      NsRPC2Communication::BasicCommunication::SendDataResponse *rv=new NsRPC2Communication::BasicCommunication::SendDataResponse;
-      return NsRPC2Communication::BasicCommunication::SendDataResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_BUTTONS__GETCAPABILITIESRESPONSE:
-    {
-      NsRPC2Communication::Buttons::GetCapabilitiesResponse *rv=new NsRPC2Communication::Buttons::GetCapabilitiesResponse;
-      return NsRPC2Communication::Buttons::GetCapabilitiesResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_TTS__CHANGEREGISTRATIONRESPONSE:
-    {
-      NsRPC2Communication::TTS::ChangeRegistrationResponse *rv=new NsRPC2Communication::TTS::ChangeRegistrationResponse;
-      return NsRPC2Communication::TTS::ChangeRegistrationResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_TTS__GETCAPABILITIESRESPONSE:
-    {
-      NsRPC2Communication::TTS::GetCapabilitiesResponse *rv=new NsRPC2Communication::TTS::GetCapabilitiesResponse;
-      return NsRPC2Communication::TTS::GetCapabilitiesResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_TTS__GETLANGUAGERESPONSE:
-    {
-      NsRPC2Communication::TTS::GetLanguageResponse *rv=new NsRPC2Communication::TTS::GetLanguageResponse;
-      return NsRPC2Communication::TTS::GetLanguageResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_TTS__GETSUPPORTEDLANGUAGESRESPONSE:
-    {
-      NsRPC2Communication::TTS::GetSupportedLanguagesResponse *rv=new NsRPC2Communication::TTS::GetSupportedLanguagesResponse;
-      return NsRPC2Communication::TTS::GetSupportedLanguagesResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_TTS__SPEAKRESPONSE:
-    {
-      NsRPC2Communication::TTS::SpeakResponse *rv=new NsRPC2Communication::TTS::SpeakResponse;
-      return NsRPC2Communication::TTS::SpeakResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__ADDCOMMANDRESPONSE:
-    {
-      NsRPC2Communication::UI::AddCommandResponse *rv=new NsRPC2Communication::UI::AddCommandResponse;
-      return NsRPC2Communication::UI::AddCommandResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__ADDSUBMENURESPONSE:
-    {
-      NsRPC2Communication::UI::AddSubMenuResponse *rv=new NsRPC2Communication::UI::AddSubMenuResponse;
-      return NsRPC2Communication::UI::AddSubMenuResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__ALERTRESPONSE:
-    {
-      NsRPC2Communication::UI::AlertResponse *rv=new NsRPC2Communication::UI::AlertResponse;
-      return NsRPC2Communication::UI::AlertResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__ALERTMANEUVERRESPONSE:
-    {
-      NsRPC2Communication::UI::AlertManeuverResponse *rv=new NsRPC2Communication::UI::AlertManeuverResponse;
-      return NsRPC2Communication::UI::AlertManeuverResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__CHANGEREGISTRATIONRESPONSE:
-    {
-      NsRPC2Communication::UI::ChangeRegistrationResponse *rv=new NsRPC2Communication::UI::ChangeRegistrationResponse;
-      return NsRPC2Communication::UI::ChangeRegistrationResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__CREATEINTERACTIONCHOICESETRESPONSE:
-    {
-      NsRPC2Communication::UI::CreateInteractionChoiceSetResponse *rv=new NsRPC2Communication::UI::CreateInteractionChoiceSetResponse;
-      return NsRPC2Communication::UI::CreateInteractionChoiceSetResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__DELETECOMMANDRESPONSE:
-    {
-      NsRPC2Communication::UI::DeleteCommandResponse *rv=new NsRPC2Communication::UI::DeleteCommandResponse;
-      return NsRPC2Communication::UI::DeleteCommandResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__DELETEINTERACTIONCHOICESETRESPONSE:
-    {
-      NsRPC2Communication::UI::DeleteInteractionChoiceSetResponse *rv=new NsRPC2Communication::UI::DeleteInteractionChoiceSetResponse;
-      return NsRPC2Communication::UI::DeleteInteractionChoiceSetResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__DELETESUBMENURESPONSE:
-    {
-      NsRPC2Communication::UI::DeleteSubMenuResponse *rv=new NsRPC2Communication::UI::DeleteSubMenuResponse;
-      return NsRPC2Communication::UI::DeleteSubMenuResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__DIALNUMBERRESPONSE:
-    {
-      NsRPC2Communication::UI::DialNumberResponse *rv=new NsRPC2Communication::UI::DialNumberResponse;
-      return NsRPC2Communication::UI::DialNumberResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__ENDAUDIOPASSTHRURESPONSE:
-    {
-      NsRPC2Communication::UI::EndAudioPassThruResponse *rv=new NsRPC2Communication::UI::EndAudioPassThruResponse;
-      return NsRPC2Communication::UI::EndAudioPassThruResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__GETCAPABILITIESRESPONSE:
-    {
-      NsRPC2Communication::UI::GetCapabilitiesResponse *rv=new NsRPC2Communication::UI::GetCapabilitiesResponse;
-      return NsRPC2Communication::UI::GetCapabilitiesResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__GETLANGUAGERESPONSE:
-    {
-      NsRPC2Communication::UI::GetLanguageResponse *rv=new NsRPC2Communication::UI::GetLanguageResponse;
-      return NsRPC2Communication::UI::GetLanguageResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__GETSUPPORTEDLANGUAGESRESPONSE:
-    {
-      NsRPC2Communication::UI::GetSupportedLanguagesResponse *rv=new NsRPC2Communication::UI::GetSupportedLanguagesResponse;
-      return NsRPC2Communication::UI::GetSupportedLanguagesResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__PERFORMAUDIOPASSTHRURESPONSE:
-    {
-      NsRPC2Communication::UI::PerformAudioPassThruResponse *rv=new NsRPC2Communication::UI::PerformAudioPassThruResponse;
-      return NsRPC2Communication::UI::PerformAudioPassThruResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__PERFORMINTERACTIONRESPONSE:
-    {
-      NsRPC2Communication::UI::PerformInteractionResponse *rv=new NsRPC2Communication::UI::PerformInteractionResponse;
-      return NsRPC2Communication::UI::PerformInteractionResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__RESETGLOBALPROPERTIESRESPONSE:
-    {
-      NsRPC2Communication::UI::ResetGlobalPropertiesResponse *rv=new NsRPC2Communication::UI::ResetGlobalPropertiesResponse;
-      return NsRPC2Communication::UI::ResetGlobalPropertiesResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__SCROLLABLEMESSAGERESPONSE:
-    {
-      NsRPC2Communication::UI::ScrollableMessageResponse *rv=new NsRPC2Communication::UI::ScrollableMessageResponse;
-      return NsRPC2Communication::UI::ScrollableMessageResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__SETAPPICONRESPONSE:
-    {
-      NsRPC2Communication::UI::SetAppIconResponse *rv=new NsRPC2Communication::UI::SetAppIconResponse;
-      return NsRPC2Communication::UI::SetAppIconResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__SETDISPLAYLAYOUTRESPONSE:
-    {
-      NsRPC2Communication::UI::SetDisplayLayoutResponse *rv=new NsRPC2Communication::UI::SetDisplayLayoutResponse;
-      return NsRPC2Communication::UI::SetDisplayLayoutResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__SETGLOBALPROPERTIESRESPONSE:
-    {
-      NsRPC2Communication::UI::SetGlobalPropertiesResponse *rv=new NsRPC2Communication::UI::SetGlobalPropertiesResponse;
-      return NsRPC2Communication::UI::SetGlobalPropertiesResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__SETMEDIACLOCKTIMERRESPONSE:
-    {
-      NsRPC2Communication::UI::SetMediaClockTimerResponse *rv=new NsRPC2Communication::UI::SetMediaClockTimerResponse;
-      return NsRPC2Communication::UI::SetMediaClockTimerResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__SHOWRESPONSE:
-    {
-      NsRPC2Communication::UI::ShowResponse *rv=new NsRPC2Communication::UI::ShowResponse;
-      return NsRPC2Communication::UI::ShowResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__SHOWCONSTANTTBTRESPONSE:
-    {
-      NsRPC2Communication::UI::ShowConstantTBTResponse *rv=new NsRPC2Communication::UI::ShowConstantTBTResponse;
-      return NsRPC2Communication::UI::ShowConstantTBTResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__SLIDERRESPONSE:
-    {
-      NsRPC2Communication::UI::SliderResponse *rv=new NsRPC2Communication::UI::SliderResponse;
-      return NsRPC2Communication::UI::SliderResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_UI__UPDATETURNLISTRESPONSE:
-    {
-      NsRPC2Communication::UI::UpdateTurnListResponse *rv=new NsRPC2Communication::UI::UpdateTurnListResponse;
-      return NsRPC2Communication::UI::UpdateTurnListResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_VR__ADDCOMMANDRESPONSE:
-    {
-      NsRPC2Communication::VR::AddCommandResponse *rv=new NsRPC2Communication::VR::AddCommandResponse;
-      return NsRPC2Communication::VR::AddCommandResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_VR__CHANGEREGISTRATIONRESPONSE:
-    {
-      NsRPC2Communication::VR::ChangeRegistrationResponse *rv=new NsRPC2Communication::VR::ChangeRegistrationResponse;
-      return NsRPC2Communication::VR::ChangeRegistrationResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_VR__DELETECOMMANDRESPONSE:
-    {
-      NsRPC2Communication::VR::DeleteCommandResponse *rv=new NsRPC2Communication::VR::DeleteCommandResponse;
-      return NsRPC2Communication::VR::DeleteCommandResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_VR__GETCAPABILITIESRESPONSE:
-    {
-      NsRPC2Communication::VR::GetCapabilitiesResponse *rv=new NsRPC2Communication::VR::GetCapabilitiesResponse;
-      return NsRPC2Communication::VR::GetCapabilitiesResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_VR__GETLANGUAGERESPONSE:
-    {
-      NsRPC2Communication::VR::GetLanguageResponse *rv=new NsRPC2Communication::VR::GetLanguageResponse;
-      return NsRPC2Communication::VR::GetLanguageResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_VR__GETSUPPORTEDLANGUAGESRESPONSE:
-    {
-      NsRPC2Communication::VR::GetSupportedLanguagesResponse *rv=new NsRPC2Communication::VR::GetSupportedLanguagesResponse;
-      return NsRPC2Communication::VR::GetSupportedLanguagesResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETDTCSRESPONSE:
-    {
-      NsRPC2Communication::VehicleInfo::GetDTCsResponse *rv=new NsRPC2Communication::VehicleInfo::GetDTCsResponse;
-      return NsRPC2Communication::VehicleInfo::GetDTCsResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLEDATARESPONSE:
-    {
-      NsRPC2Communication::VehicleInfo::GetVehicleDataResponse *rv=new NsRPC2Communication::VehicleInfo::GetVehicleDataResponse;
-      return NsRPC2Communication::VehicleInfo::GetVehicleDataResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLETYPERESPONSE:
-    {
-      NsRPC2Communication::VehicleInfo::GetVehicleTypeResponse *rv=new NsRPC2Communication::VehicleInfo::GetVehicleTypeResponse;
-      return NsRPC2Communication::VehicleInfo::GetVehicleTypeResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__READDIDRESPONSE:
-    {
-      NsRPC2Communication::VehicleInfo::ReadDIDResponse *rv=new NsRPC2Communication::VehicleInfo::ReadDIDResponse;
-      return NsRPC2Communication::VehicleInfo::ReadDIDResponseMarshaller::fromJSON(json,*rv) ? rv : 0;
-    }
-    default:
-      return 0;
-  }
-
-  return 0;
-}
-
-
-Json::Value Marshaller::Notification2JSON(const NsRPC2Communication::RPC2Notification* msg)
-{
-  Json::Value j=Json::Value(Json::nullValue);
-  if(!msg) return j;
-
-  switch(msg->getMethod())
-  {
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPREGISTERED:
-      return NsRPC2Communication::BasicCommunication::OnAppRegisteredMarshaller::toJSON(*static_cast<const NsRPC2Communication::BasicCommunication::OnAppRegistered*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPUNREGISTERED:
-      return NsRPC2Communication::BasicCommunication::OnAppUnregisteredMarshaller::toJSON(*static_cast<const NsRPC2Communication::BasicCommunication::OnAppUnregistered*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONDEVICELISTUPDATED:
-      return NsRPC2Communication::BasicCommunication::OnDeviceListUpdatedMarshaller::toJSON(*static_cast<const NsRPC2Communication::BasicCommunication::OnDeviceListUpdated*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BUTTONS__ONBUTTONEVENT:
-      return NsRPC2Communication::Buttons::OnButtonEventMarshaller::toJSON(*static_cast<const NsRPC2Communication::Buttons::OnButtonEvent*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BUTTONS__ONBUTTONPRESS:
-      return NsRPC2Communication::Buttons::OnButtonPressMarshaller::toJSON(*static_cast<const NsRPC2Communication::Buttons::OnButtonPress*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_TTS__ONLANGUAGECHANGE:
-      return NsRPC2Communication::TTS::OnLanguageChangeMarshaller::toJSON(*static_cast<const NsRPC2Communication::TTS::OnLanguageChange*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ONCOMMAND:
-      return NsRPC2Communication::UI::OnCommandMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::OnCommand*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ONDEVICECHOSEN:
-      return NsRPC2Communication::UI::OnDeviceChosenMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::OnDeviceChosen*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ONDRIVERDISTRACTION:
-      return NsRPC2Communication::UI::OnDriverDistractionMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::OnDriverDistraction*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ONLANGUAGECHANGE:
-      return NsRPC2Communication::UI::OnLanguageChangeMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::OnLanguageChange*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ONREADY:
-      return NsRPC2Communication::UI::OnReadyMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::OnReady*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ONSYSTEMCONTEXT:
-      return NsRPC2Communication::UI::OnSystemContextMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::OnSystemContext*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ONTBTCLIENTSTATE:
-      return NsRPC2Communication::UI::OnTBTClientStateMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::OnTBTClientState*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__ONCOMMAND:
-      return NsRPC2Communication::VR::OnCommandMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::OnCommand*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__ONLANGUAGECHANGE:
-      return NsRPC2Communication::VR::OnLanguageChangeMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::OnLanguageChange*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__ONVEHICLEDATA:
-      return NsRPC2Communication::VehicleInfo::OnVehicleDataMarshaller::toJSON(*static_cast<const NsRPC2Communication::VehicleInfo::OnVehicleData*>(msg));
-    default:
-      return j;
-  }
-}
-
-
-Json::Value Marshaller::Request2JSON(const NsRPC2Communication::RPC2Request* msg)
-{
-  Json::Value j=Json::Value(Json::nullValue);
-  if(!msg) return j;
-  switch(msg->getMethod())
-  {
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ACTIVATEAPP:
-      return NsRPC2Communication::BasicCommunication::ActivateAppMarshaller::toJSON(*static_cast<const NsRPC2Communication::BasicCommunication::ActivateApp*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETAPPLIST:
-      return NsRPC2Communication::BasicCommunication::GetAppListMarshaller::toJSON(*static_cast<const NsRPC2Communication::BasicCommunication::GetAppList*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETDEVICELIST:
-      return NsRPC2Communication::BasicCommunication::GetDeviceListMarshaller::toJSON(*static_cast<const NsRPC2Communication::BasicCommunication::GetDeviceList*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPDEACTIVATED:
-      return NsRPC2Communication::BasicCommunication::OnAppDeactivatedMarshaller::toJSON(*static_cast<const NsRPC2Communication::BasicCommunication::OnAppDeactivated*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__SENDDATA:
-      return NsRPC2Communication::BasicCommunication::SendDataMarshaller::toJSON(*static_cast<const NsRPC2Communication::BasicCommunication::SendData*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BUTTONS__GETCAPABILITIES:
-      return NsRPC2Communication::Buttons::GetCapabilitiesMarshaller::toJSON(*static_cast<const NsRPC2Communication::Buttons::GetCapabilities*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_TTS__CHANGEREGISTRATION:
-      return NsRPC2Communication::TTS::ChangeRegistrationMarshaller::toJSON(*static_cast<const NsRPC2Communication::TTS::ChangeRegistration*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_TTS__GETCAPABILITIES:
-      return NsRPC2Communication::TTS::GetCapabilitiesMarshaller::toJSON(*static_cast<const NsRPC2Communication::TTS::GetCapabilities*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_TTS__GETLANGUAGE:
-      return NsRPC2Communication::TTS::GetLanguageMarshaller::toJSON(*static_cast<const NsRPC2Communication::TTS::GetLanguage*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_TTS__GETSUPPORTEDLANGUAGES:
-      return NsRPC2Communication::TTS::GetSupportedLanguagesMarshaller::toJSON(*static_cast<const NsRPC2Communication::TTS::GetSupportedLanguages*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_TTS__SPEAK:
-      return NsRPC2Communication::TTS::SpeakMarshaller::toJSON(*static_cast<const NsRPC2Communication::TTS::Speak*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ADDCOMMAND:
-      return NsRPC2Communication::UI::AddCommandMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::AddCommand*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ADDSUBMENU:
-      return NsRPC2Communication::UI::AddSubMenuMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::AddSubMenu*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ALERT:
-      return NsRPC2Communication::UI::AlertMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::Alert*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ALERTMANEUVER:
-      return NsRPC2Communication::UI::AlertManeuverMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::AlertManeuver*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__CHANGEREGISTRATION:
-      return NsRPC2Communication::UI::ChangeRegistrationMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::ChangeRegistration*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__CREATEINTERACTIONCHOICESET:
-      return NsRPC2Communication::UI::CreateInteractionChoiceSetMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::CreateInteractionChoiceSet*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__DELETECOMMAND:
-      return NsRPC2Communication::UI::DeleteCommandMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::DeleteCommand*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__DELETEINTERACTIONCHOICESET:
-      return NsRPC2Communication::UI::DeleteInteractionChoiceSetMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::DeleteInteractionChoiceSet*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__DELETESUBMENU:
-      return NsRPC2Communication::UI::DeleteSubMenuMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::DeleteSubMenu*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__DIALNUMBER:
-      return NsRPC2Communication::UI::DialNumberMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::DialNumber*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ENDAUDIOPASSTHRU:
-      return NsRPC2Communication::UI::EndAudioPassThruMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::EndAudioPassThru*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__GETCAPABILITIES:
-      return NsRPC2Communication::UI::GetCapabilitiesMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::GetCapabilities*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__GETLANGUAGE:
-      return NsRPC2Communication::UI::GetLanguageMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::GetLanguage*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__GETSUPPORTEDLANGUAGES:
-      return NsRPC2Communication::UI::GetSupportedLanguagesMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::GetSupportedLanguages*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__PERFORMAUDIOPASSTHRU:
-      return NsRPC2Communication::UI::PerformAudioPassThruMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::PerformAudioPassThru*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__PERFORMINTERACTION:
-      return NsRPC2Communication::UI::PerformInteractionMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::PerformInteraction*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__RESETGLOBALPROPERTIES:
-      return NsRPC2Communication::UI::ResetGlobalPropertiesMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::ResetGlobalProperties*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SCROLLABLEMESSAGE:
-      return NsRPC2Communication::UI::ScrollableMessageMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::ScrollableMessage*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SETAPPICON:
-      return NsRPC2Communication::UI::SetAppIconMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::SetAppIcon*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SETDISPLAYLAYOUT:
-      return NsRPC2Communication::UI::SetDisplayLayoutMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::SetDisplayLayout*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SETGLOBALPROPERTIES:
-      return NsRPC2Communication::UI::SetGlobalPropertiesMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::SetGlobalProperties*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SETMEDIACLOCKTIMER:
-      return NsRPC2Communication::UI::SetMediaClockTimerMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::SetMediaClockTimer*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SHOW:
-      return NsRPC2Communication::UI::ShowMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::Show*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SHOWCONSTANTTBT:
-      return NsRPC2Communication::UI::ShowConstantTBTMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::ShowConstantTBT*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SLIDER:
-      return NsRPC2Communication::UI::SliderMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::Slider*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__UPDATETURNLIST:
-      return NsRPC2Communication::UI::UpdateTurnListMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::UpdateTurnList*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__ADDCOMMAND:
-      return NsRPC2Communication::VR::AddCommandMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::AddCommand*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__CHANGEREGISTRATION:
-      return NsRPC2Communication::VR::ChangeRegistrationMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::ChangeRegistration*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__DELETECOMMAND:
-      return NsRPC2Communication::VR::DeleteCommandMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::DeleteCommand*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__GETCAPABILITIES:
-      return NsRPC2Communication::VR::GetCapabilitiesMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::GetCapabilities*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__GETLANGUAGE:
-      return NsRPC2Communication::VR::GetLanguageMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::GetLanguage*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__GETSUPPORTEDLANGUAGES:
-      return NsRPC2Communication::VR::GetSupportedLanguagesMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::GetSupportedLanguages*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETDTCS:
-      return NsRPC2Communication::VehicleInfo::GetDTCsMarshaller::toJSON(*static_cast<const NsRPC2Communication::VehicleInfo::GetDTCs*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLEDATA:
-      return NsRPC2Communication::VehicleInfo::GetVehicleDataMarshaller::toJSON(*static_cast<const NsRPC2Communication::VehicleInfo::GetVehicleData*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLETYPE:
-      return NsRPC2Communication::VehicleInfo::GetVehicleTypeMarshaller::toJSON(*static_cast<const NsRPC2Communication::VehicleInfo::GetVehicleType*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__READDID:
-      return NsRPC2Communication::VehicleInfo::ReadDIDMarshaller::toJSON(*static_cast<const NsRPC2Communication::VehicleInfo::ReadDID*>(msg));
-    default:
-      return j;
-  }
-}
-
-
-Json::Value Marshaller::Response2JSON(const NsRPC2Communication::RPC2Response* msg)
-{
-  Json::Value j=Json::Value(Json::nullValue);
-  if(!msg) return j;
-  switch(msg->getMethod())
-  {
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ACTIVATEAPPRESPONSE:
-      return NsRPC2Communication::BasicCommunication::ActivateAppResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::BasicCommunication::ActivateAppResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETAPPLISTRESPONSE:
-      return NsRPC2Communication::BasicCommunication::GetAppListResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::BasicCommunication::GetAppListResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETDEVICELISTRESPONSE:
-      return NsRPC2Communication::BasicCommunication::GetDeviceListResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::BasicCommunication::GetDeviceListResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__SENDDATARESPONSE:
-      return NsRPC2Communication::BasicCommunication::SendDataResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::BasicCommunication::SendDataResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_BUTTONS__GETCAPABILITIESRESPONSE:
-      return NsRPC2Communication::Buttons::GetCapabilitiesResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::Buttons::GetCapabilitiesResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_TTS__CHANGEREGISTRATIONRESPONSE:
-      return NsRPC2Communication::TTS::ChangeRegistrationResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::TTS::ChangeRegistrationResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_TTS__GETCAPABILITIESRESPONSE:
-      return NsRPC2Communication::TTS::GetCapabilitiesResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::TTS::GetCapabilitiesResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_TTS__GETLANGUAGERESPONSE:
-      return NsRPC2Communication::TTS::GetLanguageResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::TTS::GetLanguageResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_TTS__GETSUPPORTEDLANGUAGESRESPONSE:
-      return NsRPC2Communication::TTS::GetSupportedLanguagesResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::TTS::GetSupportedLanguagesResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_TTS__SPEAKRESPONSE:
-      return NsRPC2Communication::TTS::SpeakResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::TTS::SpeakResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ADDCOMMANDRESPONSE:
-      return NsRPC2Communication::UI::AddCommandResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::AddCommandResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ADDSUBMENURESPONSE:
-      return NsRPC2Communication::UI::AddSubMenuResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::AddSubMenuResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ALERTRESPONSE:
-      return NsRPC2Communication::UI::AlertResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::AlertResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ALERTMANEUVERRESPONSE:
-      return NsRPC2Communication::UI::AlertManeuverResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::AlertManeuverResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__CHANGEREGISTRATIONRESPONSE:
-      return NsRPC2Communication::UI::ChangeRegistrationResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::ChangeRegistrationResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__CREATEINTERACTIONCHOICESETRESPONSE:
-      return NsRPC2Communication::UI::CreateInteractionChoiceSetResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::CreateInteractionChoiceSetResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__DELETECOMMANDRESPONSE:
-      return NsRPC2Communication::UI::DeleteCommandResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::DeleteCommandResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__DELETEINTERACTIONCHOICESETRESPONSE:
-      return NsRPC2Communication::UI::DeleteInteractionChoiceSetResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::DeleteInteractionChoiceSetResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__DELETESUBMENURESPONSE:
-      return NsRPC2Communication::UI::DeleteSubMenuResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::DeleteSubMenuResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__DIALNUMBERRESPONSE:
-      return NsRPC2Communication::UI::DialNumberResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::DialNumberResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__ENDAUDIOPASSTHRURESPONSE:
-      return NsRPC2Communication::UI::EndAudioPassThruResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::EndAudioPassThruResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__GETCAPABILITIESRESPONSE:
-      return NsRPC2Communication::UI::GetCapabilitiesResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::GetCapabilitiesResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__GETLANGUAGERESPONSE:
-      return NsRPC2Communication::UI::GetLanguageResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::GetLanguageResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__GETSUPPORTEDLANGUAGESRESPONSE:
-      return NsRPC2Communication::UI::GetSupportedLanguagesResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::GetSupportedLanguagesResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__PERFORMAUDIOPASSTHRURESPONSE:
-      return NsRPC2Communication::UI::PerformAudioPassThruResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::PerformAudioPassThruResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__PERFORMINTERACTIONRESPONSE:
-      return NsRPC2Communication::UI::PerformInteractionResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::PerformInteractionResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__RESETGLOBALPROPERTIESRESPONSE:
-      return NsRPC2Communication::UI::ResetGlobalPropertiesResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::ResetGlobalPropertiesResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SCROLLABLEMESSAGERESPONSE:
-      return NsRPC2Communication::UI::ScrollableMessageResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::ScrollableMessageResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SETAPPICONRESPONSE:
-      return NsRPC2Communication::UI::SetAppIconResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::SetAppIconResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SETDISPLAYLAYOUTRESPONSE:
-      return NsRPC2Communication::UI::SetDisplayLayoutResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::SetDisplayLayoutResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SETGLOBALPROPERTIESRESPONSE:
-      return NsRPC2Communication::UI::SetGlobalPropertiesResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::SetGlobalPropertiesResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SETMEDIACLOCKTIMERRESPONSE:
-      return NsRPC2Communication::UI::SetMediaClockTimerResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::SetMediaClockTimerResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SHOWRESPONSE:
-      return NsRPC2Communication::UI::ShowResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::ShowResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SHOWCONSTANTTBTRESPONSE:
-      return NsRPC2Communication::UI::ShowConstantTBTResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::ShowConstantTBTResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__SLIDERRESPONSE:
-      return NsRPC2Communication::UI::SliderResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::SliderResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_UI__UPDATETURNLISTRESPONSE:
-      return NsRPC2Communication::UI::UpdateTurnListResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::UI::UpdateTurnListResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__ADDCOMMANDRESPONSE:
-      return NsRPC2Communication::VR::AddCommandResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::AddCommandResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__CHANGEREGISTRATIONRESPONSE:
-      return NsRPC2Communication::VR::ChangeRegistrationResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::ChangeRegistrationResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__DELETECOMMANDRESPONSE:
-      return NsRPC2Communication::VR::DeleteCommandResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::DeleteCommandResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__GETCAPABILITIESRESPONSE:
-      return NsRPC2Communication::VR::GetCapabilitiesResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::GetCapabilitiesResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__GETLANGUAGERESPONSE:
-      return NsRPC2Communication::VR::GetLanguageResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::GetLanguageResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VR__GETSUPPORTEDLANGUAGESRESPONSE:
-      return NsRPC2Communication::VR::GetSupportedLanguagesResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::VR::GetSupportedLanguagesResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETDTCSRESPONSE:
-      return NsRPC2Communication::VehicleInfo::GetDTCsResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::VehicleInfo::GetDTCsResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLEDATARESPONSE:
-      return NsRPC2Communication::VehicleInfo::GetVehicleDataResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::VehicleInfo::GetVehicleDataResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLETYPERESPONSE:
-      return NsRPC2Communication::VehicleInfo::GetVehicleTypeResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::VehicleInfo::GetVehicleTypeResponse*>(msg));
-    case METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__READDIDRESPONSE:
-      return NsRPC2Communication::VehicleInfo::ReadDIDResponseMarshaller::toJSON(*static_cast<const NsRPC2Communication::VehicleInfo::ReadDIDResponse*>(msg));
-    default:
-      return j;
-  }
-}
-
-
-Json::Value Marshaller::toJSON(const RPC2Command* msg)
-{
-  Json::Value j=Json::Value(Json::nullValue);
-  if(!msg) return j;
-
-  switch(msg->getCommandType())
-  {
-    case RPC2Command::REQUEST:
-      return Request2JSON(static_cast<const RPC2Request*>(msg));
-    case RPC2Command::RESPONSE:
-      return Response2JSON(static_cast<const RPC2Response*>(msg));
-    case RPC2Command::NOTIFICATION:
-      return Notification2JSON(static_cast<const RPC2Notification*>(msg));
-
-    case RPC2Command::ERROR:
-      return RPC2ErrorMarshaller::toJSON(*static_cast<const RPC2Error*>(msg));
-
-    case RPC2Command::UNDEFINED:
-    default:
-      return j;
-  }
-}
-
-
-const Marshaller::localHash Marshaller::mHashTable[110]=
-{
-  {"BasicCommunication.ActivateApp",0,&Marshaller::mNsRPC2Communication_BasicCommunication__ActivateApp},
-  {"BasicCommunication.ActivateAppResponse",1,&Marshaller::mNsRPC2Communication_BasicCommunication__ActivateAppResponse},
-  {"BasicCommunication.GetAppList",2,&Marshaller::mNsRPC2Communication_BasicCommunication__GetAppList},
-  {"BasicCommunication.GetAppListResponse",3,&Marshaller::mNsRPC2Communication_BasicCommunication__GetAppListResponse},
-  {"BasicCommunication.GetDeviceList",4,&Marshaller::mNsRPC2Communication_BasicCommunication__GetDeviceList},
-  {"BasicCommunication.GetDeviceListResponse",5,&Marshaller::mNsRPC2Communication_BasicCommunication__GetDeviceListResponse},
-  {"BasicCommunication.OnAppDeactivated",6,&Marshaller::mNsRPC2Communication_BasicCommunication__OnAppDeactivated},
-  {"BasicCommunication.OnAppDeactivatedResponse",7,&Marshaller::mNsRPC2Communication_BasicCommunication__OnAppDeactivated},
-  {"BasicCommunication.OnAppRegistered",8,&Marshaller::mNsRPC2Communication_BasicCommunication__OnAppRegistered},
-  {"BasicCommunication.OnAppUnregistered",9,&Marshaller::mNsRPC2Communication_BasicCommunication__OnAppUnregistered},
-  {"BasicCommunication.OnDeviceListUpdated",10,&Marshaller::mNsRPC2Communication_BasicCommunication__OnDeviceListUpdated},
-  {"BasicCommunication.SendData",11,&Marshaller::mNsRPC2Communication_BasicCommunication__SendData},
-  {"BasicCommunication.SendDataResponse",12,&Marshaller::mNsRPC2Communication_BasicCommunication__SendDataResponse},
-  {"Buttons.GetCapabilities",13,&Marshaller::mNsRPC2Communication_Buttons__GetCapabilities},
-  {"Buttons.GetCapabilitiesResponse",14,&Marshaller::mNsRPC2Communication_Buttons__GetCapabilitiesResponse},
-  {"Buttons.OnButtonEvent",15,&Marshaller::mNsRPC2Communication_Buttons__OnButtonEvent},
-  {"Buttons.OnButtonPress",16,&Marshaller::mNsRPC2Communication_Buttons__OnButtonPress},
-  {"TTS.ChangeRegistration",17,&Marshaller::mNsRPC2Communication_TTS__ChangeRegistration},
-  {"TTS.ChangeRegistrationResponse",18,&Marshaller::mNsRPC2Communication_TTS__ChangeRegistrationResponse},
-  {"TTS.GetCapabilities",19,&Marshaller::mNsRPC2Communication_TTS__GetCapabilities},
-  {"TTS.GetCapabilitiesResponse",20,&Marshaller::mNsRPC2Communication_TTS__GetCapabilitiesResponse},
-  {"TTS.GetLanguage",21,&Marshaller::mNsRPC2Communication_TTS__GetLanguage},
-  {"TTS.GetLanguageResponse",22,&Marshaller::mNsRPC2Communication_TTS__GetLanguageResponse},
-  {"TTS.GetSupportedLanguages",23,&Marshaller::mNsRPC2Communication_TTS__GetSupportedLanguages},
-  {"TTS.GetSupportedLanguagesResponse",24,&Marshaller::mNsRPC2Communication_TTS__GetSupportedLanguagesResponse},
-  {"TTS.OnLanguageChange",25,&Marshaller::mNsRPC2Communication_TTS__OnLanguageChange},
-  {"TTS.Speak",26,&Marshaller::mNsRPC2Communication_TTS__Speak},
-  {"TTS.SpeakResponse",27,&Marshaller::mNsRPC2Communication_TTS__SpeakResponse},
-  {"UI.AddCommand",28,&Marshaller::mNsRPC2Communication_UI__AddCommand},
-  {"UI.AddCommandResponse",29,&Marshaller::mNsRPC2Communication_UI__AddCommandResponse},
-  {"UI.AddSubMenu",30,&Marshaller::mNsRPC2Communication_UI__AddSubMenu},
-  {"UI.AddSubMenuResponse",31,&Marshaller::mNsRPC2Communication_UI__AddSubMenuResponse},
-  {"UI.Alert",32,&Marshaller::mNsRPC2Communication_UI__Alert},
-  {"UI.AlertResponse",33,&Marshaller::mNsRPC2Communication_UI__AlertResponse},
-  {"UI.AlertManeuver",34,&Marshaller::mNsRPC2Communication_UI__AlertManeuver},
-  {"UI.AlertManeuverResponse",35,&Marshaller::mNsRPC2Communication_UI__AlertManeuverResponse},
-  {"UI.ChangeRegistration",36,&Marshaller::mNsRPC2Communication_UI__ChangeRegistration},
-  {"UI.ChangeRegistrationResponse",37,&Marshaller::mNsRPC2Communication_UI__ChangeRegistrationResponse},
-  {"UI.CreateInteractionChoiceSet",38,&Marshaller::mNsRPC2Communication_UI__CreateInteractionChoiceSet},
-  {"UI.CreateInteractionChoiceSetResponse",39,&Marshaller::mNsRPC2Communication_UI__CreateInteractionChoiceSetResponse},
-  {"UI.DeleteCommand",40,&Marshaller::mNsRPC2Communication_UI__DeleteCommand},
-  {"UI.DeleteCommandResponse",41,&Marshaller::mNsRPC2Communication_UI__DeleteCommandResponse},
-  {"UI.DeleteInteractionChoiceSet",42,&Marshaller::mNsRPC2Communication_UI__DeleteInteractionChoiceSet},
-  {"UI.DeleteInteractionChoiceSetResponse",43,&Marshaller::mNsRPC2Communication_UI__DeleteInteractionChoiceSetResponse},
-  {"UI.DeleteSubMenu",44,&Marshaller::mNsRPC2Communication_UI__DeleteSubMenu},
-  {"UI.DeleteSubMenuResponse",45,&Marshaller::mNsRPC2Communication_UI__DeleteSubMenuResponse},
-  {"UI.DialNumber",46,&Marshaller::mNsRPC2Communication_UI__DialNumber},
-  {"UI.DialNumberResponse",47,&Marshaller::mNsRPC2Communication_UI__DialNumberResponse},
-  {"UI.EndAudioPassThru",48,&Marshaller::mNsRPC2Communication_UI__EndAudioPassThru},
-  {"UI.EndAudioPassThruResponse",49,&Marshaller::mNsRPC2Communication_UI__EndAudioPassThruResponse},
-  {"UI.GetCapabilities",50,&Marshaller::mNsRPC2Communication_UI__GetCapabilities},
-  {"UI.GetCapabilitiesResponse",51,&Marshaller::mNsRPC2Communication_UI__GetCapabilitiesResponse},
-  {"UI.GetLanguage",52,&Marshaller::mNsRPC2Communication_UI__GetLanguage},
-  {"UI.GetLanguageResponse",53,&Marshaller::mNsRPC2Communication_UI__GetLanguageResponse},
-  {"UI.GetSupportedLanguages",54,&Marshaller::mNsRPC2Communication_UI__GetSupportedLanguages},
-  {"UI.GetSupportedLanguagesResponse",55,&Marshaller::mNsRPC2Communication_UI__GetSupportedLanguagesResponse},
-  {"UI.OnCommand",56,&Marshaller::mNsRPC2Communication_UI__OnCommand},
-  {"UI.OnDeviceChosen",57,&Marshaller::mNsRPC2Communication_UI__OnDeviceChosen},
-  {"UI.OnDriverDistraction",58,&Marshaller::mNsRPC2Communication_UI__OnDriverDistraction},
-  {"UI.OnLanguageChange",59,&Marshaller::mNsRPC2Communication_UI__OnLanguageChange},
-  {"UI.OnReady",60,&Marshaller::mNsRPC2Communication_UI__OnReady},
-  {"UI.OnSystemContext",61,&Marshaller::mNsRPC2Communication_UI__OnSystemContext},
-  {"UI.OnTBTClientState",62,&Marshaller::mNsRPC2Communication_UI__OnTBTClientState},
-  {"UI.PerformAudioPassThru",63,&Marshaller::mNsRPC2Communication_UI__PerformAudioPassThru},
-  {"UI.PerformAudioPassThruResponse",64,&Marshaller::mNsRPC2Communication_UI__PerformAudioPassThruResponse},
-  {"UI.PerformInteraction",65,&Marshaller::mNsRPC2Communication_UI__PerformInteraction},
-  {"UI.PerformInteractionResponse",66,&Marshaller::mNsRPC2Communication_UI__PerformInteractionResponse},
-  {"UI.ResetGlobalProperties",67,&Marshaller::mNsRPC2Communication_UI__ResetGlobalProperties},
-  {"UI.ResetGlobalPropertiesResponse",68,&Marshaller::mNsRPC2Communication_UI__ResetGlobalPropertiesResponse},
-  {"UI.ScrollableMessage",69,&Marshaller::mNsRPC2Communication_UI__ScrollableMessage},
-  {"UI.ScrollableMessageResponse",70,&Marshaller::mNsRPC2Communication_UI__ScrollableMessageResponse},
-  {"UI.SetAppIcon",71,&Marshaller::mNsRPC2Communication_UI__SetAppIcon},
-  {"UI.SetAppIconResponse",72,&Marshaller::mNsRPC2Communication_UI__SetAppIconResponse},
-  {"UI.SetDisplayLayout",73,&Marshaller::mNsRPC2Communication_UI__SetDisplayLayout},
-  {"UI.SetDisplayLayoutResponse",74,&Marshaller::mNsRPC2Communication_UI__SetDisplayLayoutResponse},
-  {"UI.SetGlobalProperties",75,&Marshaller::mNsRPC2Communication_UI__SetGlobalProperties},
-  {"UI.SetGlobalPropertiesResponse",76,&Marshaller::mNsRPC2Communication_UI__SetGlobalPropertiesResponse},
-  {"UI.SetMediaClockTimer",77,&Marshaller::mNsRPC2Communication_UI__SetMediaClockTimer},
-  {"UI.SetMediaClockTimerResponse",78,&Marshaller::mNsRPC2Communication_UI__SetMediaClockTimerResponse},
-  {"UI.Show",79,&Marshaller::mNsRPC2Communication_UI__Show},
-  {"UI.ShowResponse",80,&Marshaller::mNsRPC2Communication_UI__ShowResponse},
-  {"UI.ShowConstantTBT",81,&Marshaller::mNsRPC2Communication_UI__ShowConstantTBT},
-  {"UI.ShowConstantTBTResponse",82,&Marshaller::mNsRPC2Communication_UI__ShowConstantTBTResponse},
-  {"UI.Slider",83,&Marshaller::mNsRPC2Communication_UI__Slider},
-  {"UI.SliderResponse",84,&Marshaller::mNsRPC2Communication_UI__SliderResponse},
-  {"UI.UpdateTurnList",85,&Marshaller::mNsRPC2Communication_UI__UpdateTurnList},
-  {"UI.UpdateTurnListResponse",86,&Marshaller::mNsRPC2Communication_UI__UpdateTurnListResponse},
-  {"VR.AddCommand",87,&Marshaller::mNsRPC2Communication_VR__AddCommand},
-  {"VR.AddCommandResponse",88,&Marshaller::mNsRPC2Communication_VR__AddCommandResponse},
-  {"VR.ChangeRegistration",89,&Marshaller::mNsRPC2Communication_VR__ChangeRegistration},
-  {"VR.ChangeRegistrationResponse",90,&Marshaller::mNsRPC2Communication_VR__ChangeRegistrationResponse},
-  {"VR.DeleteCommand",91,&Marshaller::mNsRPC2Communication_VR__DeleteCommand},
-  {"VR.DeleteCommandResponse",92,&Marshaller::mNsRPC2Communication_VR__DeleteCommandResponse},
-  {"VR.GetCapabilities",93,&Marshaller::mNsRPC2Communication_VR__GetCapabilities},
-  {"VR.GetCapabilitiesResponse",94,&Marshaller::mNsRPC2Communication_VR__GetCapabilitiesResponse},
-  {"VR.GetLanguage",95,&Marshaller::mNsRPC2Communication_VR__GetLanguage},
-  {"VR.GetLanguageResponse",96,&Marshaller::mNsRPC2Communication_VR__GetLanguageResponse},
-  {"VR.GetSupportedLanguages",97,&Marshaller::mNsRPC2Communication_VR__GetSupportedLanguages},
-  {"VR.GetSupportedLanguagesResponse",98,&Marshaller::mNsRPC2Communication_VR__GetSupportedLanguagesResponse},
-  {"VR.OnCommand",99,&Marshaller::mNsRPC2Communication_VR__OnCommand},
-  {"VR.OnLanguageChange",100,&Marshaller::mNsRPC2Communication_VR__OnLanguageChange},
-  {"VehicleInfo.GetDTCs",101,&Marshaller::mNsRPC2Communication_VehicleInfo__GetDTCs},
-  {"VehicleInfo.GetDTCsResponse",102,&Marshaller::mNsRPC2Communication_VehicleInfo__GetDTCsResponse},
-  {"VehicleInfo.GetVehicleData",103,&Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleData},
-  {"VehicleInfo.GetVehicleDataResponse",104,&Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleDataResponse},
-  {"VehicleInfo.GetVehicleType",105,&Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleType},
-  {"VehicleInfo.GetVehicleTypeResponse",106,&Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleTypeResponse},
-  {"VehicleInfo.OnVehicleData",107,&Marshaller::mNsRPC2Communication_VehicleInfo__OnVehicleData},
-  {"VehicleInfo.ReadDID",108,&Marshaller::mNsRPC2Communication_VehicleInfo__ReadDID},
-  {"VehicleInfo.ReadDIDResponse",109,&Marshaller::mNsRPC2Communication_VehicleInfo__ReadDIDResponse}
-
-};
-
-NsRPC2Communication::RPC2ErrorMarshaller Marshaller::mRPC2ErrorInternal;
-
-NsRPC2Communication::BasicCommunication::ActivateAppMarshaller Marshaller::mNsRPC2Communication_BasicCommunication__ActivateApp;
-NsRPC2Communication::BasicCommunication::ActivateAppResponseMarshaller Marshaller::mNsRPC2Communication_BasicCommunication__ActivateAppResponse;
-NsRPC2Communication::BasicCommunication::GetAppListMarshaller Marshaller::mNsRPC2Communication_BasicCommunication__GetAppList;
-NsRPC2Communication::BasicCommunication::GetAppListResponseMarshaller Marshaller::mNsRPC2Communication_BasicCommunication__GetAppListResponse;
-NsRPC2Communication::BasicCommunication::GetDeviceListMarshaller Marshaller::mNsRPC2Communication_BasicCommunication__GetDeviceList;
-NsRPC2Communication::BasicCommunication::GetDeviceListResponseMarshaller Marshaller::mNsRPC2Communication_BasicCommunication__GetDeviceListResponse;
-NsRPC2Communication::BasicCommunication::OnAppDeactivatedMarshaller Marshaller::mNsRPC2Communication_BasicCommunication__OnAppDeactivated;
-NsRPC2Communication::BasicCommunication::OnAppRegisteredMarshaller Marshaller::mNsRPC2Communication_BasicCommunication__OnAppRegistered;
-NsRPC2Communication::BasicCommunication::OnAppUnregisteredMarshaller Marshaller::mNsRPC2Communication_BasicCommunication__OnAppUnregistered;
-NsRPC2Communication::BasicCommunication::OnDeviceListUpdatedMarshaller Marshaller::mNsRPC2Communication_BasicCommunication__OnDeviceListUpdated;
-NsRPC2Communication::BasicCommunication::SendDataMarshaller Marshaller::mNsRPC2Communication_BasicCommunication__SendData;
-NsRPC2Communication::BasicCommunication::SendDataResponseMarshaller Marshaller::mNsRPC2Communication_BasicCommunication__SendDataResponse;
-NsRPC2Communication::Buttons::GetCapabilitiesMarshaller Marshaller::mNsRPC2Communication_Buttons__GetCapabilities;
-NsRPC2Communication::Buttons::GetCapabilitiesResponseMarshaller Marshaller::mNsRPC2Communication_Buttons__GetCapabilitiesResponse;
-NsRPC2Communication::Buttons::OnButtonEventMarshaller Marshaller::mNsRPC2Communication_Buttons__OnButtonEvent;
-NsRPC2Communication::Buttons::OnButtonPressMarshaller Marshaller::mNsRPC2Communication_Buttons__OnButtonPress;
-NsRPC2Communication::TTS::ChangeRegistrationMarshaller Marshaller::mNsRPC2Communication_TTS__ChangeRegistration;
-NsRPC2Communication::TTS::ChangeRegistrationResponseMarshaller Marshaller::mNsRPC2Communication_TTS__ChangeRegistrationResponse;
-NsRPC2Communication::TTS::GetCapabilitiesMarshaller Marshaller::mNsRPC2Communication_TTS__GetCapabilities;
-NsRPC2Communication::TTS::GetCapabilitiesResponseMarshaller Marshaller::mNsRPC2Communication_TTS__GetCapabilitiesResponse;
-NsRPC2Communication::TTS::GetLanguageMarshaller Marshaller::mNsRPC2Communication_TTS__GetLanguage;
-NsRPC2Communication::TTS::GetLanguageResponseMarshaller Marshaller::mNsRPC2Communication_TTS__GetLanguageResponse;
-NsRPC2Communication::TTS::GetSupportedLanguagesMarshaller Marshaller::mNsRPC2Communication_TTS__GetSupportedLanguages;
-NsRPC2Communication::TTS::GetSupportedLanguagesResponseMarshaller Marshaller::mNsRPC2Communication_TTS__GetSupportedLanguagesResponse;
-NsRPC2Communication::TTS::OnLanguageChangeMarshaller Marshaller::mNsRPC2Communication_TTS__OnLanguageChange;
-NsRPC2Communication::TTS::SpeakMarshaller Marshaller::mNsRPC2Communication_TTS__Speak;
-NsRPC2Communication::TTS::SpeakResponseMarshaller Marshaller::mNsRPC2Communication_TTS__SpeakResponse;
-NsRPC2Communication::UI::AddCommandMarshaller Marshaller::mNsRPC2Communication_UI__AddCommand;
-NsRPC2Communication::UI::AddCommandResponseMarshaller Marshaller::mNsRPC2Communication_UI__AddCommandResponse;
-NsRPC2Communication::UI::AddSubMenuMarshaller Marshaller::mNsRPC2Communication_UI__AddSubMenu;
-NsRPC2Communication::UI::AddSubMenuResponseMarshaller Marshaller::mNsRPC2Communication_UI__AddSubMenuResponse;
-NsRPC2Communication::UI::AlertMarshaller Marshaller::mNsRPC2Communication_UI__Alert;
-NsRPC2Communication::UI::AlertResponseMarshaller Marshaller::mNsRPC2Communication_UI__AlertResponse;
-NsRPC2Communication::UI::AlertManeuverMarshaller Marshaller::mNsRPC2Communication_UI__AlertManeuver;
-NsRPC2Communication::UI::AlertManeuverResponseMarshaller Marshaller::mNsRPC2Communication_UI__AlertManeuverResponse;
-NsRPC2Communication::UI::ChangeRegistrationMarshaller Marshaller::mNsRPC2Communication_UI__ChangeRegistration;
-NsRPC2Communication::UI::ChangeRegistrationResponseMarshaller Marshaller::mNsRPC2Communication_UI__ChangeRegistrationResponse;
-NsRPC2Communication::UI::CreateInteractionChoiceSetMarshaller Marshaller::mNsRPC2Communication_UI__CreateInteractionChoiceSet;
-NsRPC2Communication::UI::CreateInteractionChoiceSetResponseMarshaller Marshaller::mNsRPC2Communication_UI__CreateInteractionChoiceSetResponse;
-NsRPC2Communication::UI::DeleteCommandMarshaller Marshaller::mNsRPC2Communication_UI__DeleteCommand;
-NsRPC2Communication::UI::DeleteCommandResponseMarshaller Marshaller::mNsRPC2Communication_UI__DeleteCommandResponse;
-NsRPC2Communication::UI::DeleteInteractionChoiceSetMarshaller Marshaller::mNsRPC2Communication_UI__DeleteInteractionChoiceSet;
-NsRPC2Communication::UI::DeleteInteractionChoiceSetResponseMarshaller Marshaller::mNsRPC2Communication_UI__DeleteInteractionChoiceSetResponse;
-NsRPC2Communication::UI::DeleteSubMenuMarshaller Marshaller::mNsRPC2Communication_UI__DeleteSubMenu;
-NsRPC2Communication::UI::DeleteSubMenuResponseMarshaller Marshaller::mNsRPC2Communication_UI__DeleteSubMenuResponse;
-NsRPC2Communication::UI::DialNumberMarshaller Marshaller::mNsRPC2Communication_UI__DialNumber;
-NsRPC2Communication::UI::DialNumberResponseMarshaller Marshaller::mNsRPC2Communication_UI__DialNumberResponse;
-NsRPC2Communication::UI::EndAudioPassThruMarshaller Marshaller::mNsRPC2Communication_UI__EndAudioPassThru;
-NsRPC2Communication::UI::EndAudioPassThruResponseMarshaller Marshaller::mNsRPC2Communication_UI__EndAudioPassThruResponse;
-NsRPC2Communication::UI::GetCapabilitiesMarshaller Marshaller::mNsRPC2Communication_UI__GetCapabilities;
-NsRPC2Communication::UI::GetCapabilitiesResponseMarshaller Marshaller::mNsRPC2Communication_UI__GetCapabilitiesResponse;
-NsRPC2Communication::UI::GetLanguageMarshaller Marshaller::mNsRPC2Communication_UI__GetLanguage;
-NsRPC2Communication::UI::GetLanguageResponseMarshaller Marshaller::mNsRPC2Communication_UI__GetLanguageResponse;
-NsRPC2Communication::UI::GetSupportedLanguagesMarshaller Marshaller::mNsRPC2Communication_UI__GetSupportedLanguages;
-NsRPC2Communication::UI::GetSupportedLanguagesResponseMarshaller Marshaller::mNsRPC2Communication_UI__GetSupportedLanguagesResponse;
-NsRPC2Communication::UI::OnCommandMarshaller Marshaller::mNsRPC2Communication_UI__OnCommand;
-NsRPC2Communication::UI::OnDeviceChosenMarshaller Marshaller::mNsRPC2Communication_UI__OnDeviceChosen;
-NsRPC2Communication::UI::OnDriverDistractionMarshaller Marshaller::mNsRPC2Communication_UI__OnDriverDistraction;
-NsRPC2Communication::UI::OnLanguageChangeMarshaller Marshaller::mNsRPC2Communication_UI__OnLanguageChange;
-NsRPC2Communication::UI::OnReadyMarshaller Marshaller::mNsRPC2Communication_UI__OnReady;
-NsRPC2Communication::UI::OnSystemContextMarshaller Marshaller::mNsRPC2Communication_UI__OnSystemContext;
-NsRPC2Communication::UI::OnTBTClientStateMarshaller Marshaller::mNsRPC2Communication_UI__OnTBTClientState;
-NsRPC2Communication::UI::PerformAudioPassThruMarshaller Marshaller::mNsRPC2Communication_UI__PerformAudioPassThru;
-NsRPC2Communication::UI::PerformAudioPassThruResponseMarshaller Marshaller::mNsRPC2Communication_UI__PerformAudioPassThruResponse;
-NsRPC2Communication::UI::PerformInteractionMarshaller Marshaller::mNsRPC2Communication_UI__PerformInteraction;
-NsRPC2Communication::UI::PerformInteractionResponseMarshaller Marshaller::mNsRPC2Communication_UI__PerformInteractionResponse;
-NsRPC2Communication::UI::ResetGlobalPropertiesMarshaller Marshaller::mNsRPC2Communication_UI__ResetGlobalProperties;
-NsRPC2Communication::UI::ResetGlobalPropertiesResponseMarshaller Marshaller::mNsRPC2Communication_UI__ResetGlobalPropertiesResponse;
-NsRPC2Communication::UI::ScrollableMessageMarshaller Marshaller::mNsRPC2Communication_UI__ScrollableMessage;
-NsRPC2Communication::UI::ScrollableMessageResponseMarshaller Marshaller::mNsRPC2Communication_UI__ScrollableMessageResponse;
-NsRPC2Communication::UI::SetAppIconMarshaller Marshaller::mNsRPC2Communication_UI__SetAppIcon;
-NsRPC2Communication::UI::SetAppIconResponseMarshaller Marshaller::mNsRPC2Communication_UI__SetAppIconResponse;
-NsRPC2Communication::UI::SetDisplayLayoutMarshaller Marshaller::mNsRPC2Communication_UI__SetDisplayLayout;
-NsRPC2Communication::UI::SetDisplayLayoutResponseMarshaller Marshaller::mNsRPC2Communication_UI__SetDisplayLayoutResponse;
-NsRPC2Communication::UI::SetGlobalPropertiesMarshaller Marshaller::mNsRPC2Communication_UI__SetGlobalProperties;
-NsRPC2Communication::UI::SetGlobalPropertiesResponseMarshaller Marshaller::mNsRPC2Communication_UI__SetGlobalPropertiesResponse;
-NsRPC2Communication::UI::SetMediaClockTimerMarshaller Marshaller::mNsRPC2Communication_UI__SetMediaClockTimer;
-NsRPC2Communication::UI::SetMediaClockTimerResponseMarshaller Marshaller::mNsRPC2Communication_UI__SetMediaClockTimerResponse;
-NsRPC2Communication::UI::ShowMarshaller Marshaller::mNsRPC2Communication_UI__Show;
-NsRPC2Communication::UI::ShowResponseMarshaller Marshaller::mNsRPC2Communication_UI__ShowResponse;
-NsRPC2Communication::UI::ShowConstantTBTMarshaller Marshaller::mNsRPC2Communication_UI__ShowConstantTBT;
-NsRPC2Communication::UI::ShowConstantTBTResponseMarshaller Marshaller::mNsRPC2Communication_UI__ShowConstantTBTResponse;
-NsRPC2Communication::UI::SliderMarshaller Marshaller::mNsRPC2Communication_UI__Slider;
-NsRPC2Communication::UI::SliderResponseMarshaller Marshaller::mNsRPC2Communication_UI__SliderResponse;
-NsRPC2Communication::UI::UpdateTurnListMarshaller Marshaller::mNsRPC2Communication_UI__UpdateTurnList;
-NsRPC2Communication::UI::UpdateTurnListResponseMarshaller Marshaller::mNsRPC2Communication_UI__UpdateTurnListResponse;
-NsRPC2Communication::VR::AddCommandMarshaller Marshaller::mNsRPC2Communication_VR__AddCommand;
-NsRPC2Communication::VR::AddCommandResponseMarshaller Marshaller::mNsRPC2Communication_VR__AddCommandResponse;
-NsRPC2Communication::VR::ChangeRegistrationMarshaller Marshaller::mNsRPC2Communication_VR__ChangeRegistration;
-NsRPC2Communication::VR::ChangeRegistrationResponseMarshaller Marshaller::mNsRPC2Communication_VR__ChangeRegistrationResponse;
-NsRPC2Communication::VR::DeleteCommandMarshaller Marshaller::mNsRPC2Communication_VR__DeleteCommand;
-NsRPC2Communication::VR::DeleteCommandResponseMarshaller Marshaller::mNsRPC2Communication_VR__DeleteCommandResponse;
-NsRPC2Communication::VR::GetCapabilitiesMarshaller Marshaller::mNsRPC2Communication_VR__GetCapabilities;
-NsRPC2Communication::VR::GetCapabilitiesResponseMarshaller Marshaller::mNsRPC2Communication_VR__GetCapabilitiesResponse;
-NsRPC2Communication::VR::GetLanguageMarshaller Marshaller::mNsRPC2Communication_VR__GetLanguage;
-NsRPC2Communication::VR::GetLanguageResponseMarshaller Marshaller::mNsRPC2Communication_VR__GetLanguageResponse;
-NsRPC2Communication::VR::GetSupportedLanguagesMarshaller Marshaller::mNsRPC2Communication_VR__GetSupportedLanguages;
-NsRPC2Communication::VR::GetSupportedLanguagesResponseMarshaller Marshaller::mNsRPC2Communication_VR__GetSupportedLanguagesResponse;
-NsRPC2Communication::VR::OnCommandMarshaller Marshaller::mNsRPC2Communication_VR__OnCommand;
-NsRPC2Communication::VR::OnLanguageChangeMarshaller Marshaller::mNsRPC2Communication_VR__OnLanguageChange;
-NsRPC2Communication::VehicleInfo::GetDTCsMarshaller Marshaller::mNsRPC2Communication_VehicleInfo__GetDTCs;
-NsRPC2Communication::VehicleInfo::GetDTCsResponseMarshaller Marshaller::mNsRPC2Communication_VehicleInfo__GetDTCsResponse;
-NsRPC2Communication::VehicleInfo::GetVehicleDataMarshaller Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleData;
-NsRPC2Communication::VehicleInfo::GetVehicleDataResponseMarshaller Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleDataResponse;
-NsRPC2Communication::VehicleInfo::GetVehicleTypeMarshaller Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleType;
-NsRPC2Communication::VehicleInfo::GetVehicleTypeResponseMarshaller Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleTypeResponse;
-NsRPC2Communication::VehicleInfo::OnVehicleDataMarshaller Marshaller::mNsRPC2Communication_VehicleInfo__OnVehicleData;
-NsRPC2Communication::VehicleInfo::ReadDIDMarshaller Marshaller::mNsRPC2Communication_VehicleInfo__ReadDID;
-NsRPC2Communication::VehicleInfo::ReadDIDResponseMarshaller Marshaller::mNsRPC2Communication_VehicleInfo__ReadDIDResponse;
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp
deleted file mode 100644
index 24f3b5115..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp
+++ /dev/null
@@ -1,127 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name Marshaller_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct Marshaller::localHash
-{
-  const char *name;
-  unsigned int idx;
-  void* method;
-};
-
-%%
-BasicCommunication.ActivateApp,0,&Marshaller::mNsRPC2Communication_BasicCommunication__ActivateApp
-BasicCommunication.ActivateAppResponse,1,&Marshaller::mNsRPC2Communication_BasicCommunication__ActivateAppResponse
-BasicCommunication.GetAppList,2,&Marshaller::mNsRPC2Communication_BasicCommunication__GetAppList
-BasicCommunication.GetAppListResponse,3,&Marshaller::mNsRPC2Communication_BasicCommunication__GetAppListResponse
-BasicCommunication.GetDeviceList,4,&Marshaller::mNsRPC2Communication_BasicCommunication__GetDeviceList
-BasicCommunication.GetDeviceListResponse,5,&Marshaller::mNsRPC2Communication_BasicCommunication__GetDeviceListResponse
-BasicCommunication.OnAppDeactivated,6,&Marshaller::mNsRPC2Communication_BasicCommunication__OnAppDeactivated
-BasicCommunication.OnAppDeactivatedResponse,7,&Marshaller::mNsRPC2Communication_BasicCommunication__OnAppDeactivatedResponse
-BasicCommunication.OnAppRegistered,8,&Marshaller::mNsRPC2Communication_BasicCommunication__OnAppRegistered
-BasicCommunication.OnAppUnregistered,9,&Marshaller::mNsRPC2Communication_BasicCommunication__OnAppUnregistered
-BasicCommunication.OnDeviceListUpdated,10,&Marshaller::mNsRPC2Communication_BasicCommunication__OnDeviceListUpdated
-BasicCommunication.SendData,11,&Marshaller::mNsRPC2Communication_BasicCommunication__SendData
-BasicCommunication.SendDataResponse,12,&Marshaller::mNsRPC2Communication_BasicCommunication__SendDataResponse
-Buttons.GetCapabilities,13,&Marshaller::mNsRPC2Communication_Buttons__GetCapabilities
-Buttons.GetCapabilitiesResponse,14,&Marshaller::mNsRPC2Communication_Buttons__GetCapabilitiesResponse
-Buttons.OnButtonEvent,15,&Marshaller::mNsRPC2Communication_Buttons__OnButtonEvent
-Buttons.OnButtonPress,16,&Marshaller::mNsRPC2Communication_Buttons__OnButtonPress
-TTS.ChangeRegistration,17,&Marshaller::mNsRPC2Communication_TTS__ChangeRegistration
-TTS.ChangeRegistrationResponse,18,&Marshaller::mNsRPC2Communication_TTS__ChangeRegistrationResponse
-TTS.GetCapabilities,19,&Marshaller::mNsRPC2Communication_TTS__GetCapabilities
-TTS.GetCapabilitiesResponse,20,&Marshaller::mNsRPC2Communication_TTS__GetCapabilitiesResponse
-TTS.GetLanguage,21,&Marshaller::mNsRPC2Communication_TTS__GetLanguage
-TTS.GetLanguageResponse,22,&Marshaller::mNsRPC2Communication_TTS__GetLanguageResponse
-TTS.GetSupportedLanguages,23,&Marshaller::mNsRPC2Communication_TTS__GetSupportedLanguages
-TTS.GetSupportedLanguagesResponse,24,&Marshaller::mNsRPC2Communication_TTS__GetSupportedLanguagesResponse
-TTS.OnLanguageChange,25,&Marshaller::mNsRPC2Communication_TTS__OnLanguageChange
-TTS.Speak,26,&Marshaller::mNsRPC2Communication_TTS__Speak
-TTS.SpeakResponse,27,&Marshaller::mNsRPC2Communication_TTS__SpeakResponse
-UI.AddCommand,28,&Marshaller::mNsRPC2Communication_UI__AddCommand
-UI.AddCommandResponse,29,&Marshaller::mNsRPC2Communication_UI__AddCommandResponse
-UI.AddSubMenu,30,&Marshaller::mNsRPC2Communication_UI__AddSubMenu
-UI.AddSubMenuResponse,31,&Marshaller::mNsRPC2Communication_UI__AddSubMenuResponse
-UI.Alert,32,&Marshaller::mNsRPC2Communication_UI__Alert
-UI.AlertResponse,33,&Marshaller::mNsRPC2Communication_UI__AlertResponse
-UI.AlertManeuver,34,&Marshaller::mNsRPC2Communication_UI__AlertManeuver
-UI.AlertManeuverResponse,35,&Marshaller::mNsRPC2Communication_UI__AlertManeuverResponse
-UI.ChangeRegistration,36,&Marshaller::mNsRPC2Communication_UI__ChangeRegistration
-UI.ChangeRegistrationResponse,37,&Marshaller::mNsRPC2Communication_UI__ChangeRegistrationResponse
-UI.CreateInteractionChoiceSet,38,&Marshaller::mNsRPC2Communication_UI__CreateInteractionChoiceSet
-UI.CreateInteractionChoiceSetResponse,39,&Marshaller::mNsRPC2Communication_UI__CreateInteractionChoiceSetResponse
-UI.DeleteCommand,40,&Marshaller::mNsRPC2Communication_UI__DeleteCommand
-UI.DeleteCommandResponse,41,&Marshaller::mNsRPC2Communication_UI__DeleteCommandResponse
-UI.DeleteInteractionChoiceSet,42,&Marshaller::mNsRPC2Communication_UI__DeleteInteractionChoiceSet
-UI.DeleteInteractionChoiceSetResponse,43,&Marshaller::mNsRPC2Communication_UI__DeleteInteractionChoiceSetResponse
-UI.DeleteSubMenu,44,&Marshaller::mNsRPC2Communication_UI__DeleteSubMenu
-UI.DeleteSubMenuResponse,45,&Marshaller::mNsRPC2Communication_UI__DeleteSubMenuResponse
-UI.DialNumber,46,&Marshaller::mNsRPC2Communication_UI__DialNumber
-UI.DialNumberResponse,47,&Marshaller::mNsRPC2Communication_UI__DialNumberResponse
-UI.EndAudioPassThru,48,&Marshaller::mNsRPC2Communication_UI__EndAudioPassThru
-UI.EndAudioPassThruResponse,49,&Marshaller::mNsRPC2Communication_UI__EndAudioPassThruResponse
-UI.GetCapabilities,50,&Marshaller::mNsRPC2Communication_UI__GetCapabilities
-UI.GetCapabilitiesResponse,51,&Marshaller::mNsRPC2Communication_UI__GetCapabilitiesResponse
-UI.GetLanguage,52,&Marshaller::mNsRPC2Communication_UI__GetLanguage
-UI.GetLanguageResponse,53,&Marshaller::mNsRPC2Communication_UI__GetLanguageResponse
-UI.GetSupportedLanguages,54,&Marshaller::mNsRPC2Communication_UI__GetSupportedLanguages
-UI.GetSupportedLanguagesResponse,55,&Marshaller::mNsRPC2Communication_UI__GetSupportedLanguagesResponse
-UI.OnCommand,56,&Marshaller::mNsRPC2Communication_UI__OnCommand
-UI.OnDeviceChosen,57,&Marshaller::mNsRPC2Communication_UI__OnDeviceChosen
-UI.OnDriverDistraction,58,&Marshaller::mNsRPC2Communication_UI__OnDriverDistraction
-UI.OnLanguageChange,59,&Marshaller::mNsRPC2Communication_UI__OnLanguageChange
-UI.OnReady,60,&Marshaller::mNsRPC2Communication_UI__OnReady
-UI.OnSystemContext,61,&Marshaller::mNsRPC2Communication_UI__OnSystemContext
-UI.OnTBTClientState,62,&Marshaller::mNsRPC2Communication_UI__OnTBTClientState
-UI.PerformAudioPassThru,63,&Marshaller::mNsRPC2Communication_UI__PerformAudioPassThru
-UI.PerformAudioPassThruResponse,64,&Marshaller::mNsRPC2Communication_UI__PerformAudioPassThruResponse
-UI.PerformInteraction,65,&Marshaller::mNsRPC2Communication_UI__PerformInteraction
-UI.PerformInteractionResponse,66,&Marshaller::mNsRPC2Communication_UI__PerformInteractionResponse
-UI.ResetGlobalProperties,67,&Marshaller::mNsRPC2Communication_UI__ResetGlobalProperties
-UI.ResetGlobalPropertiesResponse,68,&Marshaller::mNsRPC2Communication_UI__ResetGlobalPropertiesResponse
-UI.ScrollableMessage,69,&Marshaller::mNsRPC2Communication_UI__ScrollableMessage
-UI.ScrollableMessageResponse,70,&Marshaller::mNsRPC2Communication_UI__ScrollableMessageResponse
-UI.SetAppIcon,71,&Marshaller::mNsRPC2Communication_UI__SetAppIcon
-UI.SetAppIconResponse,72,&Marshaller::mNsRPC2Communication_UI__SetAppIconResponse
-UI.SetDisplayLayout,73,&Marshaller::mNsRPC2Communication_UI__SetDisplayLayout
-UI.SetDisplayLayoutResponse,74,&Marshaller::mNsRPC2Communication_UI__SetDisplayLayoutResponse
-UI.SetGlobalProperties,75,&Marshaller::mNsRPC2Communication_UI__SetGlobalProperties
-UI.SetGlobalPropertiesResponse,76,&Marshaller::mNsRPC2Communication_UI__SetGlobalPropertiesResponse
-UI.SetMediaClockTimer,77,&Marshaller::mNsRPC2Communication_UI__SetMediaClockTimer
-UI.SetMediaClockTimerResponse,78,&Marshaller::mNsRPC2Communication_UI__SetMediaClockTimerResponse
-UI.Show,79,&Marshaller::mNsRPC2Communication_UI__Show
-UI.ShowResponse,80,&Marshaller::mNsRPC2Communication_UI__ShowResponse
-UI.ShowConstantTBT,81,&Marshaller::mNsRPC2Communication_UI__ShowConstantTBT
-UI.ShowConstantTBTResponse,82,&Marshaller::mNsRPC2Communication_UI__ShowConstantTBTResponse
-UI.Slider,83,&Marshaller::mNsRPC2Communication_UI__Slider
-UI.SliderResponse,84,&Marshaller::mNsRPC2Communication_UI__SliderResponse
-UI.UpdateTurnList,85,&Marshaller::mNsRPC2Communication_UI__UpdateTurnList
-UI.UpdateTurnListResponse,86,&Marshaller::mNsRPC2Communication_UI__UpdateTurnListResponse
-VR.AddCommand,87,&Marshaller::mNsRPC2Communication_VR__AddCommand
-VR.AddCommandResponse,88,&Marshaller::mNsRPC2Communication_VR__AddCommandResponse
-VR.ChangeRegistration,89,&Marshaller::mNsRPC2Communication_VR__ChangeRegistration
-VR.ChangeRegistrationResponse,90,&Marshaller::mNsRPC2Communication_VR__ChangeRegistrationResponse
-VR.DeleteCommand,91,&Marshaller::mNsRPC2Communication_VR__DeleteCommand
-VR.DeleteCommandResponse,92,&Marshaller::mNsRPC2Communication_VR__DeleteCommandResponse
-VR.GetCapabilities,93,&Marshaller::mNsRPC2Communication_VR__GetCapabilities
-VR.GetCapabilitiesResponse,94,&Marshaller::mNsRPC2Communication_VR__GetCapabilitiesResponse
-VR.GetLanguage,95,&Marshaller::mNsRPC2Communication_VR__GetLanguage
-VR.GetLanguageResponse,96,&Marshaller::mNsRPC2Communication_VR__GetLanguageResponse
-VR.GetSupportedLanguages,97,&Marshaller::mNsRPC2Communication_VR__GetSupportedLanguages
-VR.GetSupportedLanguagesResponse,98,&Marshaller::mNsRPC2Communication_VR__GetSupportedLanguagesResponse
-VR.OnCommand,99,&Marshaller::mNsRPC2Communication_VR__OnCommand
-VR.OnLanguageChange,100,&Marshaller::mNsRPC2Communication_VR__OnLanguageChange
-VehicleInfo.GetDTCs,101,&Marshaller::mNsRPC2Communication_VehicleInfo__GetDTCs
-VehicleInfo.GetDTCsResponse,102,&Marshaller::mNsRPC2Communication_VehicleInfo__GetDTCsResponse
-VehicleInfo.GetVehicleData,103,&Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleData
-VehicleInfo.GetVehicleDataResponse,104,&Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleDataResponse
-VehicleInfo.GetVehicleType,105,&Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleType
-VehicleInfo.GetVehicleTypeResponse,106,&Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleTypeResponse
-VehicleInfo.OnVehicleData,107,&Marshaller::mNsRPC2Communication_VehicleInfo__OnVehicleData
-VehicleInfo.ReadDID,108,&Marshaller::mNsRPC2Communication_VehicleInfo__ReadDID
-VehicleInfo.ReadDIDResponse,109,&Marshaller::mNsRPC2Communication_VehicleInfo__ReadDIDResponse
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.inc b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.inc
deleted file mode 100644
index 230e0a14e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.inc
+++ /dev/null
@@ -1,425 +0,0 @@
-/* Copyright (c) 2013 Ford Motor Company */
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.inc ./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp  */
-/* Computed positions: -k'1,7,13,23,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 110
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 43
-#define MIN_HASH_VALUE 17
-#define MAX_HASH_VALUE 208
-/* maximum key range = 192, duplicates = 0 */
-
-namespace NsRPC2Communication {
-
-class Marshaller_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct Marshaller::localHash *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Marshaller_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209,  80,   0,  30,  40, 209,
-      209,  10, 209, 209, 209, 209,  90, 122, 209,   5,
-        0, 209,  70,  25,  65,   0,  40, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209,   5, 209,  15,
-        0,   0,  85,   0,  55,  20, 209,   0,  25, 115,
-        0,   5,   5, 209,  25,   0,   5,  50, 209,  70,
-      209,  95, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-      209, 209, 209, 209, 209, 209
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[22]];
-      /*FALLTHROUGH*/
-      case 22:
-      case 21:
-      case 20:
-      case 19:
-      case 18:
-      case 17:
-      case 16:
-      case 15:
-      case 14:
-      case 13:
-        hval += asso_values[(unsigned char)str[12]];
-      /*FALLTHROUGH*/
-      case 12:
-      case 11:
-      case 10:
-      case 9:
-      case 8:
-      case 7:
-        hval += asso_values[(unsigned char)str[6]];
-      /*FALLTHROUGH*/
-      case 6:
-      case 5:
-      case 4:
-      case 3:
-      case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct Marshaller::localHash *
-Marshaller_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0, 12,  0, 19,  0,  0, 17,  0, 19, 20, 21, 17,
-      23, 24, 25, 21, 22, 28,  9,  0, 31, 32,  8, 29,  0, 21,
-      37, 13, 29,  0, 16, 37,  0, 29,  0, 21, 27,  0, 24, 35,
-       0, 12, 38, 34, 35, 36, 32,  0, 19,  0,  0, 22, 43, 19,
-       0, 21, 17, 18,  9, 30,  0,  0, 38,  0, 25, 21, 27, 13,
-       0, 15, 26, 17, 13, 29, 15, 21, 22, 13, 24,  0, 21, 32,
-      23, 24, 40, 21, 32,  0, 14, 10, 26,  0,  0, 19, 30, 21,
-      22, 18,  0,  0, 16, 27,  0, 29, 25, 26, 27, 18, 34,  0,
-      26,  0, 33,  0,  0, 16,  0,  0, 29,  0,  0, 37, 13, 24,
-       0, 26, 27,  0, 14,  0, 24,  7,  0, 34,  0,  0, 22,  0,
-      19,  0,  0,  0, 18, 19,  0,  0,  0,  0,  0,  0, 31, 27,
-       0, 19, 30, 16,  0,  0,  0, 20, 29,  0,  0, 24,  0,  0,
-       0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  0, 21,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 23
-    };
-  static const struct Marshaller::localHash wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 74 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.OnCommand",56,&Marshaller::mNsRPC2Communication_UI__OnCommand},
-      {""},
-#line 80 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.OnTBTClientState",62,&Marshaller::mNsRPC2Communication_UI__OnTBTClientState},
-      {""}, {""},
-#line 102 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.SliderResponse",84,&Marshaller::mNsRPC2Communication_UI__SliderResponse},
-      {""},
-#line 77 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.OnLanguageChange",59,&Marshaller::mNsRPC2Communication_UI__OnLanguageChange},
-#line 87 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.ScrollableMessage",69,&Marshaller::mNsRPC2Communication_UI__ScrollableMessage},
-#line 34 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"Buttons.OnButtonPress",16,&Marshaller::mNsRPC2Communication_Buttons__OnButtonPress},
-#line 103 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.UpdateTurnList",85,&Marshaller::mNsRPC2Communication_UI__UpdateTurnList},
-#line 31 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"Buttons.GetCapabilities",13,&Marshaller::mNsRPC2Communication_Buttons__GetCapabilities},
-#line 85 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.ResetGlobalProperties",67,&Marshaller::mNsRPC2Communication_UI__ResetGlobalProperties},
-#line 104 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.UpdateTurnListResponse",86,&Marshaller::mNsRPC2Communication_UI__UpdateTurnListResponse},
-#line 33 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"Buttons.OnButtonEvent",15,&Marshaller::mNsRPC2Communication_Buttons__OnButtonEvent},
-#line 93 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.SetGlobalProperties",75,&Marshaller::mNsRPC2Communication_UI__SetGlobalProperties},
-#line 88 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.ScrollableMessageResponse",70,&Marshaller::mNsRPC2Communication_UI__ScrollableMessageResponse},
-#line 101 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.Slider",83,&Marshaller::mNsRPC2Communication_UI__Slider},
-      {""},
-#line 32 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"Buttons.GetCapabilitiesResponse",14,&Marshaller::mNsRPC2Communication_Buttons__GetCapabilitiesResponse},
-#line 86 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.ResetGlobalPropertiesResponse",68,&Marshaller::mNsRPC2Communication_UI__ResetGlobalPropertiesResponse},
-#line 50 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.Alert",32,&Marshaller::mNsRPC2Communication_UI__Alert},
-#line 60 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.DeleteInteractionChoiceSet",42,&Marshaller::mNsRPC2Communication_UI__DeleteInteractionChoiceSet},
-      {""},
-#line 54 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.ChangeRegistration",36,&Marshaller::mNsRPC2Communication_UI__ChangeRegistration},
-#line 61 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.DeleteInteractionChoiceSetResponse",43,&Marshaller::mNsRPC2Communication_UI__DeleteInteractionChoiceSetResponse},
-#line 46 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.AddCommand",28,&Marshaller::mNsRPC2Communication_UI__AddCommand},
-#line 56 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.CreateInteractionChoiceSet",38,&Marshaller::mNsRPC2Communication_UI__CreateInteractionChoiceSet},
-      {""},
-#line 51 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.AlertResponse",33,&Marshaller::mNsRPC2Communication_UI__AlertResponse},
-#line 57 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.CreateInteractionChoiceSetResponse",39,&Marshaller::mNsRPC2Communication_UI__CreateInteractionChoiceSetResponse},
-      {""},
-#line 55 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.ChangeRegistrationResponse",37,&Marshaller::mNsRPC2Communication_UI__ChangeRegistrationResponse},
-      {""},
-#line 47 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.AddCommandResponse",29,&Marshaller::mNsRPC2Communication_UI__AddCommandResponse},
-#line 29 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.SendData",11,&Marshaller::mNsRPC2Communication_BasicCommunication__SendData},
-      {""},
-#line 72 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.GetSupportedLanguages",54,&Marshaller::mNsRPC2Communication_UI__GetSupportedLanguages},
-#line 30 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.SendDataResponse",12,&Marshaller::mNsRPC2Communication_BasicCommunication__SendDataResponse},
-      {""},
-#line 117 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.OnCommand",99,&Marshaller::mNsRPC2Communication_VR__OnCommand},
-#line 28 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.OnDeviceListUpdated",10,&Marshaller::mNsRPC2Communication_BasicCommunication__OnDeviceListUpdated},
-#line 26 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.OnAppRegistered",8,&Marshaller::mNsRPC2Communication_BasicCommunication__OnAppRegistered},
-#line 24 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.OnAppDeactivated",6,&Marshaller::mNsRPC2Communication_BasicCommunication__OnAppDeactivated},
-#line 27 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.OnAppUnregistered",9,&Marshaller::mNsRPC2Communication_BasicCommunication__OnAppUnregistered},
-#line 73 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.GetSupportedLanguagesResponse",55,&Marshaller::mNsRPC2Communication_UI__GetSupportedLanguagesResponse},
-      {""},
-#line 118 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.OnLanguageChange",100,&Marshaller::mNsRPC2Communication_VR__OnLanguageChange},
-      {""}, {""},
-#line 76 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.OnDriverDistraction",58,&Marshaller::mNsRPC2Communication_UI__OnDriverDistraction},
-#line 25 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.OnAppDeactivatedResponse",7,&Marshaller::mNsRPC2Communication_UI__OnDriverDistraction},  // TODO(AK): remove in new code generation
-#line 119 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VehicleInfo.GetDTCs",101,&Marshaller::mNsRPC2Communication_VehicleInfo__GetDTCs},
-      {""},
-#line 65 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.DialNumberResponse",47,&Marshaller::mNsRPC2Communication_UI__DialNumberResponse},
-#line 75 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.OnDeviceChosen",57,&Marshaller::mNsRPC2Communication_UI__OnDeviceChosen},
-#line 68 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.GetCapabilities",50,&Marshaller::mNsRPC2Communication_UI__GetCapabilities},
-#line 44 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"TTS.Speak",26,&Marshaller::mNsRPC2Communication_TTS__Speak},
-#line 18 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.ActivateApp",0,&Marshaller::mNsRPC2Communication_BasicCommunication__ActivateApp},
-      {""}, {""},
-#line 19 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.ActivateAppResponse",1,&Marshaller::mNsRPC2Communication_BasicCommunication__ActivateAppResponse},
-      {""},
-#line 125 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VehicleInfo.OnVehicleData",107,&Marshaller::mNsRPC2Communication_VehicleInfo__OnVehicleData},
-#line 107 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.ChangeRegistration",89,&Marshaller::mNsRPC2Communication_VR__ChangeRegistration},
-#line 120 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VehicleInfo.GetDTCsResponse",102,&Marshaller::mNsRPC2Communication_VehicleInfo__GetDTCsResponse},
-#line 105 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.AddCommand",87,&Marshaller::mNsRPC2Communication_VR__AddCommand},
-      {""},
-#line 98 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.ShowResponse",80,&Marshaller::mNsRPC2Communication_UI__ShowResponse},
-#line 69 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.GetCapabilitiesResponse",51,&Marshaller::mNsRPC2Communication_UI__GetCapabilitiesResponse},
-#line 45 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"TTS.SpeakResponse",27,&Marshaller::mNsRPC2Communication_TTS__SpeakResponse},
-#line 64 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.DialNumber",46,&Marshaller::mNsRPC2Communication_UI__DialNumber},
-#line 108 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.ChangeRegistrationResponse",90,&Marshaller::mNsRPC2Communication_VR__ChangeRegistrationResponse},
-#line 39 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"TTS.GetLanguage",21,&Marshaller::mNsRPC2Communication_TTS__GetLanguage},
-#line 106 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.AddCommandResponse",88,&Marshaller::mNsRPC2Communication_VR__AddCommandResponse},
-#line 35 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"TTS.ChangeRegistration",17,&Marshaller::mNsRPC2Communication_TTS__ChangeRegistration},
-#line 89 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.SetAppIcon",71,&Marshaller::mNsRPC2Communication_UI__SetAppIcon},
-#line 115 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.GetSupportedLanguages",97,&Marshaller::mNsRPC2Communication_VR__GetSupportedLanguages},
-      {""},
-#line 49 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.AddSubMenuResponse",31,&Marshaller::mNsRPC2Communication_UI__AddSubMenuResponse},
-#line 22 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.GetDeviceList",4,&Marshaller::mNsRPC2Communication_BasicCommunication__GetDeviceList},
-#line 40 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"TTS.GetLanguageResponse",22,&Marshaller::mNsRPC2Communication_TTS__GetLanguageResponse},
-#line 53 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.AlertManeuverResponse",35,&Marshaller::mNsRPC2Communication_UI__AlertManeuverResponse},
-#line 23 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.GetDeviceListResponse",5,&Marshaller::mNsRPC2Communication_BasicCommunication__GetDeviceListResponse},
-#line 90 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.SetAppIconResponse",72,&Marshaller::mNsRPC2Communication_UI__SetAppIconResponse},
-#line 116 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.GetSupportedLanguagesResponse",98,&Marshaller::mNsRPC2Communication_VR__GetSupportedLanguagesResponse},
-      {""},
-#line 70 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.GetLanguage",52,&Marshaller::mNsRPC2Communication_UI__GetLanguage},
-#line 78 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.OnReady",60,&Marshaller::mNsRPC2Communication_UI__OnReady},
-#line 100 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.ShowConstantTBTResponse",82,&Marshaller::mNsRPC2Communication_UI__ShowConstantTBTResponse},
-      {""}, {""},
-#line 37 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"TTS.GetCapabilities",19,&Marshaller::mNsRPC2Communication_TTS__GetCapabilities},
-#line 94 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.SetGlobalPropertiesResponse",76,&Marshaller::mNsRPC2Communication_UI__SetGlobalPropertiesResponse},
-#line 83 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.PerformInteraction",65,&Marshaller::mNsRPC2Communication_UI__PerformInteraction},
-#line 71 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.GetLanguageResponse",53,&Marshaller::mNsRPC2Communication_UI__GetLanguageResponse},
-#line 111 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.GetCapabilities",93,&Marshaller::mNsRPC2Communication_VR__GetCapabilities},
-      {""}, {""},
-#line 52 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.AlertManeuver",34,&Marshaller::mNsRPC2Communication_UI__AlertManeuver},
-#line 67 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.EndAudioPassThruResponse",49,&Marshaller::mNsRPC2Communication_UI__EndAudioPassThruResponse},
-      {""},
-#line 84 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.PerformInteractionResponse",66,&Marshaller::mNsRPC2Communication_UI__PerformInteractionResponse},
-#line 41 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"TTS.GetSupportedLanguages",23,&Marshaller::mNsRPC2Communication_TTS__GetSupportedLanguages},
-#line 121 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VehicleInfo.GetVehicleData",103,&Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleData},
-#line 38 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"TTS.GetCapabilitiesResponse",20,&Marshaller::mNsRPC2Communication_TTS__GetCapabilitiesResponse},
-#line 79 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.OnSystemContext",61,&Marshaller::mNsRPC2Communication_UI__OnSystemContext},
-#line 122 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VehicleInfo.GetVehicleDataResponse",104,&Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleDataResponse},
-      {""},
-#line 112 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.GetCapabilitiesResponse",94,&Marshaller::mNsRPC2Communication_VR__GetCapabilitiesResponse},
-      {""},
-#line 42 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"TTS.GetSupportedLanguagesResponse",24,&Marshaller::mNsRPC2Communication_TTS__GetSupportedLanguagesResponse},
-      {""}, {""},
-#line 58 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.DeleteCommand",40,&Marshaller::mNsRPC2Communication_UI__DeleteCommand},
-      {""}, {""},
-#line 20 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.GetAppList",2,&Marshaller::mNsRPC2Communication_BasicCommunication__GetAppList},
-      {""}, {""},
-#line 21 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"BasicCommunication.GetAppListResponse",3,&Marshaller::mNsRPC2Communication_BasicCommunication__GetAppListResponse},
-#line 48 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.AddSubMenu",30,&Marshaller::mNsRPC2Communication_UI__AddSubMenu},
-#line 59 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.DeleteCommandResponse",41,&Marshaller::mNsRPC2Communication_UI__DeleteCommandResponse},
-      {""},
-#line 123 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VehicleInfo.GetVehicleType",105,&Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleType},
-#line 127 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VehicleInfo.ReadDIDResponse",109,&Marshaller::mNsRPC2Communication_VehicleInfo__ReadDIDResponse},
-      {""},
-#line 113 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.GetLanguage",95,&Marshaller::mNsRPC2Communication_VR__GetLanguage},
-      {""},
-#line 63 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.DeleteSubMenuResponse",45,&Marshaller::mNsRPC2Communication_UI__DeleteSubMenuResponse},
-#line 97 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.Show",79,&Marshaller::mNsRPC2Communication_UI__Show},
-      {""},
-#line 124 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VehicleInfo.GetVehicleTypeResponse",106,&Marshaller::mNsRPC2Communication_VehicleInfo__GetVehicleTypeResponse},
-      {""}, {""},
-#line 114 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.GetLanguageResponse",96,&Marshaller::mNsRPC2Communication_VR__GetLanguageResponse},
-      {""},
-#line 66 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.EndAudioPassThru",48,&Marshaller::mNsRPC2Communication_UI__EndAudioPassThru},
-      {""}, {""}, {""},
-#line 99 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.ShowConstantTBT",81,&Marshaller::mNsRPC2Communication_UI__ShowConstantTBT},
-#line 91 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.SetDisplayLayout",73,&Marshaller::mNsRPC2Communication_UI__SetDisplayLayout},
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 82 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.PerformAudioPassThruResponse",64,&Marshaller::mNsRPC2Communication_UI__PerformAudioPassThruResponse},
-#line 92 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.SetDisplayLayoutResponse",74,&Marshaller::mNsRPC2Communication_UI__SetDisplayLayoutResponse},
-      {""},
-#line 126 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VehicleInfo.ReadDID",108,&Marshaller::mNsRPC2Communication_VehicleInfo__ReadDID},
-#line 36 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"TTS.ChangeRegistrationResponse",18,&Marshaller::mNsRPC2Communication_TTS__ChangeRegistrationResponse},
-#line 109 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.DeleteCommand",91,&Marshaller::mNsRPC2Communication_VR__DeleteCommand},
-      {""}, {""}, {""},
-#line 43 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"TTS.OnLanguageChange",25,&Marshaller::mNsRPC2Communication_TTS__OnLanguageChange},
-#line 96 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.SetMediaClockTimerResponse",78,&Marshaller::mNsRPC2Communication_UI__SetMediaClockTimerResponse},
-      {""}, {""},
-#line 110 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"VR.DeleteCommandResponse",92,&Marshaller::mNsRPC2Communication_VR__DeleteCommandResponse},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 62 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.DeleteSubMenu",44,&Marshaller::mNsRPC2Communication_UI__DeleteSubMenu},
-      {""}, {""}, {""}, {""},
-#line 95 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.SetMediaClockTimer",77,&Marshaller::mNsRPC2Communication_UI__SetMediaClockTimer},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""},
-#line 81 "./src/components/JSONHandler/src/RPC2ObjectsImpl/Marshaller.gp"
-      {"UI.PerformAudioPassThru",63,&Marshaller::mNsRPC2Communication_UI__PerformAudioPassThru}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateApp.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateApp.cpp
deleted file mode 100644
index 4335f508b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateApp.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/ActivateApp.h"
-#include "../src/../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::SmartDeviceLinkCore
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-ActivateApp& ActivateApp::operator =(const ActivateApp& c)
-{
-  appName=c.appName;
-  appId=c.appId;
-  return *this;
-}
-
-
-ActivateApp::~ActivateApp(void)
-{
-}
-
-
-ActivateApp::ActivateApp(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ACTIVATEAPP)
-{
-}
-
-
-ActivateApp::ActivateApp(const ActivateApp& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ACTIVATEAPP,c.getId())
-{
-  *this=c;
-}
-
-
-const std::string& ActivateApp::get_appName(void)
-{
-  return appName;
-}
-
-bool ActivateApp::set_appName(const std::string& appName_)
-{
-  appName=appName_;
-  return true;
-}
-
-int ActivateApp::get_appId(void)
-{
-  return appId;
-}
-
-bool ActivateApp::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool ActivateApp::checkIntegrity(void)
-{
-  return ActivateAppMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppMarshaller.cpp
deleted file mode 100644
index 7dea99072..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/ActivateApp.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool ActivateAppMarshaller::checkIntegrity(ActivateApp& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ActivateAppMarshaller::fromString(const std::string& s,ActivateApp& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ActivateAppMarshaller::toString(const ActivateApp& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ActivateAppMarshaller::checkIntegrityConst(const ActivateApp& s)
-{
-  if(s.appName.length()>100)  return false;
-
-  return true;
-}
-
-
-Json::Value ActivateAppMarshaller::toJSON(const ActivateApp& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("BasicCommunication.ActivateApp");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["appName"]=Json::Value(e.appName);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool ActivateAppMarshaller::fromJSON(const Json::Value& json,ActivateApp& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("BasicCommunication.ActivateApp"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("appName") || !js["appName"].isString())  return false;
-    c.appName=js["appName"].asString();
-    if(c.appName.length()>100)  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppMarshaller.h
deleted file mode 100644
index 0cc715cfc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ACTIVATEAPPMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ACTIVATEAPPMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/ActivateApp.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct ActivateAppMarshaller
-    {
-      static bool checkIntegrity(ActivateApp& e);
-      static bool checkIntegrityConst(const ActivateApp& e);
-    
-      static bool fromString(const std::string& s,ActivateApp& e);
-      static const std::string toString(const ActivateApp& e);
-    
-      static bool fromJSON(const Json::Value& s,ActivateApp& e);
-      static Json::Value toJSON(const ActivateApp& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppResponse.cpp
deleted file mode 100644
index d499fbc78..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/ActivateAppResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunicationication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-ActivateAppResponse& ActivateAppResponse::operator =(const ActivateAppResponse& c)
-{
-  return *this;
-}
-
-
-ActivateAppResponse::~ActivateAppResponse(void)
-{
-}
-
-
-ActivateAppResponse::ActivateAppResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ACTIVATEAPPRESPONSE)
-{
-}
-
-
-ActivateAppResponse::ActivateAppResponse(const ActivateAppResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ACTIVATEAPPRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool ActivateAppResponse::checkIntegrity(void)
-{
-  return ActivateAppResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppResponseMarshaller.cpp
deleted file mode 100644
index 047b05ce0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/ActivateAppResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/ActivateAppResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool ActivateAppResponseMarshaller::checkIntegrity(ActivateAppResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ActivateAppResponseMarshaller::fromString(const std::string& s,ActivateAppResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ActivateAppResponseMarshaller::toString(const ActivateAppResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ActivateAppResponseMarshaller::checkIntegrityConst(const ActivateAppResponse& s)
-{
-  return true;
-}
-
-
-Json::Value ActivateAppResponseMarshaller::toJSON(const ActivateAppResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("BasicCommunication.ActivateAppResponse");
-
-  return json;
-}
-
-
-bool ActivateAppResponseMarshaller::fromJSON(const Json::Value& json,ActivateAppResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("BasicCommunication.ActivateAppResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppResponseMarshaller.h
deleted file mode 100644
index 7d7ab0615..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/ActivateAppResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ACTIVATEAPPRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ACTIVATEAPPRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/ActivateAppResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct ActivateAppResponseMarshaller
-    {
-      static bool checkIntegrity(ActivateAppResponse& e);
-      static bool checkIntegrityConst(const ActivateAppResponse& e);
-    
-      static bool fromString(const std::string& s,ActivateAppResponse& e);
-      static const std::string toString(const ActivateAppResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,ActivateAppResponse& e);
-      static Json::Value toJSON(const ActivateAppResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppList.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppList.cpp
deleted file mode 100644
index c14852243..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppList.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetAppList.h"
-#include "../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-GetAppList& GetAppList::operator =(const GetAppList& c)
-{
-  return *this;
-}
-
-
-GetAppList::~GetAppList(void)
-{
-}
-
-
-GetAppList::GetAppList(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETAPPLIST)
-{
-}
-
-
-GetAppList::GetAppList(const GetAppList& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETAPPLIST,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetAppList::checkIntegrity(void)
-{
-  return GetAppListMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListMarshaller.cpp
deleted file mode 100644
index d2f2cd302..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetAppList.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/GetAppListMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool GetAppListMarshaller::checkIntegrity(GetAppList& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetAppListMarshaller::fromString(const std::string& s,GetAppList& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetAppListMarshaller::toString(const GetAppList& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetAppListMarshaller::checkIntegrityConst(const GetAppList& s)
-{
-  return true;
-}
-
-
-Json::Value GetAppListMarshaller::toJSON(const GetAppList& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("BasicCommunication.GetAppList");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetAppListMarshaller::fromJSON(const Json::Value& json,GetAppList& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("BasicCommunication.GetAppList"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListMarshaller.h
deleted file mode 100644
index 5fe06a127..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETAPPLISTMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETAPPLISTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetAppList.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct GetAppListMarshaller
-    {
-      static bool checkIntegrity(GetAppList& e);
-      static bool checkIntegrityConst(const GetAppList& e);
-    
-      static bool fromString(const std::string& s,GetAppList& e);
-      static const std::string toString(const GetAppList& e);
-    
-      static bool fromJSON(const Json::Value& s,GetAppList& e);
-      static Json::Value toJSON(const GetAppList& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListResponse.cpp
deleted file mode 100644
index 4e778f4e4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListResponse.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetAppListResponse.h"
-#include "../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-GetAppListResponse& GetAppListResponse::operator =(const GetAppListResponse& c)
-{
-  appList=c.appList;
-  return *this;
-}
-
-
-GetAppListResponse::~GetAppListResponse(void)
-{
-}
-
-
-GetAppListResponse::GetAppListResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETAPPLISTRESPONSE)
-{
-}
-
-
-GetAppListResponse::GetAppListResponse(const GetAppListResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETAPPLISTRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::HMIApplication>& GetAppListResponse::get_appList(void)
-{
-  return appList;
-}
-
-bool GetAppListResponse::set_appList(const std::vector< NsSmartDeviceLinkRPCV2::HMIApplication>& appList_)
-{
-  appList=appList_;
-  return true;
-}
-
-bool GetAppListResponse::checkIntegrity(void)
-{
-  return GetAppListResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListResponseMarshaller.cpp
deleted file mode 100644
index 66c05d426..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListResponseMarshaller.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetAppListResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/GetAppListResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool GetAppListResponseMarshaller::checkIntegrity(GetAppListResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetAppListResponseMarshaller::fromString(const std::string& s,GetAppListResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetAppListResponseMarshaller::toString(const GetAppListResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetAppListResponseMarshaller::checkIntegrityConst(const GetAppListResponse& s)
-{
-  {
-    unsigned int i=s.appList.size();
-    if(i<0)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value GetAppListResponseMarshaller::toJSON(const GetAppListResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("BasicCommunication.GetAppListResponse");
-
-  {
-    unsigned int i=e.appList.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::HMIApplicationMarshaller::toJSON(e.appList[i]);
-
-    json["result"]["appList"]=j;
-  }
-  return json;
-}
-
-
-bool GetAppListResponseMarshaller::fromJSON(const Json::Value& json,GetAppListResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("BasicCommunication.GetAppListResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("appList") || !js["appList"].isArray())  return false;
-    {
-      unsigned int i=js["appList"].size();
-      if(i<0)  return false;
-      c.appList.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::HMIApplication t;
-        if(!NsSmartDeviceLinkRPCV2::HMIApplicationMarshaller::fromJSON(js["appList"][i],t))
-          return false;
-         c.appList[i]=t;
-      }
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListResponseMarshaller.h
deleted file mode 100644
index e037e81bf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetAppListResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETAPPLISTRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETAPPLISTRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetAppListResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct GetAppListResponseMarshaller
-    {
-      static bool checkIntegrity(GetAppListResponse& e);
-      static bool checkIntegrityConst(const GetAppListResponse& e);
-    
-      static bool fromString(const std::string& s,GetAppListResponse& e);
-      static const std::string toString(const GetAppListResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetAppListResponse& e);
-      static Json::Value toJSON(const GetAppListResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceList.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceList.cpp
deleted file mode 100644
index 38a3eb208..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceList.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetDeviceList.h"
-#include "../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-GetDeviceList& GetDeviceList::operator =(const GetDeviceList& c)
-{
-  return *this;
-}
-
-
-GetDeviceList::~GetDeviceList(void)
-{
-}
-
-
-GetDeviceList::GetDeviceList(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETDEVICELIST)
-{
-}
-
-
-GetDeviceList::GetDeviceList(const GetDeviceList& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETDEVICELIST,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetDeviceList::checkIntegrity(void)
-{
-  return GetDeviceListMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListMarshaller.cpp
deleted file mode 100644
index ad213e0e1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetDeviceList.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/GetDeviceListMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool GetDeviceListMarshaller::checkIntegrity(GetDeviceList& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetDeviceListMarshaller::fromString(const std::string& s,GetDeviceList& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetDeviceListMarshaller::toString(const GetDeviceList& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetDeviceListMarshaller::checkIntegrityConst(const GetDeviceList& s)
-{
-  return true;
-}
-
-
-Json::Value GetDeviceListMarshaller::toJSON(const GetDeviceList& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("BasicCommunication.GetDeviceList");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetDeviceListMarshaller::fromJSON(const Json::Value& json,GetDeviceList& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("BasicCommunication.GetDeviceList"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListMarshaller.h
deleted file mode 100644
index e189a62f9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETDEVICELISTMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETDEVICELISTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetDeviceList.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct GetDeviceListMarshaller
-    {
-      static bool checkIntegrity(GetDeviceList& e);
-      static bool checkIntegrityConst(const GetDeviceList& e);
-    
-      static bool fromString(const std::string& s,GetDeviceList& e);
-      static const std::string toString(const GetDeviceList& e);
-    
-      static bool fromJSON(const Json::Value& s,GetDeviceList& e);
-      static Json::Value toJSON(const GetDeviceList& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListResponse.cpp
deleted file mode 100644
index 5b55b63c1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListResponse.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetDeviceListResponse.h"
-#include "../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-GetDeviceListResponse& GetDeviceListResponse::operator =(const GetDeviceListResponse& c)
-{
-  if(deviceList)  delete deviceList;
-  deviceList= c.deviceList ? new std::vector<std::string>(c.deviceList[0]) : 0;
-  return *this;
-}
-
-
-GetDeviceListResponse::~GetDeviceListResponse(void)
-{
-  if(deviceList)  delete deviceList;
-}
-
-
-GetDeviceListResponse::GetDeviceListResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETDEVICELISTRESPONSE),
-  deviceList(0)
-{
-}
-
-
-GetDeviceListResponse::GetDeviceListResponse(const GetDeviceListResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__GETDEVICELISTRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const std::vector< std::string>* GetDeviceListResponse::get_deviceList(void)
-{
-  return deviceList;
-}
-
-bool GetDeviceListResponse::set_deviceList(const std::vector< std::string>& deviceList_)
-{
-  if(deviceList)  delete deviceList;
-  deviceList=new std::vector< std::string>(deviceList_);
-  return true;
-}
-
-void GetDeviceListResponse::reset_deviceList(void)
-{
-  if(deviceList)  delete deviceList;
-  deviceList=0;
-}
-
-bool GetDeviceListResponse::checkIntegrity(void)
-{
-  return GetDeviceListResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListResponseMarshaller.cpp
deleted file mode 100644
index 8a98df3a0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListResponseMarshaller.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetDeviceListResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/GetDeviceListResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool GetDeviceListResponseMarshaller::checkIntegrity(GetDeviceListResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetDeviceListResponseMarshaller::fromString(const std::string& s,GetDeviceListResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetDeviceListResponseMarshaller::toString(const GetDeviceListResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetDeviceListResponseMarshaller::checkIntegrityConst(const GetDeviceListResponse& s)
-{
-  if(s.deviceList)
-  {
-    unsigned int i=s.deviceList[0].size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value GetDeviceListResponseMarshaller::toJSON(const GetDeviceListResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("BasicCommunication.GetDeviceListResponse");
-
-  if(e.deviceList)
-  {
-    unsigned int i=e.deviceList[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=Json::Value(e.deviceList[0][i]);
-
-    json["result"]["deviceList"]=j;
-  }
-  return json;
-}
-
-
-bool GetDeviceListResponseMarshaller::fromJSON(const Json::Value& json,GetDeviceListResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("BasicCommunication.GetDeviceListResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(c.deviceList)  delete c.deviceList;
-    c.deviceList=0;
-    if(js.isMember("deviceList"))
-    {
-      if(!js["deviceList"].isArray()) return false;
-      unsigned int i=js["deviceList"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-
-      c.deviceList=new std::vector<std::string>();
-      c.deviceList->resize(js["deviceList"].size());
-
-      while(i--)
-      {
-        if(!js["deviceList"][i].isString())
-          return false;
-
-        c.deviceList[0][i]=js["deviceList"][i].asString();
-              }
-    }
-
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListResponseMarshaller.h
deleted file mode 100644
index 1528dd1a4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/GetDeviceListResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETDEVICELISTRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_GETDEVICELISTRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/GetDeviceListResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct GetDeviceListResponseMarshaller
-    {
-      static bool checkIntegrity(GetDeviceListResponse& e);
-      static bool checkIntegrityConst(const GetDeviceListResponse& e);
-    
-      static bool fromString(const std::string& s,GetDeviceListResponse& e);
-      static const std::string toString(const GetDeviceListResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetDeviceListResponse& e);
-      static Json::Value toJSON(const GetDeviceListResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivated.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivated.cpp
deleted file mode 100644
index d1233987d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivated.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppDeactivated.h"
-#include "../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-OnAppDeactivated& OnAppDeactivated::operator =(const OnAppDeactivated& c)
-{
-  appName=c.appName;
-  reason=c.reason;
-  appId=c.appId;
-  return *this;
-}
-
-
-OnAppDeactivated::~OnAppDeactivated(void)
-{
-}
-
-
-OnAppDeactivated::OnAppDeactivated(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPDEACTIVATED)
-{
-}
-
-
-OnAppDeactivated::OnAppDeactivated(const OnAppDeactivated& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPDEACTIVATED,c.getId())
-{
-  *this=c;
-}
-
-
-const std::string& OnAppDeactivated::get_appName(void)
-{
-  return appName;
-}
-
-bool OnAppDeactivated::set_appName(const std::string& appName_)
-{
-  appName=appName_;
-  return true;
-}
-
-const NsSmartDeviceLinkRPCV2::DeactivateReason& OnAppDeactivated::get_reason(void)
-{
-  return reason;
-}
-
-bool OnAppDeactivated::set_reason(const NsSmartDeviceLinkRPCV2::DeactivateReason& reason_)
-{
-  reason=reason_;
-  return true;
-}
-
-int OnAppDeactivated::get_appId(void)
-{
-  return appId;
-}
-
-bool OnAppDeactivated::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool OnAppDeactivated::checkIntegrity(void)
-{
-  return OnAppDeactivatedMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedMarshaller.cpp
deleted file mode 100644
index 89a0d8423..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedMarshaller.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppDeactivated.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/OnAppDeactivatedMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool OnAppDeactivatedMarshaller::checkIntegrity(OnAppDeactivated& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnAppDeactivatedMarshaller::fromString(const std::string& s,OnAppDeactivated& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnAppDeactivatedMarshaller::toString(const OnAppDeactivated& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnAppDeactivatedMarshaller::checkIntegrityConst(const OnAppDeactivated& s)
-{
-  if(s.appName.length()>100)  return false;
-
-  if(!NsSmartDeviceLinkRPCV2::DeactivateReasonMarshaller::checkIntegrityConst(s.reason))  return false;
-
-  return true;
-}
-
-
-Json::Value OnAppDeactivatedMarshaller::toJSON(const OnAppDeactivated& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("BasicCommunication.OnAppDeactivated");
-
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["appName"]=Json::Value(e.appName);;
-  json["params"]["reason"]=NsSmartDeviceLinkRPCV2::DeactivateReasonMarshaller::toJSON(e.reason);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool OnAppDeactivatedMarshaller::fromJSON(const Json::Value& json,OnAppDeactivated& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("BasicCommunication.OnAppDeactivated"))  return false;
-    
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("appName") || !js["appName"].isString())  return false;
-    c.appName=js["appName"].asString();
-    if(c.appName.length()>100)  return false;
-    if(!js.isMember("reason") || !NsSmartDeviceLinkRPCV2::DeactivateReasonMarshaller::fromJSON(js["reason"],c.reason))  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedMarshaller.h
deleted file mode 100644
index bcd82d730..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPDEACTIVATEDMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPDEACTIVATEDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppDeactivated.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct OnAppDeactivatedMarshaller
-    {
-      static bool checkIntegrity(OnAppDeactivated& e);
-      static bool checkIntegrityConst(const OnAppDeactivated& e);
-    
-      static bool fromString(const std::string& s,OnAppDeactivated& e);
-      static const std::string toString(const OnAppDeactivated& e);
-    
-      static bool fromJSON(const Json::Value& s,OnAppDeactivated& e);
-      static Json::Value toJSON(const OnAppDeactivated& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponse.cpp
deleted file mode 100644
index 67d305c85..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-OnAppDeactivatedResponse& OnAppDeactivatedResponse::operator =(const OnAppDeactivatedResponse& c)
-{
-  return *this;
-}
-
-
-OnAppDeactivatedResponse::~OnAppDeactivatedResponse(void)
-{
-}
-
-
-OnAppDeactivatedResponse::OnAppDeactivatedResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPDEACTIVATEDRESPONSE)
-{
-}
-
-
-OnAppDeactivatedResponse::OnAppDeactivatedResponse(const OnAppDeactivatedResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPDEACTIVATEDRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool OnAppDeactivatedResponse::checkIntegrity(void)
-{
-  return OnAppDeactivatedResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponseMarshaller.cpp
deleted file mode 100644
index d35e19839..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool OnAppDeactivatedResponseMarshaller::checkIntegrity(OnAppDeactivatedResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnAppDeactivatedResponseMarshaller::fromString(const std::string& s,OnAppDeactivatedResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnAppDeactivatedResponseMarshaller::toString(const OnAppDeactivatedResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnAppDeactivatedResponseMarshaller::checkIntegrityConst(const OnAppDeactivatedResponse& s)
-{
-  return true;
-}
-
-
-Json::Value OnAppDeactivatedResponseMarshaller::toJSON(const OnAppDeactivatedResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("BasicCommunication.OnAppDeactivatedResponse");
-
-  return json;
-}
-
-
-bool OnAppDeactivatedResponseMarshaller::fromJSON(const Json::Value& json,OnAppDeactivatedResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("BasicCommunication.OnAppDeactivatedResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponseMarshaller.h
deleted file mode 100644
index 28c4da454..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPDEACTIVATEDRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPDEACTIVATEDRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppDeactivatedResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct OnAppDeactivatedResponseMarshaller
-    {
-      static bool checkIntegrity(OnAppDeactivatedResponse& e);
-      static bool checkIntegrityConst(const OnAppDeactivatedResponse& e);
-    
-      static bool fromString(const std::string& s,OnAppDeactivatedResponse& e);
-      static const std::string toString(const OnAppDeactivatedResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,OnAppDeactivatedResponse& e);
-      static Json::Value toJSON(const OnAppDeactivatedResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppRegistered.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppRegistered.cpp
deleted file mode 100644
index 9c78cbd3d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppRegistered.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppRegistered.h"
-#include "../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-OnAppRegistered& OnAppRegistered::operator =(const OnAppRegistered& c)
-{
-  application=c.application;
-  return *this;
-}
-
-
-OnAppRegistered::~OnAppRegistered(void)
-{
-}
-
-
-OnAppRegistered::OnAppRegistered(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPREGISTERED)
-{
-}
-
-
-OnAppRegistered::OnAppRegistered(const OnAppRegistered& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPREGISTERED)
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::HMIApplication& OnAppRegistered::get_application(void)
-{
-  return application;
-}
-
-bool OnAppRegistered::set_application(const NsSmartDeviceLinkRPCV2::HMIApplication& application_)
-{
-  application=application_;
-  return true;
-}
-
-bool OnAppRegistered::checkIntegrity(void)
-{
-  return OnAppRegisteredMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppRegisteredMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppRegisteredMarshaller.cpp
deleted file mode 100644
index 7036d1568..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppRegisteredMarshaller.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppRegistered.h"
-#include "../src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/OnAppRegisteredMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool OnAppRegisteredMarshaller::checkIntegrity(OnAppRegistered& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnAppRegisteredMarshaller::fromString(const std::string& s,OnAppRegistered& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnAppRegisteredMarshaller::toString(const OnAppRegistered& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnAppRegisteredMarshaller::checkIntegrityConst(const OnAppRegistered& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::HMIApplicationMarshaller::checkIntegrityConst(s.application))  return false;
-
-  return true;
-}
-
-
-Json::Value OnAppRegisteredMarshaller::toJSON(const OnAppRegistered& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("BasicCommunication.OnAppRegistered");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["application"]=NsSmartDeviceLinkRPCV2::HMIApplicationMarshaller::toJSON(e.application);;
-  return json;
-}
-
-
-bool OnAppRegisteredMarshaller::fromJSON(const Json::Value& json,OnAppRegistered& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("BasicCommunication.OnAppRegistered"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("application") || !NsSmartDeviceLinkRPCV2::HMIApplicationMarshaller::fromJSON(js["application"],c.application))  return false;
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppRegisteredMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppRegisteredMarshaller.h
deleted file mode 100644
index 6c919bffd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppRegisteredMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPREGISTEREDMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPREGISTEREDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppRegistered.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct OnAppRegisteredMarshaller
-    {
-      static bool checkIntegrity(OnAppRegistered& e);
-      static bool checkIntegrityConst(const OnAppRegistered& e);
-    
-      static bool fromString(const std::string& s,OnAppRegistered& e);
-      static const std::string toString(const OnAppRegistered& e);
-    
-      static bool fromJSON(const Json::Value& s,OnAppRegistered& e);
-      static Json::Value toJSON(const OnAppRegistered& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppUnregistered.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppUnregistered.cpp
deleted file mode 100644
index f7e7e4a5a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppUnregistered.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppUnregistered.h"
-#include "../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-OnAppUnregistered& OnAppUnregistered::operator =(const OnAppUnregistered& c)
-{
-  appName=c.appName;
-  if(reason)  delete reason;
-  reason= c.reason ? new NsSmartDeviceLinkRPCV2::AppInterfaceUnregisteredReason(c.reason[0]) : 0;
-  appId=c.appId;
-  return *this;
-}
-
-
-OnAppUnregistered::~OnAppUnregistered(void)
-{
-  if(reason)  delete reason;
-}
-
-
-OnAppUnregistered::OnAppUnregistered(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPUNREGISTERED),
-  reason(0)
-{
-}
-
-
-OnAppUnregistered::OnAppUnregistered(const OnAppUnregistered& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONAPPUNREGISTERED)
-{
-  *this=c;
-}
-
-
-const std::string& OnAppUnregistered::get_appName(void)
-{
-  return appName;
-}
-
-bool OnAppUnregistered::set_appName(const std::string& appName_)
-{
-  appName=appName_;
-  return true;
-}
-
-const NsSmartDeviceLinkRPCV2::AppInterfaceUnregisteredReason* OnAppUnregistered::get_reason(void)
-{
-  return reason;
-}
-
-bool OnAppUnregistered::set_reason(const NsSmartDeviceLinkRPCV2::AppInterfaceUnregisteredReason& reason_)
-{
-  if(reason)  delete reason;
-  reason=new NsSmartDeviceLinkRPCV2::AppInterfaceUnregisteredReason(reason_);
-  return true;
-}
-
-void OnAppUnregistered::reset_reason(void)
-{
-  if(reason)  delete reason;
-  reason=0;
-}
-
-int OnAppUnregistered::get_appId(void)
-{
-  return appId;
-}
-
-bool OnAppUnregistered::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool OnAppUnregistered::checkIntegrity(void)
-{
-  return OnAppUnregisteredMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppUnregisteredMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppUnregisteredMarshaller.cpp
deleted file mode 100644
index 0ecb87e64..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppUnregisteredMarshaller.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppUnregistered.h"
-#include "../src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/OnAppUnregisteredMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool OnAppUnregisteredMarshaller::checkIntegrity(OnAppUnregistered& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnAppUnregisteredMarshaller::fromString(const std::string& s,OnAppUnregistered& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnAppUnregisteredMarshaller::toString(const OnAppUnregistered& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnAppUnregisteredMarshaller::checkIntegrityConst(const OnAppUnregistered& s)
-{
-  if(s.appName.length()>100)  return false;
-
-  if(s.reason && (!NsSmartDeviceLinkRPCV2::AppInterfaceUnregisteredReasonMarshaller::checkIntegrityConst(s.reason[0])))  return false;
-
-  return true;
-}
-
-
-Json::Value OnAppUnregisteredMarshaller::toJSON(const OnAppUnregistered& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("BasicCommunication.OnAppUnregistered");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["appName"]=Json::Value(e.appName);;
-  if(e.reason)
-    json["params"]["reason"]=NsSmartDeviceLinkRPCV2::AppInterfaceUnregisteredReasonMarshaller::toJSON(e.reason[0]);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool OnAppUnregisteredMarshaller::fromJSON(const Json::Value& json,OnAppUnregistered& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("BasicCommunication.OnAppUnregistered"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("appName") || !js["appName"].isString())  return false;
-    c.appName=js["appName"].asString();
-    if(c.appName.length()>100)  return false;
-
-    if(c.reason)  delete c.reason;
-    c.reason=0;
-    if(js.isMember("reason"))
-    {
-      c.reason=new NsSmartDeviceLinkRPCV2::AppInterfaceUnregisteredReason();
-      if(!NsSmartDeviceLinkRPCV2::AppInterfaceUnregisteredReasonMarshaller::fromJSON(js["reason"],c.reason[0]))  return false;
-    }
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppUnregisteredMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppUnregisteredMarshaller.h
deleted file mode 100644
index 91b171826..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnAppUnregisteredMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPUNREGISTEREDMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONAPPUNREGISTEREDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnAppUnregistered.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct OnAppUnregisteredMarshaller
-    {
-      static bool checkIntegrity(OnAppUnregistered& e);
-      static bool checkIntegrityConst(const OnAppUnregistered& e);
-    
-      static bool fromString(const std::string& s,OnAppUnregistered& e);
-      static const std::string toString(const OnAppUnregistered& e);
-    
-      static bool fromJSON(const Json::Value& s,OnAppUnregistered& e);
-      static Json::Value toJSON(const OnAppUnregistered& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnDeviceListUpdated.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnDeviceListUpdated.cpp
deleted file mode 100644
index 2691690f1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnDeviceListUpdated.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnDeviceListUpdated.h"
-#include "../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-OnDeviceListUpdated& OnDeviceListUpdated::operator =(const OnDeviceListUpdated& c)
-{
-  if(deviceList)  delete deviceList;
-  deviceList= c.deviceList ? new std::vector<std::string>(c.deviceList[0]) : 0;
-  return *this;
-}
-
-
-OnDeviceListUpdated::~OnDeviceListUpdated(void)
-{
-  if(deviceList)  delete deviceList;
-}
-
-
-OnDeviceListUpdated::OnDeviceListUpdated(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONDEVICELISTUPDATED),
-  deviceList(0)
-{
-}
-
-
-OnDeviceListUpdated::OnDeviceListUpdated(const OnDeviceListUpdated& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__ONDEVICELISTUPDATED)
-{
-  *this=c;
-}
-
-
-const std::vector< std::string>* OnDeviceListUpdated::get_deviceList(void)
-{
-  return deviceList;
-}
-
-bool OnDeviceListUpdated::set_deviceList(const std::vector< std::string>& deviceList_)
-{
-  if(deviceList)  delete deviceList;
-  deviceList=new std::vector< std::string>(deviceList_);
-  return true;
-}
-
-void OnDeviceListUpdated::reset_deviceList(void)
-{
-  if(deviceList)  delete deviceList;
-  deviceList=0;
-}
-
-bool OnDeviceListUpdated::checkIntegrity(void)
-{
-  return OnDeviceListUpdatedMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnDeviceListUpdatedMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnDeviceListUpdatedMarshaller.cpp
deleted file mode 100644
index 90c0182bb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnDeviceListUpdatedMarshaller.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnDeviceListUpdated.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/OnDeviceListUpdatedMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool OnDeviceListUpdatedMarshaller::checkIntegrity(OnDeviceListUpdated& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnDeviceListUpdatedMarshaller::fromString(const std::string& s,OnDeviceListUpdated& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnDeviceListUpdatedMarshaller::toString(const OnDeviceListUpdated& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnDeviceListUpdatedMarshaller::checkIntegrityConst(const OnDeviceListUpdated& s)
-{
-  if(s.deviceList)
-  {
-    unsigned int i=s.deviceList[0].size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value OnDeviceListUpdatedMarshaller::toJSON(const OnDeviceListUpdated& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("BasicCommunication.OnDeviceListUpdated");
-  json["params"]=Json::Value(Json::objectValue);
-
-  if(e.deviceList)
-  {
-    unsigned int i=e.deviceList[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=Json::Value(e.deviceList[0][i]);
-
-    json["params"]["deviceList"]=j;
-  }
-  return json;
-}
-
-
-bool OnDeviceListUpdatedMarshaller::fromJSON(const Json::Value& json,OnDeviceListUpdated& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("BasicCommunication.OnDeviceListUpdated"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(c.deviceList)  delete c.deviceList;
-    c.deviceList=0;
-    if(js.isMember("deviceList"))
-    {
-      if(!js["deviceList"].isArray()) return false;
-      unsigned int i=js["deviceList"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-
-      c.deviceList=new std::vector<std::string>();
-      c.deviceList->resize(js["deviceList"].size());
-
-      while(i--)
-      {
-        if(!js["deviceList"][i].isString())
-          return false;
-
-        c.deviceList[0][i]=js["deviceList"][i].asString();
-              }
-    }
-
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnDeviceListUpdatedMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnDeviceListUpdatedMarshaller.h
deleted file mode 100644
index ad26e005e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/OnDeviceListUpdatedMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONDEVICELISTUPDATEDMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_ONDEVICELISTUPDATEDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/OnDeviceListUpdated.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct OnDeviceListUpdatedMarshaller
-    {
-      static bool checkIntegrity(OnDeviceListUpdated& e);
-      static bool checkIntegrityConst(const OnDeviceListUpdated& e);
-    
-      static bool fromString(const std::string& s,OnDeviceListUpdated& e);
-      static const std::string toString(const OnDeviceListUpdated& e);
-    
-      static bool fromJSON(const Json::Value& s,OnDeviceListUpdated& e);
-      static Json::Value toJSON(const OnDeviceListUpdated& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendData.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendData.cpp
deleted file mode 100644
index 6584873bc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendData.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/SendData.h"
-#include "../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-SendData& SendData::operator =(const SendData& c)
-{
-  data=c.data;
-  if(url)  delete url;
-  url= c.url ? new std::string(c.url[0]) : 0;
-  if(timeout)  delete timeout;
-  timeout= c.timeout ? new int(c.timeout[0]) : 0;
-  return *this;
-}
-
-
-SendData::~SendData(void)
-{
-  if(url)  delete url;
-  if(timeout)  delete timeout;
-}
-
-
-SendData::SendData(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__SENDDATA),
-  url(0),
-  timeout(0)
-{
-}
-
-
-SendData::SendData(const SendData& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__SENDDATA,c.getId())
-{
-  *this=c;
-}
-
-
-const std::vector< std::string>& SendData::get_data(void)
-{
-  return data;
-}
-
-bool SendData::set_data(const std::vector< std::string>& data_)
-{
-  data=data_;
-  return true;
-}
-
-const std::string* SendData::get_url(void)
-{
-  return url;
-}
-
-bool SendData::set_url(const std::string& url_)
-{
-  if(url)  delete url;
-  url=new std::string(url_);
-  return true;
-}
-
-void SendData::reset_url(void)
-{
-  if(url)  delete url;
-  url=0;
-}
-
-const int* SendData::get_timeout(void)
-{
-  return timeout;
-}
-
-bool SendData::set_timeout(const int& timeout_)
-{
-  if(timeout)  delete timeout;
-  timeout=new int(timeout_);
-  return true;
-}
-
-void SendData::reset_timeout(void)
-{
-  if(timeout)  delete timeout;
-  timeout=0;
-}
-
-bool SendData::checkIntegrity(void)
-{
-  return SendDataMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataMarshaller.cpp
deleted file mode 100644
index 8f737acae..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataMarshaller.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/SendData.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/SendDataMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool SendDataMarshaller::checkIntegrity(SendData& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SendDataMarshaller::fromString(const std::string& s,SendData& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SendDataMarshaller::toString(const SendData& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SendDataMarshaller::checkIntegrityConst(const SendData& s)
-{
-  {
-    unsigned int i=s.data.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  if(s.url && (s.url[0].length()>1000))  return false;
-
-  if(s.timeout && (s.timeout[0]<-2000000000 || s.timeout[0]>2000000000))  return false;
-
-  return true;
-}
-
-
-Json::Value SendDataMarshaller::toJSON(const SendData& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("BasicCommunication.SendData");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  {
-    unsigned int i=e.data.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=Json::Value(e.data[i]);
-
-    json["params"]["data"]=j;
-  }
-  if(e.url)
-    json["params"]["url"]=Json::Value(e.url[0]);;
-  if(e.timeout)
-    json["params"]["timeout"]=Json::Value(e.timeout[0]);;
-  return json;
-}
-
-
-bool SendDataMarshaller::fromJSON(const Json::Value& json,SendData& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("BasicCommunication.SendData"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("data") || !js["data"].isArray())
-      return false;
-    {
-      c.data.clear();
-      unsigned int i=js["data"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.data.resize(i);
-      while(i--)
-      {
-        if(!js["data"][i].isString())
-          return false;
-        c.data[i]=js["data"][i].asString();
-        
-      }
-    }
-
-
-    if(c.url)  delete c.url;
-    c.url=0;
-    if(js.isMember("url"))
-    {
-      if(!js["url"].isString())  return false;
-      c.url=new std::string();
-      c.url[0]=js["url"].asString();
-      if(c.url[0].length()>1000)  return false;
-
-    }
-
-    if(c.timeout)  delete c.timeout;
-    c.timeout=0;
-    if(js.isMember("timeout"))
-    {
-      if(!js["timeout"].isInt())  return false;
-      c.timeout=new int();
-      c.timeout[0]=js["timeout"].asInt();
-      if(c.timeout[0]<-2000000000 || c.timeout[0]>2000000000)  return false;
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataMarshaller.h
deleted file mode 100644
index f20fbeb5a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_SENDDATAMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_SENDDATAMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/SendData.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct SendDataMarshaller
-    {
-      static bool checkIntegrity(SendData& e);
-      static bool checkIntegrityConst(const SendData& e);
-    
-      static bool fromString(const std::string& s,SendData& e);
-      static const std::string toString(const SendData& e);
-    
-      static bool fromJSON(const Json::Value& s,SendData& e);
-      static Json::Value toJSON(const SendData& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataResponse.cpp
deleted file mode 100644
index db77e7e39..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/SendDataResponse.h"
-#include "../include/JSONHandler/RPC2Objects//Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-
-SendDataResponse& SendDataResponse::operator =(const SendDataResponse& c)
-{
-  return *this;
-}
-
-
-SendDataResponse::~SendDataResponse(void)
-{
-}
-
-
-SendDataResponse::SendDataResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__SENDDATARESPONSE)
-{
-}
-
-
-SendDataResponse::SendDataResponse(const SendDataResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_BASICCOMMUNICATION__SENDDATARESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool SendDataResponse::checkIntegrity(void)
-{
-  return SendDataResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataResponseMarshaller.cpp
deleted file mode 100644
index 8a494799a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/SendDataResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/RPC2ObjectsImpl//NsRPC2Communication/BasicCommunication/SendDataResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::BasicCommunication
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::BasicCommunication;
-
-bool SendDataResponseMarshaller::checkIntegrity(SendDataResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SendDataResponseMarshaller::fromString(const std::string& s,SendDataResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SendDataResponseMarshaller::toString(const SendDataResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SendDataResponseMarshaller::checkIntegrityConst(const SendDataResponse& s)
-{
-  return true;
-}
-
-
-Json::Value SendDataResponseMarshaller::toJSON(const SendDataResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("BasicCommunication.SendDataResponse");
-
-  return json;
-}
-
-
-bool SendDataResponseMarshaller::fromJSON(const Json::Value& json,SendDataResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("BasicCommunication.SendDataResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataResponseMarshaller.h
deleted file mode 100644
index 94974d99c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/BasicCommunication/SendDataResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_SENDDATARESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_SMARTDEVICELINKCORE_SENDDATARESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/BasicCommunication/SendDataResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace BasicCommunication
-  {
-
-    struct SendDataResponseMarshaller
-    {
-      static bool checkIntegrity(SendDataResponse& e);
-      static bool checkIntegrityConst(const SendDataResponse& e);
-    
-      static bool fromString(const std::string& s,SendDataResponse& e);
-      static const std::string toString(const SendDataResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,SendDataResponse& e);
-      static Json::Value toJSON(const SendDataResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilities.cpp
deleted file mode 100644
index 4a90e5e58..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilities.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/GetCapabilities.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::Buttons;
-
-
-GetCapabilities& GetCapabilities::operator =(const GetCapabilities& c)
-{
-  return *this;
-}
-
-
-GetCapabilities::~GetCapabilities(void)
-{
-}
-
-
-GetCapabilities::GetCapabilities(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_BUTTONS__GETCAPABILITIES)
-{
-}
-
-
-GetCapabilities::GetCapabilities(const GetCapabilities& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_BUTTONS__GETCAPABILITIES,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetCapabilities::checkIntegrity(void)
-{
-  return GetCapabilitiesMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesMarshaller.cpp
deleted file mode 100644
index d1d22df2d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/GetCapabilities.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/Buttons/GetCapabilitiesMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::Buttons;
-
-bool GetCapabilitiesMarshaller::checkIntegrity(GetCapabilities& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetCapabilitiesMarshaller::fromString(const std::string& s,GetCapabilities& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetCapabilitiesMarshaller::toString(const GetCapabilities& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetCapabilitiesMarshaller::checkIntegrityConst(const GetCapabilities& s)
-{
-  return true;
-}
-
-
-Json::Value GetCapabilitiesMarshaller::toJSON(const GetCapabilities& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("Buttons.GetCapabilities");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetCapabilitiesMarshaller::fromJSON(const Json::Value& json,GetCapabilities& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("Buttons.GetCapabilities"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesMarshaller.h
deleted file mode 100644
index 3d5104802..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_BUTTONS_GETCAPABILITIESMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_BUTTONS_GETCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/GetCapabilities.h"
-
-namespace NsRPC2Communication
-{
-  namespace Buttons
-  {
-
-    struct GetCapabilitiesMarshaller
-    {
-      static bool checkIntegrity(GetCapabilities& e);
-      static bool checkIntegrityConst(const GetCapabilities& e);
-    
-      static bool fromString(const std::string& s,GetCapabilities& e);
-      static const std::string toString(const GetCapabilities& e);
-    
-      static bool fromJSON(const Json::Value& s,GetCapabilities& e);
-      static Json::Value toJSON(const GetCapabilities& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesResponse.cpp
deleted file mode 100644
index f6f3b7467..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesResponse.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/GetCapabilitiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::Buttons;
-
-
-GetCapabilitiesResponse& GetCapabilitiesResponse::operator =(const GetCapabilitiesResponse& c)
-{
-  capabilities=c.capabilities;
-  if(presetBankCapabilities)  delete presetBankCapabilities;
-  presetBankCapabilities= c.presetBankCapabilities ? new NsSmartDeviceLinkRPCV2::PresetBankCapabilities(c.presetBankCapabilities[0]) : 0;
-  return *this;
-}
-
-
-GetCapabilitiesResponse::~GetCapabilitiesResponse(void)
-{
-  if(presetBankCapabilities)  delete presetBankCapabilities;
-}
-
-
-GetCapabilitiesResponse::GetCapabilitiesResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_BUTTONS__GETCAPABILITIESRESPONSE),
-  presetBankCapabilities(0)
-{
-}
-
-
-GetCapabilitiesResponse::GetCapabilitiesResponse(const GetCapabilitiesResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_BUTTONS__GETCAPABILITIESRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::ButtonCapabilities>& GetCapabilitiesResponse::get_capabilities(void)
-{
-  return capabilities;
-}
-
-bool GetCapabilitiesResponse::set_capabilities(const std::vector< NsSmartDeviceLinkRPCV2::ButtonCapabilities>& capabilities_)
-{
-  capabilities=capabilities_;
-  return true;
-}
-
-const NsSmartDeviceLinkRPCV2::PresetBankCapabilities* GetCapabilitiesResponse::get_presetBankCapabilities(void)
-{
-  return presetBankCapabilities;
-}
-
-bool GetCapabilitiesResponse::set_presetBankCapabilities(const NsSmartDeviceLinkRPCV2::PresetBankCapabilities& presetBankCapabilities_)
-{
-  if(presetBankCapabilities)  delete presetBankCapabilities;
-  presetBankCapabilities=new NsSmartDeviceLinkRPCV2::PresetBankCapabilities(presetBankCapabilities_);
-  return true;
-}
-
-void GetCapabilitiesResponse::reset_presetBankCapabilities(void)
-{
-  if(presetBankCapabilities)  delete presetBankCapabilities;
-  presetBankCapabilities=0;
-}
-
-bool GetCapabilitiesResponse::checkIntegrity(void)
-{
-  return GetCapabilitiesResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesResponseMarshaller.cpp
deleted file mode 100644
index 840da1191..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesResponseMarshaller.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/GetCapabilitiesResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/Buttons/GetCapabilitiesResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::Buttons;
-
-bool GetCapabilitiesResponseMarshaller::checkIntegrity(GetCapabilitiesResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetCapabilitiesResponseMarshaller::fromString(const std::string& s,GetCapabilitiesResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetCapabilitiesResponseMarshaller::toString(const GetCapabilitiesResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetCapabilitiesResponseMarshaller::checkIntegrityConst(const GetCapabilitiesResponse& s)
-{
-  {
-    unsigned int i=s.capabilities.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  if(s.presetBankCapabilities && (!NsSmartDeviceLinkRPCV2::PresetBankCapabilitiesMarshaller::checkIntegrityConst(s.presetBankCapabilities[0])))  return false;
-
-  return true;
-}
-
-
-Json::Value GetCapabilitiesResponseMarshaller::toJSON(const GetCapabilitiesResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("Buttons.GetCapabilitiesResponse");
-
-  {
-    unsigned int i=e.capabilities.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::ButtonCapabilitiesMarshaller::toJSON(e.capabilities[i]);
-
-    json["result"]["capabilities"]=j;
-  }
-  if(e.presetBankCapabilities)
-    json["result"]["presetBankCapabilities"]=NsSmartDeviceLinkRPCV2::PresetBankCapabilitiesMarshaller::toJSON(e.presetBankCapabilities[0]);;
-  return json;
-}
-
-
-bool GetCapabilitiesResponseMarshaller::fromJSON(const Json::Value& json,GetCapabilitiesResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("Buttons.GetCapabilitiesResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("capabilities") || !js["capabilities"].isArray())  return false;
-    {
-      unsigned int i=js["capabilities"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.capabilities.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::ButtonCapabilities t;
-        if(!NsSmartDeviceLinkRPCV2::ButtonCapabilitiesMarshaller::fromJSON(js["capabilities"][i],t))
-          return false;
-         c.capabilities[i]=t;
-      }
-    }
-
-    if(c.presetBankCapabilities)  delete c.presetBankCapabilities;
-    c.presetBankCapabilities=0;
-    if(js.isMember("presetBankCapabilities"))
-    {
-      c.presetBankCapabilities=new NsSmartDeviceLinkRPCV2::PresetBankCapabilities();
-      if(!NsSmartDeviceLinkRPCV2::PresetBankCapabilitiesMarshaller::fromJSON(js["presetBankCapabilities"],c.presetBankCapabilities[0]))  return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesResponseMarshaller.h
deleted file mode 100644
index ec0f76042..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/GetCapabilitiesResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_BUTTONS_GETCAPABILITIESRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_BUTTONS_GETCAPABILITIESRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/GetCapabilitiesResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace Buttons
-  {
-
-    struct GetCapabilitiesResponseMarshaller
-    {
-      static bool checkIntegrity(GetCapabilitiesResponse& e);
-      static bool checkIntegrityConst(const GetCapabilitiesResponse& e);
-    
-      static bool fromString(const std::string& s,GetCapabilitiesResponse& e);
-      static const std::string toString(const GetCapabilitiesResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetCapabilitiesResponse& e);
-      static Json::Value toJSON(const GetCapabilitiesResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonEvent.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonEvent.cpp
deleted file mode 100644
index 9a5d976e2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonEvent.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/OnButtonEvent.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::Buttons;
-
-
-OnButtonEvent& OnButtonEvent::operator =(const OnButtonEvent& c)
-{
-  name=c.name;
-  mode=c.mode;
-  if(customButtonID)  delete customButtonID;
-  customButtonID= c.customButtonID ? new unsigned int(c.customButtonID[0]) : 0;
-  return *this;
-}
-
-
-OnButtonEvent::~OnButtonEvent(void)
-{
-  if(customButtonID)  delete customButtonID;
-}
-
-
-OnButtonEvent::OnButtonEvent(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_BUTTONS__ONBUTTONEVENT),
-  customButtonID(0)
-{
-}
-
-
-OnButtonEvent::OnButtonEvent(const OnButtonEvent& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_BUTTONS__ONBUTTONEVENT)
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::ButtonName& OnButtonEvent::get_name(void)
-{
-  return name;
-}
-
-bool OnButtonEvent::set_name(const NsSmartDeviceLinkRPCV2::ButtonName& name_)
-{
-  name=name_;
-  return true;
-}
-
-const NsSmartDeviceLinkRPCV2::ButtonEventMode& OnButtonEvent::get_mode(void)
-{
-  return mode;
-}
-
-bool OnButtonEvent::set_mode(const NsSmartDeviceLinkRPCV2::ButtonEventMode& mode_)
-{
-  mode=mode_;
-  return true;
-}
-
-const unsigned int* OnButtonEvent::get_customButtonID(void)
-{
-  return customButtonID;
-}
-
-bool OnButtonEvent::set_customButtonID(const unsigned int& customButtonID_)
-{
-  if(customButtonID)  delete customButtonID;
-  customButtonID=new unsigned int(customButtonID_);
-  return true;
-}
-
-void OnButtonEvent::reset_customButtonID(void)
-{
-  if(customButtonID)  delete customButtonID;
-  customButtonID=0;
-}
-
-bool OnButtonEvent::checkIntegrity(void)
-{
-  return OnButtonEventMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonEventMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonEventMarshaller.cpp
deleted file mode 100644
index 3de10cfbf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonEventMarshaller.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/OnButtonEvent.h"
-#include "../src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/Buttons/OnButtonEventMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::Buttons;
-
-bool OnButtonEventMarshaller::checkIntegrity(OnButtonEvent& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnButtonEventMarshaller::fromString(const std::string& s,OnButtonEvent& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnButtonEventMarshaller::toString(const OnButtonEvent& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnButtonEventMarshaller::checkIntegrityConst(const OnButtonEvent& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::ButtonNameMarshaller::checkIntegrityConst(s.name))  return false;
-
-  if(!NsSmartDeviceLinkRPCV2::ButtonEventModeMarshaller::checkIntegrityConst(s.mode))  return false;
-
-  if(s.customButtonID && (s.customButtonID[0]>65536))  return false;
-
-  return true;
-}
-
-
-Json::Value OnButtonEventMarshaller::toJSON(const OnButtonEvent& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("Buttons.OnButtonEvent");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["name"]=NsSmartDeviceLinkRPCV2::ButtonNameMarshaller::toJSON(e.name);;
-  json["params"]["mode"]=NsSmartDeviceLinkRPCV2::ButtonEventModeMarshaller::toJSON(e.mode);;
-  if(e.customButtonID)
-    json["params"]["customButtonID"]=Json::Value(e.customButtonID[0]);;
-  return json;
-}
-
-
-bool OnButtonEventMarshaller::fromJSON(const Json::Value& json,OnButtonEvent& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("Buttons.OnButtonEvent"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("name") || !NsSmartDeviceLinkRPCV2::ButtonNameMarshaller::fromJSON(js["name"],c.name))  return false;
-
-    if(!js.isMember("mode") || !NsSmartDeviceLinkRPCV2::ButtonEventModeMarshaller::fromJSON(js["mode"],c.mode))  return false;
-
-    if(c.customButtonID)  delete c.customButtonID;
-    c.customButtonID=0;
-    if(js.isMember("customButtonID"))
-    {
-      if(!js["customButtonID"].isInt())  return false;
-      c.customButtonID=new unsigned int();
-      c.customButtonID[0]=js["customButtonID"].asInt();
-      if(c.customButtonID[0]>65536)  return false;
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonEventMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonEventMarshaller.h
deleted file mode 100644
index 993bf2858..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonEventMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_BUTTONS_ONBUTTONEVENTMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_BUTTONS_ONBUTTONEVENTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/OnButtonEvent.h"
-
-namespace NsRPC2Communication
-{
-  namespace Buttons
-  {
-
-    struct OnButtonEventMarshaller
-    {
-      static bool checkIntegrity(OnButtonEvent& e);
-      static bool checkIntegrityConst(const OnButtonEvent& e);
-    
-      static bool fromString(const std::string& s,OnButtonEvent& e);
-      static const std::string toString(const OnButtonEvent& e);
-    
-      static bool fromJSON(const Json::Value& s,OnButtonEvent& e);
-      static Json::Value toJSON(const OnButtonEvent& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonPress.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonPress.cpp
deleted file mode 100644
index 41d06216e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonPress.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/OnButtonPress.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::Buttons;
-
-
-OnButtonPress& OnButtonPress::operator =(const OnButtonPress& c)
-{
-  name=c.name;
-  mode=c.mode;
-  if(customButtonID)  delete customButtonID;
-  customButtonID= c.customButtonID ? new unsigned int(c.customButtonID[0]) : 0;
-  return *this;
-}
-
-
-OnButtonPress::~OnButtonPress(void)
-{
-  if(customButtonID)  delete customButtonID;
-}
-
-
-OnButtonPress::OnButtonPress(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_BUTTONS__ONBUTTONPRESS),
-  customButtonID(0)
-{
-}
-
-
-OnButtonPress::OnButtonPress(const OnButtonPress& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_BUTTONS__ONBUTTONPRESS)
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::ButtonName& OnButtonPress::get_name(void)
-{
-  return name;
-}
-
-bool OnButtonPress::set_name(const NsSmartDeviceLinkRPCV2::ButtonName& name_)
-{
-  name=name_;
-  return true;
-}
-
-const NsSmartDeviceLinkRPCV2::ButtonPressMode& OnButtonPress::get_mode(void)
-{
-  return mode;
-}
-
-bool OnButtonPress::set_mode(const NsSmartDeviceLinkRPCV2::ButtonPressMode& mode_)
-{
-  mode=mode_;
-  return true;
-}
-
-const unsigned int* OnButtonPress::get_customButtonID(void)
-{
-  return customButtonID;
-}
-
-bool OnButtonPress::set_customButtonID(const unsigned int& customButtonID_)
-{
-  if(customButtonID)  delete customButtonID;
-  customButtonID=new unsigned int(customButtonID_);
-  return true;
-}
-
-void OnButtonPress::reset_customButtonID(void)
-{
-  if(customButtonID)  delete customButtonID;
-  customButtonID=0;
-}
-
-bool OnButtonPress::checkIntegrity(void)
-{
-  return OnButtonPressMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonPressMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonPressMarshaller.cpp
deleted file mode 100644
index 0f6406656..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonPressMarshaller.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/OnButtonPress.h"
-#include "../src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/Buttons/OnButtonPressMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::Buttons
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::Buttons;
-
-bool OnButtonPressMarshaller::checkIntegrity(OnButtonPress& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnButtonPressMarshaller::fromString(const std::string& s,OnButtonPress& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnButtonPressMarshaller::toString(const OnButtonPress& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnButtonPressMarshaller::checkIntegrityConst(const OnButtonPress& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::ButtonNameMarshaller::checkIntegrityConst(s.name))  return false;
-
-  if(!NsSmartDeviceLinkRPCV2::ButtonPressModeMarshaller::checkIntegrityConst(s.mode))  return false;
-
-  if(s.customButtonID && (s.customButtonID[0]>65536))  return false;
-
-  return true;
-}
-
-
-Json::Value OnButtonPressMarshaller::toJSON(const OnButtonPress& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("Buttons.OnButtonPress");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["name"]=NsSmartDeviceLinkRPCV2::ButtonNameMarshaller::toJSON(e.name);;
-  json["params"]["mode"]=NsSmartDeviceLinkRPCV2::ButtonPressModeMarshaller::toJSON(e.mode);;
-  if(e.customButtonID)
-    json["params"]["customButtonID"]=Json::Value(e.customButtonID[0]);;
-  return json;
-}
-
-
-bool OnButtonPressMarshaller::fromJSON(const Json::Value& json,OnButtonPress& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("Buttons.OnButtonPress"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("name") || !NsSmartDeviceLinkRPCV2::ButtonNameMarshaller::fromJSON(js["name"],c.name))  return false;
-
-    if(!js.isMember("mode") || !NsSmartDeviceLinkRPCV2::ButtonPressModeMarshaller::fromJSON(js["mode"],c.mode))  return false;
-
-    if(c.customButtonID)  delete c.customButtonID;
-    c.customButtonID=0;
-    if(js.isMember("customButtonID"))
-    {
-      if(!js["customButtonID"].isInt())  return false;
-      c.customButtonID=new unsigned int();
-      c.customButtonID[0]=js["customButtonID"].asInt();
-      if(c.customButtonID[0]>65536)  return false;
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonPressMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonPressMarshaller.h
deleted file mode 100644
index 56d99c1e1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/Buttons/OnButtonPressMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_BUTTONS_ONBUTTONPRESSMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_BUTTONS_ONBUTTONPRESSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/Buttons/OnButtonPress.h"
-
-namespace NsRPC2Communication
-{
-  namespace Buttons
-  {
-
-    struct OnButtonPressMarshaller
-    {
-      static bool checkIntegrity(OnButtonPress& e);
-      static bool checkIntegrityConst(const OnButtonPress& e);
-    
-      static bool fromString(const std::string& s,OnButtonPress& e);
-      static const std::string toString(const OnButtonPress& e);
-    
-      static bool fromJSON(const Json::Value& s,OnButtonPress& e);
-      static Json::Value toJSON(const OnButtonPress& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistration.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistration.cpp
deleted file mode 100644
index 677b85010..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistration.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/ChangeRegistration.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-
-ChangeRegistration& ChangeRegistration::operator =(const ChangeRegistration& c)
-{
-  language=c.language;
-  appId=c.appId;
-  return *this;
-}
-
-
-ChangeRegistration::~ChangeRegistration(void)
-{
-}
-
-
-ChangeRegistration::ChangeRegistration(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__CHANGEREGISTRATION)
-{
-}
-
-
-ChangeRegistration::ChangeRegistration(const ChangeRegistration& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__CHANGEREGISTRATION,c.getId())
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::Language& ChangeRegistration::get_language(void)
-{
-  return language;
-}
-
-bool ChangeRegistration::set_language(const NsSmartDeviceLinkRPCV2::Language& language_)
-{
-  language=language_;
-  return true;
-}
-
-int ChangeRegistration::get_appId(void)
-{
-  return appId;
-}
-
-bool ChangeRegistration::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool ChangeRegistration::checkIntegrity(void)
-{
-  return ChangeRegistrationMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationMarshaller.cpp
deleted file mode 100644
index 8caea11e6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationMarshaller.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/ChangeRegistration.h"
-#include "../src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/ChangeRegistrationMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-bool ChangeRegistrationMarshaller::checkIntegrity(ChangeRegistration& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ChangeRegistrationMarshaller::fromString(const std::string& s,ChangeRegistration& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ChangeRegistrationMarshaller::toString(const ChangeRegistration& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChangeRegistrationMarshaller::checkIntegrityConst(const ChangeRegistration& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::LanguageMarshaller::checkIntegrityConst(s.language))  return false;
-
-  return true;
-}
-
-
-Json::Value ChangeRegistrationMarshaller::toJSON(const ChangeRegistration& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("TTS.ChangeRegistration");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["language"]=NsSmartDeviceLinkRPCV2::LanguageMarshaller::toJSON(e.language);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool ChangeRegistrationMarshaller::fromJSON(const Json::Value& json,ChangeRegistration& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("TTS.ChangeRegistration"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("language") || !NsSmartDeviceLinkRPCV2::LanguageMarshaller::fromJSON(js["language"],c.language))  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationMarshaller.h
deleted file mode 100644
index 4dea50265..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_CHANGEREGISTRATIONMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_CHANGEREGISTRATIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/ChangeRegistration.h"
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    struct ChangeRegistrationMarshaller
-    {
-      static bool checkIntegrity(ChangeRegistration& e);
-      static bool checkIntegrityConst(const ChangeRegistration& e);
-    
-      static bool fromString(const std::string& s,ChangeRegistration& e);
-      static const std::string toString(const ChangeRegistration& e);
-    
-      static bool fromJSON(const Json::Value& s,ChangeRegistration& e);
-      static Json::Value toJSON(const ChangeRegistration& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationResponse.cpp
deleted file mode 100644
index ac9e9e605..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/ChangeRegistrationResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-
-ChangeRegistrationResponse& ChangeRegistrationResponse::operator =(const ChangeRegistrationResponse& c)
-{
-  return *this;
-}
-
-
-ChangeRegistrationResponse::~ChangeRegistrationResponse(void)
-{
-}
-
-
-ChangeRegistrationResponse::ChangeRegistrationResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__CHANGEREGISTRATIONRESPONSE)
-{
-}
-
-
-ChangeRegistrationResponse::ChangeRegistrationResponse(const ChangeRegistrationResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__CHANGEREGISTRATIONRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool ChangeRegistrationResponse::checkIntegrity(void)
-{
-  return ChangeRegistrationResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationResponseMarshaller.cpp
deleted file mode 100644
index dc3906a48..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/ChangeRegistrationResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/ChangeRegistrationResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-bool ChangeRegistrationResponseMarshaller::checkIntegrity(ChangeRegistrationResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ChangeRegistrationResponseMarshaller::fromString(const std::string& s,ChangeRegistrationResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ChangeRegistrationResponseMarshaller::toString(const ChangeRegistrationResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChangeRegistrationResponseMarshaller::checkIntegrityConst(const ChangeRegistrationResponse& s)
-{
-  return true;
-}
-
-
-Json::Value ChangeRegistrationResponseMarshaller::toJSON(const ChangeRegistrationResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("TTS.ChangeRegistrationResponse");
-
-  return json;
-}
-
-
-bool ChangeRegistrationResponseMarshaller::fromJSON(const Json::Value& json,ChangeRegistrationResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("TTS.ChangeRegistrationResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationResponseMarshaller.h
deleted file mode 100644
index 1e2827c6c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/ChangeRegistrationResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_CHANGEREGISTRATIONRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_CHANGEREGISTRATIONRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/ChangeRegistrationResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    struct ChangeRegistrationResponseMarshaller
-    {
-      static bool checkIntegrity(ChangeRegistrationResponse& e);
-      static bool checkIntegrityConst(const ChangeRegistrationResponse& e);
-    
-      static bool fromString(const std::string& s,ChangeRegistrationResponse& e);
-      static const std::string toString(const ChangeRegistrationResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,ChangeRegistrationResponse& e);
-      static Json::Value toJSON(const ChangeRegistrationResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilities.cpp
deleted file mode 100644
index 2d795d56b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilities.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetCapabilities.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-
-GetCapabilities& GetCapabilities::operator =(const GetCapabilities& c)
-{
-  return *this;
-}
-
-
-GetCapabilities::~GetCapabilities(void)
-{
-}
-
-
-GetCapabilities::GetCapabilities(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__GETCAPABILITIES)
-{
-}
-
-
-GetCapabilities::GetCapabilities(const GetCapabilities& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__GETCAPABILITIES,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetCapabilities::checkIntegrity(void)
-{
-  return GetCapabilitiesMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesMarshaller.cpp
deleted file mode 100644
index 53f80bf36..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetCapabilities.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/GetCapabilitiesMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-bool GetCapabilitiesMarshaller::checkIntegrity(GetCapabilities& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetCapabilitiesMarshaller::fromString(const std::string& s,GetCapabilities& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetCapabilitiesMarshaller::toString(const GetCapabilities& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetCapabilitiesMarshaller::checkIntegrityConst(const GetCapabilities& s)
-{
-  return true;
-}
-
-
-Json::Value GetCapabilitiesMarshaller::toJSON(const GetCapabilities& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("TTS.GetCapabilities");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetCapabilitiesMarshaller::fromJSON(const Json::Value& json,GetCapabilities& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("TTS.GetCapabilities"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesMarshaller.h
deleted file mode 100644
index a51b33f6e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_GETCAPABILITIESMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_GETCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetCapabilities.h"
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    struct GetCapabilitiesMarshaller
-    {
-      static bool checkIntegrity(GetCapabilities& e);
-      static bool checkIntegrityConst(const GetCapabilities& e);
-    
-      static bool fromString(const std::string& s,GetCapabilities& e);
-      static const std::string toString(const GetCapabilities& e);
-    
-      static bool fromJSON(const Json::Value& s,GetCapabilities& e);
-      static Json::Value toJSON(const GetCapabilities& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesResponse.cpp
deleted file mode 100644
index c89469c1d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesResponse.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetCapabilitiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-
-GetCapabilitiesResponse& GetCapabilitiesResponse::operator =(const GetCapabilitiesResponse& c)
-{
-  capabilities=c.capabilities;
-  return *this;
-}
-
-
-GetCapabilitiesResponse::~GetCapabilitiesResponse(void)
-{
-}
-
-
-GetCapabilitiesResponse::GetCapabilitiesResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__GETCAPABILITIESRESPONSE)
-{
-}
-
-
-GetCapabilitiesResponse::GetCapabilitiesResponse(const GetCapabilitiesResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__GETCAPABILITIESRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::SpeechCapabilities>& GetCapabilitiesResponse::get_capabilities(void)
-{
-  return capabilities;
-}
-
-bool GetCapabilitiesResponse::set_capabilities(const std::vector< NsSmartDeviceLinkRPCV2::SpeechCapabilities>& capabilities_)
-{
-  capabilities=capabilities_;
-  return true;
-}
-
-bool GetCapabilitiesResponse::checkIntegrity(void)
-{
-  return GetCapabilitiesResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesResponseMarshaller.cpp
deleted file mode 100644
index 33f5c88ca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesResponseMarshaller.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetCapabilitiesResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/GetCapabilitiesResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-bool GetCapabilitiesResponseMarshaller::checkIntegrity(GetCapabilitiesResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetCapabilitiesResponseMarshaller::fromString(const std::string& s,GetCapabilitiesResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetCapabilitiesResponseMarshaller::toString(const GetCapabilitiesResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetCapabilitiesResponseMarshaller::checkIntegrityConst(const GetCapabilitiesResponse& s)
-{
-  {
-    unsigned int i=s.capabilities.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value GetCapabilitiesResponseMarshaller::toJSON(const GetCapabilitiesResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("TTS.GetCapabilitiesResponse");
-
-  {
-    unsigned int i=e.capabilities.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::SpeechCapabilitiesMarshaller::toJSON(e.capabilities[i]);
-
-    json["result"]["capabilities"]=j;
-  }
-  return json;
-}
-
-
-bool GetCapabilitiesResponseMarshaller::fromJSON(const Json::Value& json,GetCapabilitiesResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("TTS.GetCapabilitiesResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("capabilities") || !js["capabilities"].isArray())  return false;
-    {
-      unsigned int i=js["capabilities"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.capabilities.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::SpeechCapabilities t;
-        if(!NsSmartDeviceLinkRPCV2::SpeechCapabilitiesMarshaller::fromJSON(js["capabilities"][i],t))
-          return false;
-         c.capabilities[i]=t;
-      }
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesResponseMarshaller.h
deleted file mode 100644
index 312fb9d61..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetCapabilitiesResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_GETCAPABILITIESRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_GETCAPABILITIESRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetCapabilitiesResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    struct GetCapabilitiesResponseMarshaller
-    {
-      static bool checkIntegrity(GetCapabilitiesResponse& e);
-      static bool checkIntegrityConst(const GetCapabilitiesResponse& e);
-    
-      static bool fromString(const std::string& s,GetCapabilitiesResponse& e);
-      static const std::string toString(const GetCapabilitiesResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetCapabilitiesResponse& e);
-      static Json::Value toJSON(const GetCapabilitiesResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguage.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguage.cpp
deleted file mode 100644
index aa76e3acd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguage.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetLanguage.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-
-GetLanguage& GetLanguage::operator =(const GetLanguage& c)
-{
-  return *this;
-}
-
-
-GetLanguage::~GetLanguage(void)
-{
-}
-
-
-GetLanguage::GetLanguage(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__GETLANGUAGE)
-{
-}
-
-
-GetLanguage::GetLanguage(const GetLanguage& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__GETLANGUAGE,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetLanguage::checkIntegrity(void)
-{
-  return GetLanguageMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageMarshaller.cpp
deleted file mode 100644
index c6f3b9405..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetLanguage.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/GetLanguageMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-bool GetLanguageMarshaller::checkIntegrity(GetLanguage& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetLanguageMarshaller::fromString(const std::string& s,GetLanguage& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetLanguageMarshaller::toString(const GetLanguage& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetLanguageMarshaller::checkIntegrityConst(const GetLanguage& s)
-{
-  return true;
-}
-
-
-Json::Value GetLanguageMarshaller::toJSON(const GetLanguage& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("TTS.GetLanguage");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetLanguageMarshaller::fromJSON(const Json::Value& json,GetLanguage& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("TTS.GetLanguage"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageMarshaller.h
deleted file mode 100644
index 2ec47e7d5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_GETLANGUAGEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_GETLANGUAGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetLanguage.h"
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    struct GetLanguageMarshaller
-    {
-      static bool checkIntegrity(GetLanguage& e);
-      static bool checkIntegrityConst(const GetLanguage& e);
-    
-      static bool fromString(const std::string& s,GetLanguage& e);
-      static const std::string toString(const GetLanguage& e);
-    
-      static bool fromJSON(const Json::Value& s,GetLanguage& e);
-      static Json::Value toJSON(const GetLanguage& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageResponse.cpp
deleted file mode 100644
index 388dc5b2a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageResponse.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetLanguageResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-
-GetLanguageResponse& GetLanguageResponse::operator =(const GetLanguageResponse& c)
-{
-  language=c.language;
-  return *this;
-}
-
-
-GetLanguageResponse::~GetLanguageResponse(void)
-{
-}
-
-
-GetLanguageResponse::GetLanguageResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__GETLANGUAGERESPONSE)
-{
-}
-
-
-GetLanguageResponse::GetLanguageResponse(const GetLanguageResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__GETLANGUAGERESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::Language& GetLanguageResponse::get_language(void)
-{
-  return language;
-}
-
-bool GetLanguageResponse::set_language(const NsSmartDeviceLinkRPCV2::Language& language_)
-{
-  language=language_;
-  return true;
-}
-
-bool GetLanguageResponse::checkIntegrity(void)
-{
-  return GetLanguageResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageResponseMarshaller.cpp
deleted file mode 100644
index 072c870b2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageResponseMarshaller.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetLanguageResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/GetLanguageResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-bool GetLanguageResponseMarshaller::checkIntegrity(GetLanguageResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetLanguageResponseMarshaller::fromString(const std::string& s,GetLanguageResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetLanguageResponseMarshaller::toString(const GetLanguageResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetLanguageResponseMarshaller::checkIntegrityConst(const GetLanguageResponse& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::LanguageMarshaller::checkIntegrityConst(s.language))  return false;
-
-  return true;
-}
-
-
-Json::Value GetLanguageResponseMarshaller::toJSON(const GetLanguageResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("TTS.GetLanguageResponse");
-
-  json["result"]["language"]=NsSmartDeviceLinkRPCV2::LanguageMarshaller::toJSON(e.language);;
-  return json;
-}
-
-
-bool GetLanguageResponseMarshaller::fromJSON(const Json::Value& json,GetLanguageResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("TTS.GetLanguageResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("language") || !NsSmartDeviceLinkRPCV2::LanguageMarshaller::fromJSON(js["language"],c.language))  return false;
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageResponseMarshaller.h
deleted file mode 100644
index e8cddbb1c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetLanguageResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_GETLANGUAGERESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_GETLANGUAGERESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetLanguageResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    struct GetLanguageResponseMarshaller
-    {
-      static bool checkIntegrity(GetLanguageResponse& e);
-      static bool checkIntegrityConst(const GetLanguageResponse& e);
-    
-      static bool fromString(const std::string& s,GetLanguageResponse& e);
-      static const std::string toString(const GetLanguageResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetLanguageResponse& e);
-      static Json::Value toJSON(const GetLanguageResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguages.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguages.cpp
deleted file mode 100644
index 6e866e448..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguages.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetSupportedLanguages.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-
-GetSupportedLanguages& GetSupportedLanguages::operator =(const GetSupportedLanguages& c)
-{
-  return *this;
-}
-
-
-GetSupportedLanguages::~GetSupportedLanguages(void)
-{
-}
-
-
-GetSupportedLanguages::GetSupportedLanguages(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__GETSUPPORTEDLANGUAGES)
-{
-}
-
-
-GetSupportedLanguages::GetSupportedLanguages(const GetSupportedLanguages& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__GETSUPPORTEDLANGUAGES,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetSupportedLanguages::checkIntegrity(void)
-{
-  return GetSupportedLanguagesMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesMarshaller.cpp
deleted file mode 100644
index 032c44710..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetSupportedLanguages.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/GetSupportedLanguagesMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-bool GetSupportedLanguagesMarshaller::checkIntegrity(GetSupportedLanguages& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetSupportedLanguagesMarshaller::fromString(const std::string& s,GetSupportedLanguages& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetSupportedLanguagesMarshaller::toString(const GetSupportedLanguages& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetSupportedLanguagesMarshaller::checkIntegrityConst(const GetSupportedLanguages& s)
-{
-  return true;
-}
-
-
-Json::Value GetSupportedLanguagesMarshaller::toJSON(const GetSupportedLanguages& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("TTS.GetSupportedLanguages");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetSupportedLanguagesMarshaller::fromJSON(const Json::Value& json,GetSupportedLanguages& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("TTS.GetSupportedLanguages"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesMarshaller.h
deleted file mode 100644
index 6c1cac285..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_GETSUPPORTEDLANGUAGESMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_GETSUPPORTEDLANGUAGESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetSupportedLanguages.h"
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    struct GetSupportedLanguagesMarshaller
-    {
-      static bool checkIntegrity(GetSupportedLanguages& e);
-      static bool checkIntegrityConst(const GetSupportedLanguages& e);
-    
-      static bool fromString(const std::string& s,GetSupportedLanguages& e);
-      static const std::string toString(const GetSupportedLanguages& e);
-    
-      static bool fromJSON(const Json::Value& s,GetSupportedLanguages& e);
-      static Json::Value toJSON(const GetSupportedLanguages& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesResponse.cpp
deleted file mode 100644
index cc2034235..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesResponse.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetSupportedLanguagesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-
-GetSupportedLanguagesResponse& GetSupportedLanguagesResponse::operator =(const GetSupportedLanguagesResponse& c)
-{
-  languages=c.languages;
-  return *this;
-}
-
-
-GetSupportedLanguagesResponse::~GetSupportedLanguagesResponse(void)
-{
-}
-
-
-GetSupportedLanguagesResponse::GetSupportedLanguagesResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__GETSUPPORTEDLANGUAGESRESPONSE)
-{
-}
-
-
-GetSupportedLanguagesResponse::GetSupportedLanguagesResponse(const GetSupportedLanguagesResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__GETSUPPORTEDLANGUAGESRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::Language>& GetSupportedLanguagesResponse::get_languages(void)
-{
-  return languages;
-}
-
-bool GetSupportedLanguagesResponse::set_languages(const std::vector< NsSmartDeviceLinkRPCV2::Language>& languages_)
-{
-  languages=languages_;
-  return true;
-}
-
-bool GetSupportedLanguagesResponse::checkIntegrity(void)
-{
-  return GetSupportedLanguagesResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesResponseMarshaller.cpp
deleted file mode 100644
index 950fccce3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesResponseMarshaller.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetSupportedLanguagesResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/GetSupportedLanguagesResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-bool GetSupportedLanguagesResponseMarshaller::checkIntegrity(GetSupportedLanguagesResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetSupportedLanguagesResponseMarshaller::fromString(const std::string& s,GetSupportedLanguagesResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetSupportedLanguagesResponseMarshaller::toString(const GetSupportedLanguagesResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetSupportedLanguagesResponseMarshaller::checkIntegrityConst(const GetSupportedLanguagesResponse& s)
-{
-  {
-    unsigned int i=s.languages.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value GetSupportedLanguagesResponseMarshaller::toJSON(const GetSupportedLanguagesResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("TTS.GetSupportedLanguagesResponse");
-
-  {
-    unsigned int i=e.languages.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::LanguageMarshaller::toJSON(e.languages[i]);
-
-    json["result"]["languages"]=j;
-  }
-  return json;
-}
-
-
-bool GetSupportedLanguagesResponseMarshaller::fromJSON(const Json::Value& json,GetSupportedLanguagesResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("TTS.GetSupportedLanguagesResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("languages") || !js["languages"].isArray())  return false;
-    {
-      unsigned int i=js["languages"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.languages.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::Language t;
-        if(!NsSmartDeviceLinkRPCV2::LanguageMarshaller::fromJSON(js["languages"][i],t))
-          return false;
-         c.languages[i]=t;
-      }
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesResponseMarshaller.h
deleted file mode 100644
index f47d3e77e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/GetSupportedLanguagesResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_GETSUPPORTEDLANGUAGESRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_GETSUPPORTEDLANGUAGESRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/GetSupportedLanguagesResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    struct GetSupportedLanguagesResponseMarshaller
-    {
-      static bool checkIntegrity(GetSupportedLanguagesResponse& e);
-      static bool checkIntegrityConst(const GetSupportedLanguagesResponse& e);
-    
-      static bool fromString(const std::string& s,GetSupportedLanguagesResponse& e);
-      static const std::string toString(const GetSupportedLanguagesResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetSupportedLanguagesResponse& e);
-      static Json::Value toJSON(const GetSupportedLanguagesResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/OnLanguageChange.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/OnLanguageChange.cpp
deleted file mode 100644
index 085226645..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/OnLanguageChange.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/OnLanguageChange.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-
-OnLanguageChange& OnLanguageChange::operator =(const OnLanguageChange& c)
-{
-  language=c.language;
-  return *this;
-}
-
-
-OnLanguageChange::~OnLanguageChange(void)
-{
-}
-
-
-OnLanguageChange::OnLanguageChange(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__ONLANGUAGECHANGE)
-{
-}
-
-
-OnLanguageChange::OnLanguageChange(const OnLanguageChange& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__ONLANGUAGECHANGE)
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::Language& OnLanguageChange::get_language(void)
-{
-  return language;
-}
-
-bool OnLanguageChange::set_language(const NsSmartDeviceLinkRPCV2::Language& language_)
-{
-  language=language_;
-  return true;
-}
-
-bool OnLanguageChange::checkIntegrity(void)
-{
-  return OnLanguageChangeMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/OnLanguageChangeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/OnLanguageChangeMarshaller.cpp
deleted file mode 100644
index 950bb3602..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/OnLanguageChangeMarshaller.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/OnLanguageChange.h"
-#include "../src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/OnLanguageChangeMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-bool OnLanguageChangeMarshaller::checkIntegrity(OnLanguageChange& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnLanguageChangeMarshaller::fromString(const std::string& s,OnLanguageChange& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnLanguageChangeMarshaller::toString(const OnLanguageChange& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnLanguageChangeMarshaller::checkIntegrityConst(const OnLanguageChange& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::LanguageMarshaller::checkIntegrityConst(s.language))  return false;
-
-  return true;
-}
-
-
-Json::Value OnLanguageChangeMarshaller::toJSON(const OnLanguageChange& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("TTS.OnLanguageChange");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["language"]=NsSmartDeviceLinkRPCV2::LanguageMarshaller::toJSON(e.language);;
-  return json;
-}
-
-
-bool OnLanguageChangeMarshaller::fromJSON(const Json::Value& json,OnLanguageChange& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("TTS.OnLanguageChange"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("language") || !NsSmartDeviceLinkRPCV2::LanguageMarshaller::fromJSON(js["language"],c.language))  return false;
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/OnLanguageChangeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/OnLanguageChangeMarshaller.h
deleted file mode 100644
index 69273ac53..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/OnLanguageChangeMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_ONLANGUAGECHANGEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_ONLANGUAGECHANGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/OnLanguageChange.h"
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    struct OnLanguageChangeMarshaller
-    {
-      static bool checkIntegrity(OnLanguageChange& e);
-      static bool checkIntegrityConst(const OnLanguageChange& e);
-    
-      static bool fromString(const std::string& s,OnLanguageChange& e);
-      static const std::string toString(const OnLanguageChange& e);
-    
-      static bool fromJSON(const Json::Value& s,OnLanguageChange& e);
-      static Json::Value toJSON(const OnLanguageChange& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/Speak.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/Speak.cpp
deleted file mode 100644
index 1c40aae0c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/Speak.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/Speak.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-
-Speak& Speak::operator =(const Speak& c)
-{
-  ttsChunks=c.ttsChunks;
-  appId=c.appId;
-  return *this;
-}
-
-
-Speak::~Speak(void)
-{
-}
-
-
-Speak::Speak(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__SPEAK)
-{
-}
-
-
-Speak::Speak(const Speak& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__SPEAK,c.getId())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& Speak::get_ttsChunks(void)
-{
-  return ttsChunks;
-}
-
-bool Speak::set_ttsChunks(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& ttsChunks_)
-{
-  ttsChunks=ttsChunks_;
-  return true;
-}
-
-int Speak::get_appId(void)
-{
-  return appId;
-}
-
-bool Speak::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool Speak::checkIntegrity(void)
-{
-  return SpeakMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakMarshaller.cpp
deleted file mode 100644
index 38003bc7a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakMarshaller.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/Speak.h"
-#include "../src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/SpeakMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-bool SpeakMarshaller::checkIntegrity(Speak& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SpeakMarshaller::fromString(const std::string& s,Speak& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SpeakMarshaller::toString(const Speak& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SpeakMarshaller::checkIntegrityConst(const Speak& s)
-{
-  {
-    unsigned int i=s.ttsChunks.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value SpeakMarshaller::toJSON(const Speak& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("TTS.Speak");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  {
-    unsigned int i=e.ttsChunks.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::toJSON(e.ttsChunks[i]);
-
-    json["params"]["ttsChunks"]=j;
-  }
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool SpeakMarshaller::fromJSON(const Json::Value& json,Speak& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("TTS.Speak"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("ttsChunks") || !js["ttsChunks"].isArray())  return false;
-    {
-      unsigned int i=js["ttsChunks"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.ttsChunks.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::TTSChunk t;
-        if(!NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::fromJSON(js["ttsChunks"][i],t))
-          return false;
-         c.ttsChunks[i]=t;
-      }
-    }
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakMarshaller.h
deleted file mode 100644
index 9a1b602f4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_SPEAKMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_SPEAKMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/Speak.h"
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    struct SpeakMarshaller
-    {
-      static bool checkIntegrity(Speak& e);
-      static bool checkIntegrityConst(const Speak& e);
-    
-      static bool fromString(const std::string& s,Speak& e);
-      static const std::string toString(const Speak& e);
-    
-      static bool fromJSON(const Json::Value& s,Speak& e);
-      static Json::Value toJSON(const Speak& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakResponse.cpp
deleted file mode 100644
index c75c589c9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/SpeakResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-
-SpeakResponse& SpeakResponse::operator =(const SpeakResponse& c)
-{
-  return *this;
-}
-
-
-SpeakResponse::~SpeakResponse(void)
-{
-}
-
-
-SpeakResponse::SpeakResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__SPEAKRESPONSE)
-{
-}
-
-
-SpeakResponse::SpeakResponse(const SpeakResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_TTS__SPEAKRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool SpeakResponse::checkIntegrity(void)
-{
-  return SpeakResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakResponseMarshaller.cpp
deleted file mode 100644
index ff0c51db3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/SpeakResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/TTS/SpeakResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::TTS
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::TTS;
-
-bool SpeakResponseMarshaller::checkIntegrity(SpeakResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SpeakResponseMarshaller::fromString(const std::string& s,SpeakResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SpeakResponseMarshaller::toString(const SpeakResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SpeakResponseMarshaller::checkIntegrityConst(const SpeakResponse& s)
-{
-  return true;
-}
-
-
-Json::Value SpeakResponseMarshaller::toJSON(const SpeakResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("TTS.SpeakResponse");
-
-  return json;
-}
-
-
-bool SpeakResponseMarshaller::fromJSON(const Json::Value& json,SpeakResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("TTS.SpeakResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakResponseMarshaller.h
deleted file mode 100644
index c8929c25f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/TTS/SpeakResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_TTS_SPEAKRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_TTS_SPEAKRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/TTS/SpeakResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace TTS
-  {
-
-    struct SpeakResponseMarshaller
-    {
-      static bool checkIntegrity(SpeakResponse& e);
-      static bool checkIntegrityConst(const SpeakResponse& e);
-    
-      static bool fromString(const std::string& s,SpeakResponse& e);
-      static const std::string toString(const SpeakResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,SpeakResponse& e);
-      static Json::Value toJSON(const SpeakResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommand.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommand.cpp
deleted file mode 100644
index 26b38541c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommand.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-AddCommand& AddCommand::operator =(const AddCommand& c)
-{
-  cmdId=c.cmdId;
-  menuParams=c.menuParams;
-  if(cmdIcon)  delete cmdIcon;
-  cmdIcon= c.cmdIcon ? new NsSmartDeviceLinkRPCV2::Image(c.cmdIcon[0]) : 0;
-  appId=c.appId;
-  return *this;
-}
-
-
-AddCommand::~AddCommand(void)
-{
-  if(cmdIcon)  delete cmdIcon;
-}
-
-
-AddCommand::AddCommand(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ADDCOMMAND),
-  cmdIcon(0)
-{
-}
-
-
-AddCommand::AddCommand(const AddCommand& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ADDCOMMAND,c.getId())
-{
-  *this=c;
-}
-
-
-unsigned int AddCommand::get_cmdId(void)
-{
-  return cmdId;
-}
-
-bool AddCommand::set_cmdId(unsigned int cmdId_)
-{
-  cmdId=cmdId_;
-  return true;
-}
-
-const NsSmartDeviceLinkRPCV2::MenuParams& AddCommand::get_menuParams(void)
-{
-  return menuParams;
-}
-
-bool AddCommand::set_menuParams(const NsSmartDeviceLinkRPCV2::MenuParams& menuParams_)
-{
-  menuParams=menuParams_;
-  return true;
-}
-
-const NsSmartDeviceLinkRPCV2::Image* AddCommand::get_cmdIcon(void)
-{
-  return cmdIcon;
-}
-
-bool AddCommand::set_cmdIcon(const NsSmartDeviceLinkRPCV2::Image& cmdIcon_)
-{
-  if(cmdIcon)  delete cmdIcon;
-  cmdIcon=new NsSmartDeviceLinkRPCV2::Image(cmdIcon_);
-  return true;
-}
-
-void AddCommand::reset_cmdIcon(void)
-{
-  if(cmdIcon)  delete cmdIcon;
-  cmdIcon=0;
-}
-
-int AddCommand::get_appId(void)
-{
-  return appId;
-}
-
-bool AddCommand::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool AddCommand::checkIntegrity(void)
-{
-  return AddCommandMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandMarshaller.cpp
deleted file mode 100644
index 3f91cbf9c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandMarshaller.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddCommand.h"
-#include "../src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ImageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AddCommandMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool AddCommandMarshaller::checkIntegrity(AddCommand& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddCommandMarshaller::fromString(const std::string& s,AddCommand& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddCommandMarshaller::toString(const AddCommand& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddCommandMarshaller::checkIntegrityConst(const AddCommand& s)
-{
-  if(s.cmdId>2000000000)  return false;
-
-  if(!NsSmartDeviceLinkRPCV2::MenuParamsMarshaller::checkIntegrityConst(s.menuParams))  return false;
-
-  if(s.cmdIcon && (!NsSmartDeviceLinkRPCV2::ImageMarshaller::checkIntegrityConst(s.cmdIcon[0])))  return false;
-
-  return true;
-}
-
-
-Json::Value AddCommandMarshaller::toJSON(const AddCommand& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.AddCommand");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["cmdId"]=Json::Value(e.cmdId);;
-  json["params"]["menuParams"]=NsSmartDeviceLinkRPCV2::MenuParamsMarshaller::toJSON(e.menuParams);;
-  if(e.cmdIcon)
-    json["params"]["cmdIcon"]=NsSmartDeviceLinkRPCV2::ImageMarshaller::toJSON(e.cmdIcon[0]);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool AddCommandMarshaller::fromJSON(const Json::Value& json,AddCommand& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.AddCommand"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("cmdId") || !js["cmdId"].isInt())  return false;
-    c.cmdId=js["cmdId"].asInt();
-    if(c.cmdId>2000000000)  return false;
-
-    if(!js.isMember("menuParams") || !NsSmartDeviceLinkRPCV2::MenuParamsMarshaller::fromJSON(js["menuParams"],c.menuParams))  return false;
-
-    if(c.cmdIcon)  delete c.cmdIcon;
-    c.cmdIcon=0;
-    if(js.isMember("cmdIcon"))
-    {
-      c.cmdIcon=new NsSmartDeviceLinkRPCV2::Image();
-      if(!NsSmartDeviceLinkRPCV2::ImageMarshaller::fromJSON(js["cmdIcon"],c.cmdIcon[0]))  return false;
-    }
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandMarshaller.h
deleted file mode 100644
index 1548cc356..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ADDCOMMANDMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ADDCOMMANDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddCommand.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct AddCommandMarshaller
-    {
-      static bool checkIntegrity(AddCommand& e);
-      static bool checkIntegrityConst(const AddCommand& e);
-    
-      static bool fromString(const std::string& s,AddCommand& e);
-      static const std::string toString(const AddCommand& e);
-    
-      static bool fromJSON(const Json::Value& s,AddCommand& e);
-      static Json::Value toJSON(const AddCommand& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandResponse.cpp
deleted file mode 100644
index cf40a9e31..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddCommandResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-AddCommandResponse& AddCommandResponse::operator =(const AddCommandResponse& c)
-{
-  return *this;
-}
-
-
-AddCommandResponse::~AddCommandResponse(void)
-{
-}
-
-
-AddCommandResponse::AddCommandResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ADDCOMMANDRESPONSE)
-{
-}
-
-
-AddCommandResponse::AddCommandResponse(const AddCommandResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ADDCOMMANDRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool AddCommandResponse::checkIntegrity(void)
-{
-  return AddCommandResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandResponseMarshaller.cpp
deleted file mode 100644
index d23e3c1b0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddCommandResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AddCommandResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool AddCommandResponseMarshaller::checkIntegrity(AddCommandResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddCommandResponseMarshaller::fromString(const std::string& s,AddCommandResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddCommandResponseMarshaller::toString(const AddCommandResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddCommandResponseMarshaller::checkIntegrityConst(const AddCommandResponse& s)
-{
-  return true;
-}
-
-
-Json::Value AddCommandResponseMarshaller::toJSON(const AddCommandResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.AddCommandResponse");
-
-  return json;
-}
-
-
-bool AddCommandResponseMarshaller::fromJSON(const Json::Value& json,AddCommandResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.AddCommandResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandResponseMarshaller.h
deleted file mode 100644
index 5d4845e41..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddCommandResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ADDCOMMANDRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ADDCOMMANDRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddCommandResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct AddCommandResponseMarshaller
-    {
-      static bool checkIntegrity(AddCommandResponse& e);
-      static bool checkIntegrityConst(const AddCommandResponse& e);
-    
-      static bool fromString(const std::string& s,AddCommandResponse& e);
-      static const std::string toString(const AddCommandResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,AddCommandResponse& e);
-      static Json::Value toJSON(const AddCommandResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenu.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenu.cpp
deleted file mode 100644
index 77a87d230..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenu.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddSubMenu.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-AddSubMenu& AddSubMenu::operator =(const AddSubMenu& c)
-{
-  menuId=c.menuId;
-  if(position)  delete position;
-  position= c.position ? new unsigned int(c.position[0]) : 0;
-  menuName=c.menuName;
-  appId=c.appId;
-  return *this;
-}
-
-
-AddSubMenu::~AddSubMenu(void)
-{
-  if(position)  delete position;
-}
-
-
-AddSubMenu::AddSubMenu(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ADDSUBMENU),
-  position(0)
-{
-}
-
-
-AddSubMenu::AddSubMenu(const AddSubMenu& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ADDSUBMENU,c.getId())
-{
-  *this=c;
-}
-
-
-unsigned int AddSubMenu::get_menuId(void)
-{
-  return menuId;
-}
-
-bool AddSubMenu::set_menuId(unsigned int menuId_)
-{
-  menuId=menuId_;
-  return true;
-}
-
-const unsigned int* AddSubMenu::get_position(void)
-{
-  return position;
-}
-
-bool AddSubMenu::set_position(const unsigned int& position_)
-{
-  if(position)  delete position;
-  position=new unsigned int(position_);
-  return true;
-}
-
-void AddSubMenu::reset_position(void)
-{
-  if(position)  delete position;
-  position=0;
-}
-
-const std::string& AddSubMenu::get_menuName(void)
-{
-  return menuName;
-}
-
-bool AddSubMenu::set_menuName(const std::string& menuName_)
-{
-  menuName=menuName_;
-  return true;
-}
-
-int AddSubMenu::get_appId(void)
-{
-  return appId;
-}
-
-bool AddSubMenu::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool AddSubMenu::checkIntegrity(void)
-{
-  return AddSubMenuMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuMarshaller.cpp
deleted file mode 100644
index 0a17ac478..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuMarshaller.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddSubMenu.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AddSubMenuMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool AddSubMenuMarshaller::checkIntegrity(AddSubMenu& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddSubMenuMarshaller::fromString(const std::string& s,AddSubMenu& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddSubMenuMarshaller::toString(const AddSubMenu& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddSubMenuMarshaller::checkIntegrityConst(const AddSubMenu& s)
-{
-  if(s.menuId>2000000000)  return false;
-
-  if(s.position && (s.position[0]>1000))  return false;
-
-  if(s.menuName.length()>500)  return false;
-
-  return true;
-}
-
-
-Json::Value AddSubMenuMarshaller::toJSON(const AddSubMenu& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.AddSubMenu");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["menuId"]=Json::Value(e.menuId);;
-  if(e.position)
-    json["params"]["position"]=Json::Value(e.position[0]);;
-  json["params"]["menuName"]=Json::Value(e.menuName);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool AddSubMenuMarshaller::fromJSON(const Json::Value& json,AddSubMenu& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.AddSubMenu"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("menuId") || !js["menuId"].isInt())  return false;
-    c.menuId=js["menuId"].asInt();
-    if(c.menuId>2000000000)  return false;
-
-    if(c.position)  delete c.position;
-    c.position=0;
-    if(js.isMember("position"))
-    {
-      if(!js["position"].isInt())  return false;
-      c.position=new unsigned int();
-      c.position[0]=js["position"].asInt();
-      if(c.position[0]>1000)  return false;
-
-    }
-
-    if(!js.isMember("menuName") || !js["menuName"].isString())  return false;
-    c.menuName=js["menuName"].asString();
-    if(c.menuName.length()>500)  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuMarshaller.h
deleted file mode 100644
index bb48df5d0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ADDSUBMENUMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ADDSUBMENUMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddSubMenu.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct AddSubMenuMarshaller
-    {
-      static bool checkIntegrity(AddSubMenu& e);
-      static bool checkIntegrityConst(const AddSubMenu& e);
-    
-      static bool fromString(const std::string& s,AddSubMenu& e);
-      static const std::string toString(const AddSubMenu& e);
-    
-      static bool fromJSON(const Json::Value& s,AddSubMenu& e);
-      static Json::Value toJSON(const AddSubMenu& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuResponse.cpp
deleted file mode 100644
index 213f08085..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddSubMenuResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-AddSubMenuResponse& AddSubMenuResponse::operator =(const AddSubMenuResponse& c)
-{
-  return *this;
-}
-
-
-AddSubMenuResponse::~AddSubMenuResponse(void)
-{
-}
-
-
-AddSubMenuResponse::AddSubMenuResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ADDSUBMENURESPONSE)
-{
-}
-
-
-AddSubMenuResponse::AddSubMenuResponse(const AddSubMenuResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ADDSUBMENURESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool AddSubMenuResponse::checkIntegrity(void)
-{
-  return AddSubMenuResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuResponseMarshaller.cpp
deleted file mode 100644
index 4a6f7c872..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddSubMenuResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AddSubMenuResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool AddSubMenuResponseMarshaller::checkIntegrity(AddSubMenuResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddSubMenuResponseMarshaller::fromString(const std::string& s,AddSubMenuResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddSubMenuResponseMarshaller::toString(const AddSubMenuResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddSubMenuResponseMarshaller::checkIntegrityConst(const AddSubMenuResponse& s)
-{
-  return true;
-}
-
-
-Json::Value AddSubMenuResponseMarshaller::toJSON(const AddSubMenuResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.AddSubMenuResponse");
-
-  return json;
-}
-
-
-bool AddSubMenuResponseMarshaller::fromJSON(const Json::Value& json,AddSubMenuResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.AddSubMenuResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuResponseMarshaller.h
deleted file mode 100644
index 40f5d2e1b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AddSubMenuResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ADDSUBMENURESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ADDSUBMENURESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AddSubMenuResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct AddSubMenuResponseMarshaller
-    {
-      static bool checkIntegrity(AddSubMenuResponse& e);
-      static bool checkIntegrityConst(const AddSubMenuResponse& e);
-    
-      static bool fromString(const std::string& s,AddSubMenuResponse& e);
-      static const std::string toString(const AddSubMenuResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,AddSubMenuResponse& e);
-      static Json::Value toJSON(const AddSubMenuResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/Alert.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/Alert.cpp
deleted file mode 100644
index 000ff4dec..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/Alert.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Alert.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-Alert& Alert::operator =(const Alert& c)
-{
-  if(AlertText1)  delete AlertText1;
-  AlertText1= c.AlertText1 ? new std::string(c.AlertText1[0]) : 0;
-  if(AlertText2)  delete AlertText2;
-  AlertText2= c.AlertText2 ? new std::string(c.AlertText2[0]) : 0;
-  if(AlertText3)  delete AlertText3;
-  AlertText3= c.AlertText3 ? new std::string(c.AlertText3[0]) : 0;
-  if(ttsChunks)  delete ttsChunks;
-  ttsChunks= c.ttsChunks ? new std::vector<NsSmartDeviceLinkRPCV2::TTSChunk>(c.ttsChunks[0]) : 0;
-  if(duration)  delete duration;
-  duration= c.duration ? new unsigned int(c.duration[0]) : 0;
-  if(playTone)  delete playTone;
-  playTone= c.playTone ? new bool(c.playTone[0]) : 0;
-  if(softButtons)  delete softButtons;
-  softButtons= c.softButtons ? new std::vector<NsSmartDeviceLinkRPCV2::SoftButton>(c.softButtons[0]) : 0;
-  appId=c.appId;
-  return *this;
-}
-
-
-Alert::~Alert(void)
-{
-  if(AlertText1)  delete AlertText1;
-  if(AlertText2)  delete AlertText2;
-  if(AlertText3)  delete AlertText3;
-  if(ttsChunks)  delete ttsChunks;
-  if(duration)  delete duration;
-  if(playTone)  delete playTone;
-  if(softButtons)  delete softButtons;
-}
-
-
-Alert::Alert(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ALERT),
-  AlertText1(0),
-  AlertText2(0),
-  AlertText3(0),
-  ttsChunks(0),
-  duration(0),
-  playTone(0),
-  softButtons(0)
-{
-}
-
-
-Alert::Alert(const Alert& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ALERT,c.getId())
-{
-  *this=c;
-}
-
-
-const std::string* Alert::get_AlertText1(void)
-{
-  return AlertText1;
-}
-
-bool Alert::set_AlertText1(const std::string& AlertText1_)
-{
-  if(AlertText1)  delete AlertText1;
-  AlertText1=new std::string(AlertText1_);
-  return true;
-}
-
-void Alert::reset_AlertText1(void)
-{
-  if(AlertText1)  delete AlertText1;
-  AlertText1=0;
-}
-
-const std::string* Alert::get_AlertText2(void)
-{
-  return AlertText2;
-}
-
-bool Alert::set_AlertText2(const std::string& AlertText2_)
-{
-  if(AlertText2)  delete AlertText2;
-  AlertText2=new std::string(AlertText2_);
-  return true;
-}
-
-void Alert::reset_AlertText2(void)
-{
-  if(AlertText2)  delete AlertText2;
-  AlertText2=0;
-}
-
-const std::string* Alert::get_AlertText3(void)
-{
-  return AlertText3;
-}
-
-bool Alert::set_AlertText3(const std::string& AlertText3_)
-{
-  if(AlertText3)  delete AlertText3;
-  AlertText3=new std::string(AlertText3_);
-  return true;
-}
-
-void Alert::reset_AlertText3(void)
-{
-  if(AlertText3)  delete AlertText3;
-  AlertText3=0;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* Alert::get_ttsChunks(void)
-{
-  return ttsChunks;
-}
-
-bool Alert::set_ttsChunks(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& ttsChunks_)
-{
-  if(ttsChunks)  delete ttsChunks;
-  ttsChunks=new std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>(ttsChunks_);
-  return true;
-}
-
-void Alert::reset_ttsChunks(void)
-{
-  if(ttsChunks)  delete ttsChunks;
-  ttsChunks=0;
-}
-
-const unsigned int* Alert::get_duration(void)
-{
-  return duration;
-}
-
-bool Alert::set_duration(const unsigned int& duration_)
-{
-  if(duration)  delete duration;
-  duration=new unsigned int(duration_);
-  return true;
-}
-
-void Alert::reset_duration(void)
-{
-  if(duration)  delete duration;
-  duration=0;
-}
-
-const bool* Alert::get_playTone(void)
-{
-  return playTone;
-}
-
-bool Alert::set_playTone(const bool& playTone_)
-{
-  if(playTone)  delete playTone;
-  playTone=new bool(playTone_);
-  return true;
-}
-
-void Alert::reset_playTone(void)
-{
-  if(playTone)  delete playTone;
-  playTone=0;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>* Alert::get_softButtons(void)
-{
-  return softButtons;
-}
-
-bool Alert::set_softButtons(const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& softButtons_)
-{
-  if(softButtons)  delete softButtons;
-  softButtons=new std::vector< NsSmartDeviceLinkRPCV2::SoftButton>(softButtons_);
-  return true;
-}
-
-void Alert::reset_softButtons(void)
-{
-  if(softButtons)  delete softButtons;
-  softButtons=0;
-}
-
-int Alert::get_appId(void)
-{
-  return appId;
-}
-
-bool Alert::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool Alert::checkIntegrity(void)
-{
-  return AlertMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuver.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuver.cpp
deleted file mode 100644
index 834fdebd3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuver.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertManeuver.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-AlertManeuver& AlertManeuver::operator =(const AlertManeuver& c)
-{
-  ttsChunks=c.ttsChunks;
-  softButtons=c.softButtons;
-  appId=c.appId;
-  return *this;
-}
-
-
-AlertManeuver::~AlertManeuver(void)
-{
-}
-
-
-AlertManeuver::AlertManeuver(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ALERTMANEUVER)
-{
-}
-
-
-AlertManeuver::AlertManeuver(const AlertManeuver& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ALERTMANEUVER,c.getId())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& AlertManeuver::get_ttsChunks(void)
-{
-  return ttsChunks;
-}
-
-bool AlertManeuver::set_ttsChunks(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& ttsChunks_)
-{
-  ttsChunks=ttsChunks_;
-  return true;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& AlertManeuver::get_softButtons(void)
-{
-  return softButtons;
-}
-
-bool AlertManeuver::set_softButtons(const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& softButtons_)
-{
-  softButtons=softButtons_;
-  return true;
-}
-
-int AlertManeuver::get_appId(void)
-{
-  return appId;
-}
-
-bool AlertManeuver::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool AlertManeuver::checkIntegrity(void)
-{
-  return AlertManeuverMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverMarshaller.cpp
deleted file mode 100644
index 377012d59..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverMarshaller.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertManeuver.h"
-#include "../src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AlertManeuverMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool AlertManeuverMarshaller::checkIntegrity(AlertManeuver& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AlertManeuverMarshaller::fromString(const std::string& s,AlertManeuver& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AlertManeuverMarshaller::toString(const AlertManeuver& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AlertManeuverMarshaller::checkIntegrityConst(const AlertManeuver& s)
-{
-  {
-    unsigned int i=s.ttsChunks.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  {
-    unsigned int i=s.softButtons.size();
-    if(i<0)  return false;
-    if(i>3)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value AlertManeuverMarshaller::toJSON(const AlertManeuver& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.AlertManeuver");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  {
-    unsigned int i=e.ttsChunks.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::toJSON(e.ttsChunks[i]);
-
-    json["params"]["ttsChunks"]=j;
-  }
-  {
-    unsigned int i=e.softButtons.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::SoftButtonMarshaller::toJSON(e.softButtons[i]);
-
-    json["params"]["softButtons"]=j;
-  }
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool AlertManeuverMarshaller::fromJSON(const Json::Value& json,AlertManeuver& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.AlertManeuver"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("ttsChunks") || !js["ttsChunks"].isArray())  return false;
-    {
-      unsigned int i=js["ttsChunks"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.ttsChunks.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::TTSChunk t;
-        if(!NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::fromJSON(js["ttsChunks"][i],t))
-          return false;
-         c.ttsChunks[i]=t;
-      }
-    }
-
-    if(!js.isMember("softButtons") || !js["softButtons"].isArray())  return false;
-    {
-      unsigned int i=js["softButtons"].size();
-      if(i<0)  return false;
-      if(i>3)  return false;
-      c.softButtons.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::SoftButton t;
-        if(!NsSmartDeviceLinkRPCV2::SoftButtonMarshaller::fromJSON(js["softButtons"][i],t))
-          return false;
-         c.softButtons[i]=t;
-      }
-    }
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverMarshaller.h
deleted file mode 100644
index 79b357cbe..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ALERTMANEUVERMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ALERTMANEUVERMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertManeuver.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct AlertManeuverMarshaller
-    {
-      static bool checkIntegrity(AlertManeuver& e);
-      static bool checkIntegrityConst(const AlertManeuver& e);
-    
-      static bool fromString(const std::string& s,AlertManeuver& e);
-      static const std::string toString(const AlertManeuver& e);
-    
-      static bool fromJSON(const Json::Value& s,AlertManeuver& e);
-      static Json::Value toJSON(const AlertManeuver& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverResponse.cpp
deleted file mode 100644
index 98128676b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertManeuverResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-AlertManeuverResponse& AlertManeuverResponse::operator =(const AlertManeuverResponse& c)
-{
-  return *this;
-}
-
-
-AlertManeuverResponse::~AlertManeuverResponse(void)
-{
-}
-
-
-AlertManeuverResponse::AlertManeuverResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ALERTMANEUVERRESPONSE)
-{
-}
-
-
-AlertManeuverResponse::AlertManeuverResponse(const AlertManeuverResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ALERTMANEUVERRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool AlertManeuverResponse::checkIntegrity(void)
-{
-  return AlertManeuverResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverResponseMarshaller.cpp
deleted file mode 100644
index c55f9122c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertManeuverResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AlertManeuverResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool AlertManeuverResponseMarshaller::checkIntegrity(AlertManeuverResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AlertManeuverResponseMarshaller::fromString(const std::string& s,AlertManeuverResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AlertManeuverResponseMarshaller::toString(const AlertManeuverResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AlertManeuverResponseMarshaller::checkIntegrityConst(const AlertManeuverResponse& s)
-{
-  return true;
-}
-
-
-Json::Value AlertManeuverResponseMarshaller::toJSON(const AlertManeuverResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.AlertManeuverResponse");
-
-  return json;
-}
-
-
-bool AlertManeuverResponseMarshaller::fromJSON(const Json::Value& json,AlertManeuverResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.AlertManeuverResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverResponseMarshaller.h
deleted file mode 100644
index 08c41d425..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertManeuverResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ALERTMANEUVERRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ALERTMANEUVERRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertManeuverResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct AlertManeuverResponseMarshaller
-    {
-      static bool checkIntegrity(AlertManeuverResponse& e);
-      static bool checkIntegrityConst(const AlertManeuverResponse& e);
-    
-      static bool fromString(const std::string& s,AlertManeuverResponse& e);
-      static const std::string toString(const AlertManeuverResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,AlertManeuverResponse& e);
-      static Json::Value toJSON(const AlertManeuverResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertMarshaller.cpp
deleted file mode 100644
index ab2b1607e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertMarshaller.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Alert.h"
-#include "../src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AlertMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool AlertMarshaller::checkIntegrity(Alert& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AlertMarshaller::fromString(const std::string& s,Alert& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AlertMarshaller::toString(const Alert& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AlertMarshaller::checkIntegrityConst(const Alert& s)
-{
-  if(s.AlertText1 && (s.AlertText1[0].length()>500))  return false;
-
-  if(s.AlertText2 && (s.AlertText2[0].length()>500))  return false;
-
-  if(s.AlertText3 && (s.AlertText3[0].length()>500))  return false;
-
-  if(s.ttsChunks)
-  {
-    unsigned int i=s.ttsChunks[0].size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  if(s.duration && (s.duration[0]<3000 || s.duration[0]>10000))  return false;
-
-  if(s.softButtons)
-  {
-    unsigned int i=s.softButtons[0].size();
-    if(i<0)  return false;
-    if(i>4)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value AlertMarshaller::toJSON(const Alert& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.Alert");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  if(e.AlertText1)
-    json["params"]["AlertText1"]=Json::Value(e.AlertText1[0]);;
-  if(e.AlertText2)
-    json["params"]["AlertText2"]=Json::Value(e.AlertText2[0]);;
-  if(e.AlertText3)
-    json["params"]["AlertText3"]=Json::Value(e.AlertText3[0]);;
-  if(e.ttsChunks)
-  {
-    unsigned int i=e.ttsChunks[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::toJSON(e.ttsChunks[0][i]);
-
-    json["params"]["ttsChunks"]=j;
-  }
-  if(e.duration)
-    json["params"]["duration"]=Json::Value(e.duration[0]);;
-  if(e.playTone)
-    json["params"]["playTone"]=Json::Value(e.playTone[0]);;
-  if(e.softButtons)
-  {
-    unsigned int i=e.softButtons[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::SoftButtonMarshaller::toJSON(e.softButtons[0][i]);
-
-    json["params"]["softButtons"]=j;
-  }
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool AlertMarshaller::fromJSON(const Json::Value& json,Alert& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.Alert"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(c.AlertText1)  delete c.AlertText1;
-    c.AlertText1=0;
-    if(js.isMember("AlertText1"))
-    {
-      if(!js["AlertText1"].isString())  return false;
-      c.AlertText1=new std::string();
-      c.AlertText1[0]=js["AlertText1"].asString();
-      if(c.AlertText1[0].length()>500)  return false;
-
-    }
-
-    if(c.AlertText2)  delete c.AlertText2;
-    c.AlertText2=0;
-    if(js.isMember("AlertText2"))
-    {
-      if(!js["AlertText2"].isString())  return false;
-      c.AlertText2=new std::string();
-      c.AlertText2[0]=js["AlertText2"].asString();
-      if(c.AlertText2[0].length()>500)  return false;
-
-    }
-
-    if(c.AlertText3)  delete c.AlertText3;
-    c.AlertText3=0;
-    if(js.isMember("AlertText3"))
-    {
-      if(!js["AlertText3"].isString())  return false;
-      c.AlertText3=new std::string();
-      c.AlertText3[0]=js["AlertText3"].asString();
-      if(c.AlertText3[0].length()>500)  return false;
-
-    }
-
-    if(c.ttsChunks)  delete c.ttsChunks;
-    c.ttsChunks=0;
-    if(js.isMember("ttsChunks"))
-    {
-      if(!js["ttsChunks"].isArray()) return false;
-      unsigned int i=js["ttsChunks"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-
-      c.ttsChunks=new std::vector<NsSmartDeviceLinkRPCV2::TTSChunk>();
-      c.ttsChunks->resize(js["ttsChunks"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::fromJSON(js["ttsChunks"][i],c.ttsChunks[0][i]))  return false;
-    }
-
-
-    if(c.duration)  delete c.duration;
-    c.duration=0;
-    if(js.isMember("duration"))
-    {
-      if(!js["duration"].isInt())  return false;
-      c.duration=new unsigned int();
-      c.duration[0]=js["duration"].asInt();
-      if(c.duration[0]<3000 || c.duration[0]>10000)  return false;
-
-    }
-
-    if(c.playTone)  delete c.playTone;
-    c.playTone=0;
-    if(js.isMember("playTone"))
-    {
-      if(!js["playTone"].isBool())  return false;
-      c.playTone=new bool();
-      c.playTone[0]=js["playTone"].asBool();
-      
-    }
-
-    if(c.softButtons)  delete c.softButtons;
-    c.softButtons=0;
-    if(js.isMember("softButtons"))
-    {
-      if(!js["softButtons"].isArray()) return false;
-      unsigned int i=js["softButtons"].size();
-      if(i<0)  return false;
-      if(i>4)  return false;
-
-      c.softButtons=new std::vector<NsSmartDeviceLinkRPCV2::SoftButton>();
-      c.softButtons->resize(js["softButtons"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::SoftButtonMarshaller::fromJSON(js["softButtons"][i],c.softButtons[0][i]))  return false;
-    }
-
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertMarshaller.h
deleted file mode 100644
index bc88d7eb6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ALERTMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ALERTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Alert.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct AlertMarshaller
-    {
-      static bool checkIntegrity(Alert& e);
-      static bool checkIntegrityConst(const Alert& e);
-    
-      static bool fromString(const std::string& s,Alert& e);
-      static const std::string toString(const Alert& e);
-    
-      static bool fromJSON(const Json::Value& s,Alert& e);
-      static Json::Value toJSON(const Alert& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertResponse.cpp
deleted file mode 100644
index 212651c2a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertResponse.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-AlertResponse& AlertResponse::operator =(const AlertResponse& c)
-{
-  if(tryAgainTime)  delete tryAgainTime;
-  tryAgainTime= c.tryAgainTime ? new unsigned int(c.tryAgainTime[0]) : 0;
-  return *this;
-}
-
-
-AlertResponse::~AlertResponse(void)
-{
-  if(tryAgainTime)  delete tryAgainTime;
-}
-
-
-AlertResponse::AlertResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ALERTRESPONSE),
-  tryAgainTime(0)
-{
-}
-
-
-AlertResponse::AlertResponse(const AlertResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ALERTRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const unsigned int* AlertResponse::get_tryAgainTime(void)
-{
-  return tryAgainTime;
-}
-
-bool AlertResponse::set_tryAgainTime(const unsigned int& tryAgainTime_)
-{
-  if(tryAgainTime)  delete tryAgainTime;
-  tryAgainTime=new unsigned int(tryAgainTime_);
-  return true;
-}
-
-void AlertResponse::reset_tryAgainTime(void)
-{
-  if(tryAgainTime)  delete tryAgainTime;
-  tryAgainTime=0;
-}
-
-bool AlertResponse::checkIntegrity(void)
-{
-  return AlertResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertResponseMarshaller.cpp
deleted file mode 100644
index 82e6454bc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertResponseMarshaller.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/AlertResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool AlertResponseMarshaller::checkIntegrity(AlertResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AlertResponseMarshaller::fromString(const std::string& s,AlertResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AlertResponseMarshaller::toString(const AlertResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AlertResponseMarshaller::checkIntegrityConst(const AlertResponse& s)
-{
-  if(s.tryAgainTime && (s.tryAgainTime[0]>2000000000))  return false;
-
-  return true;
-}
-
-
-Json::Value AlertResponseMarshaller::toJSON(const AlertResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.AlertResponse");
-
-  if(e.tryAgainTime)
-    json["result"]["tryAgainTime"]=Json::Value(e.tryAgainTime[0]);;
-  return json;
-}
-
-
-bool AlertResponseMarshaller::fromJSON(const Json::Value& json,AlertResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.AlertResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(c.tryAgainTime)  delete c.tryAgainTime;
-    c.tryAgainTime=0;
-    if(js.isMember("tryAgainTime"))
-    {
-      if(!js["tryAgainTime"].isInt())  return false;
-      c.tryAgainTime=new unsigned int();
-      c.tryAgainTime[0]=js["tryAgainTime"].asInt();
-      if(c.tryAgainTime[0]>2000000000)  return false;
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertResponseMarshaller.h
deleted file mode 100644
index b8675ff0f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/AlertResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ALERTRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ALERTRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/AlertResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct AlertResponseMarshaller
-    {
-      static bool checkIntegrity(AlertResponse& e);
-      static bool checkIntegrityConst(const AlertResponse& e);
-    
-      static bool fromString(const std::string& s,AlertResponse& e);
-      static const std::string toString(const AlertResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,AlertResponse& e);
-      static Json::Value toJSON(const AlertResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistration.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistration.cpp
deleted file mode 100644
index e388d44bb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistration.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ChangeRegistration.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-ChangeRegistration& ChangeRegistration::operator =(const ChangeRegistration& c)
-{
-  hmiDisplayLanguage=c.hmiDisplayLanguage;
-  appId=c.appId;
-  return *this;
-}
-
-
-ChangeRegistration::~ChangeRegistration(void)
-{
-}
-
-
-ChangeRegistration::ChangeRegistration(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__CHANGEREGISTRATION)
-{
-}
-
-
-ChangeRegistration::ChangeRegistration(const ChangeRegistration& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__CHANGEREGISTRATION,c.getId())
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::Language& ChangeRegistration::get_hmiDisplayLanguage(void)
-{
-  return hmiDisplayLanguage;
-}
-
-bool ChangeRegistration::set_hmiDisplayLanguage(const NsSmartDeviceLinkRPCV2::Language& hmiDisplayLanguage_)
-{
-  hmiDisplayLanguage=hmiDisplayLanguage_;
-  return true;
-}
-
-int ChangeRegistration::get_appId(void)
-{
-  return appId;
-}
-
-bool ChangeRegistration::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool ChangeRegistration::checkIntegrity(void)
-{
-  return ChangeRegistrationMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationMarshaller.cpp
deleted file mode 100644
index bd918ce48..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationMarshaller.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ChangeRegistration.h"
-#include "../src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ChangeRegistrationMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool ChangeRegistrationMarshaller::checkIntegrity(ChangeRegistration& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ChangeRegistrationMarshaller::fromString(const std::string& s,ChangeRegistration& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ChangeRegistrationMarshaller::toString(const ChangeRegistration& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChangeRegistrationMarshaller::checkIntegrityConst(const ChangeRegistration& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::LanguageMarshaller::checkIntegrityConst(s.hmiDisplayLanguage))  return false;
-
-  return true;
-}
-
-
-Json::Value ChangeRegistrationMarshaller::toJSON(const ChangeRegistration& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.ChangeRegistration");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["hmiDisplayLanguage"]=NsSmartDeviceLinkRPCV2::LanguageMarshaller::toJSON(e.hmiDisplayLanguage);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool ChangeRegistrationMarshaller::fromJSON(const Json::Value& json,ChangeRegistration& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.ChangeRegistration"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("hmiDisplayLanguage") || !NsSmartDeviceLinkRPCV2::LanguageMarshaller::fromJSON(js["hmiDisplayLanguage"],c.hmiDisplayLanguage))  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationMarshaller.h
deleted file mode 100644
index 56bb52b0c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_CHANGEREGISTRATIONMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_CHANGEREGISTRATIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ChangeRegistration.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct ChangeRegistrationMarshaller
-    {
-      static bool checkIntegrity(ChangeRegistration& e);
-      static bool checkIntegrityConst(const ChangeRegistration& e);
-    
-      static bool fromString(const std::string& s,ChangeRegistration& e);
-      static const std::string toString(const ChangeRegistration& e);
-    
-      static bool fromJSON(const Json::Value& s,ChangeRegistration& e);
-      static Json::Value toJSON(const ChangeRegistration& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationResponse.cpp
deleted file mode 100644
index ba7203fc3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ChangeRegistrationResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-ChangeRegistrationResponse& ChangeRegistrationResponse::operator =(const ChangeRegistrationResponse& c)
-{
-  return *this;
-}
-
-
-ChangeRegistrationResponse::~ChangeRegistrationResponse(void)
-{
-}
-
-
-ChangeRegistrationResponse::ChangeRegistrationResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__CHANGEREGISTRATIONRESPONSE)
-{
-}
-
-
-ChangeRegistrationResponse::ChangeRegistrationResponse(const ChangeRegistrationResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__CHANGEREGISTRATIONRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool ChangeRegistrationResponse::checkIntegrity(void)
-{
-  return ChangeRegistrationResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationResponseMarshaller.cpp
deleted file mode 100644
index 8f04e5d7d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ChangeRegistrationResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ChangeRegistrationResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool ChangeRegistrationResponseMarshaller::checkIntegrity(ChangeRegistrationResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ChangeRegistrationResponseMarshaller::fromString(const std::string& s,ChangeRegistrationResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ChangeRegistrationResponseMarshaller::toString(const ChangeRegistrationResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChangeRegistrationResponseMarshaller::checkIntegrityConst(const ChangeRegistrationResponse& s)
-{
-  return true;
-}
-
-
-Json::Value ChangeRegistrationResponseMarshaller::toJSON(const ChangeRegistrationResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.ChangeRegistrationResponse");
-
-  return json;
-}
-
-
-bool ChangeRegistrationResponseMarshaller::fromJSON(const Json::Value& json,ChangeRegistrationResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.ChangeRegistrationResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationResponseMarshaller.h
deleted file mode 100644
index f7848921d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ChangeRegistrationResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_CHANGEREGISTRATIONRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_CHANGEREGISTRATIONRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ChangeRegistrationResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct ChangeRegistrationResponseMarshaller
-    {
-      static bool checkIntegrity(ChangeRegistrationResponse& e);
-      static bool checkIntegrityConst(const ChangeRegistrationResponse& e);
-    
-      static bool fromString(const std::string& s,ChangeRegistrationResponse& e);
-      static const std::string toString(const ChangeRegistrationResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,ChangeRegistrationResponse& e);
-      static Json::Value toJSON(const ChangeRegistrationResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSet.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSet.cpp
deleted file mode 100644
index ca1b1ce4b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSet.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/CreateInteractionChoiceSet.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-CreateInteractionChoiceSet& CreateInteractionChoiceSet::operator =(const CreateInteractionChoiceSet& c)
-{
-  interactionChoiceSetID=c.interactionChoiceSetID;
-  choiceSet=c.choiceSet;
-  appId=c.appId;
-  return *this;
-}
-
-
-CreateInteractionChoiceSet::~CreateInteractionChoiceSet(void)
-{
-}
-
-
-CreateInteractionChoiceSet::CreateInteractionChoiceSet(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__CREATEINTERACTIONCHOICESET)
-{
-}
-
-
-CreateInteractionChoiceSet::CreateInteractionChoiceSet(const CreateInteractionChoiceSet& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__CREATEINTERACTIONCHOICESET,c.getId())
-{
-  *this=c;
-}
-
-
-unsigned int CreateInteractionChoiceSet::get_interactionChoiceSetID(void)
-{
-  return interactionChoiceSetID;
-}
-
-bool CreateInteractionChoiceSet::set_interactionChoiceSetID(unsigned int interactionChoiceSetID_)
-{
-  interactionChoiceSetID=interactionChoiceSetID_;
-  return true;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::Choice>& CreateInteractionChoiceSet::get_choiceSet(void)
-{
-  return choiceSet;
-}
-
-bool CreateInteractionChoiceSet::set_choiceSet(const std::vector< NsSmartDeviceLinkRPCV2::Choice>& choiceSet_)
-{
-  choiceSet=choiceSet_;
-  return true;
-}
-
-int CreateInteractionChoiceSet::get_appId(void)
-{
-  return appId;
-}
-
-bool CreateInteractionChoiceSet::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool CreateInteractionChoiceSet::checkIntegrity(void)
-{
-  return CreateInteractionChoiceSetMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetMarshaller.cpp
deleted file mode 100644
index 680b2785e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetMarshaller.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/CreateInteractionChoiceSet.h"
-#include "../src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/CreateInteractionChoiceSetMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool CreateInteractionChoiceSetMarshaller::checkIntegrity(CreateInteractionChoiceSet& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool CreateInteractionChoiceSetMarshaller::fromString(const std::string& s,CreateInteractionChoiceSet& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string CreateInteractionChoiceSetMarshaller::toString(const CreateInteractionChoiceSet& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool CreateInteractionChoiceSetMarshaller::checkIntegrityConst(const CreateInteractionChoiceSet& s)
-{
-  if(s.interactionChoiceSetID>2000000000)  return false;
-
-  {
-    unsigned int i=s.choiceSet.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value CreateInteractionChoiceSetMarshaller::toJSON(const CreateInteractionChoiceSet& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.CreateInteractionChoiceSet");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["interactionChoiceSetID"]=Json::Value(e.interactionChoiceSetID);;
-  {
-    unsigned int i=e.choiceSet.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::ChoiceMarshaller::toJSON(e.choiceSet[i]);
-
-    json["params"]["choiceSet"]=j;
-  }
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool CreateInteractionChoiceSetMarshaller::fromJSON(const Json::Value& json,CreateInteractionChoiceSet& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.CreateInteractionChoiceSet"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("interactionChoiceSetID") || !js["interactionChoiceSetID"].isInt())  return false;
-    c.interactionChoiceSetID=js["interactionChoiceSetID"].asInt();
-    if(c.interactionChoiceSetID>2000000000)  return false;
-
-    if(!js.isMember("choiceSet") || !js["choiceSet"].isArray())  return false;
-    {
-      unsigned int i=js["choiceSet"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.choiceSet.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::Choice t;
-        if(!NsSmartDeviceLinkRPCV2::ChoiceMarshaller::fromJSON(js["choiceSet"][i],t))
-          return false;
-         c.choiceSet[i]=t;
-      }
-    }
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetMarshaller.h
deleted file mode 100644
index d087969d2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_CREATEINTERACTIONCHOICESETMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_CREATEINTERACTIONCHOICESETMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/CreateInteractionChoiceSet.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct CreateInteractionChoiceSetMarshaller
-    {
-      static bool checkIntegrity(CreateInteractionChoiceSet& e);
-      static bool checkIntegrityConst(const CreateInteractionChoiceSet& e);
-    
-      static bool fromString(const std::string& s,CreateInteractionChoiceSet& e);
-      static const std::string toString(const CreateInteractionChoiceSet& e);
-    
-      static bool fromJSON(const Json::Value& s,CreateInteractionChoiceSet& e);
-      static Json::Value toJSON(const CreateInteractionChoiceSet& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetResponse.cpp
deleted file mode 100644
index 282b3bdc5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/CreateInteractionChoiceSetResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-CreateInteractionChoiceSetResponse& CreateInteractionChoiceSetResponse::operator =(const CreateInteractionChoiceSetResponse& c)
-{
-  return *this;
-}
-
-
-CreateInteractionChoiceSetResponse::~CreateInteractionChoiceSetResponse(void)
-{
-}
-
-
-CreateInteractionChoiceSetResponse::CreateInteractionChoiceSetResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__CREATEINTERACTIONCHOICESETRESPONSE)
-{
-}
-
-
-CreateInteractionChoiceSetResponse::CreateInteractionChoiceSetResponse(const CreateInteractionChoiceSetResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__CREATEINTERACTIONCHOICESETRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool CreateInteractionChoiceSetResponse::checkIntegrity(void)
-{
-  return CreateInteractionChoiceSetResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetResponseMarshaller.cpp
deleted file mode 100644
index 84f492f9f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/CreateInteractionChoiceSetResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/CreateInteractionChoiceSetResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool CreateInteractionChoiceSetResponseMarshaller::checkIntegrity(CreateInteractionChoiceSetResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool CreateInteractionChoiceSetResponseMarshaller::fromString(const std::string& s,CreateInteractionChoiceSetResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string CreateInteractionChoiceSetResponseMarshaller::toString(const CreateInteractionChoiceSetResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool CreateInteractionChoiceSetResponseMarshaller::checkIntegrityConst(const CreateInteractionChoiceSetResponse& s)
-{
-  return true;
-}
-
-
-Json::Value CreateInteractionChoiceSetResponseMarshaller::toJSON(const CreateInteractionChoiceSetResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.CreateInteractionChoiceSetResponse");
-
-  return json;
-}
-
-
-bool CreateInteractionChoiceSetResponseMarshaller::fromJSON(const Json::Value& json,CreateInteractionChoiceSetResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.CreateInteractionChoiceSetResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetResponseMarshaller.h
deleted file mode 100644
index 33348682d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/CreateInteractionChoiceSetResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_CREATEINTERACTIONCHOICESETRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_CREATEINTERACTIONCHOICESETRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/CreateInteractionChoiceSetResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct CreateInteractionChoiceSetResponseMarshaller
-    {
-      static bool checkIntegrity(CreateInteractionChoiceSetResponse& e);
-      static bool checkIntegrityConst(const CreateInteractionChoiceSetResponse& e);
-    
-      static bool fromString(const std::string& s,CreateInteractionChoiceSetResponse& e);
-      static const std::string toString(const CreateInteractionChoiceSetResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,CreateInteractionChoiceSetResponse& e);
-      static Json::Value toJSON(const CreateInteractionChoiceSetResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommand.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommand.cpp
deleted file mode 100644
index 54eab8d85..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommand.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-DeleteCommand& DeleteCommand::operator =(const DeleteCommand& c)
-{
-  cmdId=c.cmdId;
-  appId=c.appId;
-  return *this;
-}
-
-
-DeleteCommand::~DeleteCommand(void)
-{
-}
-
-
-DeleteCommand::DeleteCommand(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DELETECOMMAND)
-{
-}
-
-
-DeleteCommand::DeleteCommand(const DeleteCommand& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DELETECOMMAND,c.getId())
-{
-  *this=c;
-}
-
-
-unsigned int DeleteCommand::get_cmdId(void)
-{
-  return cmdId;
-}
-
-bool DeleteCommand::set_cmdId(unsigned int cmdId_)
-{
-  cmdId=cmdId_;
-  return true;
-}
-
-int DeleteCommand::get_appId(void)
-{
-  return appId;
-}
-
-bool DeleteCommand::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool DeleteCommand::checkIntegrity(void)
-{
-  return DeleteCommandMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandMarshaller.cpp
deleted file mode 100644
index 5ea174123..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteCommand.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DeleteCommandMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool DeleteCommandMarshaller::checkIntegrity(DeleteCommand& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteCommandMarshaller::fromString(const std::string& s,DeleteCommand& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteCommandMarshaller::toString(const DeleteCommand& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteCommandMarshaller::checkIntegrityConst(const DeleteCommand& s)
-{
-  if(s.cmdId>2000000000)  return false;
-
-  return true;
-}
-
-
-Json::Value DeleteCommandMarshaller::toJSON(const DeleteCommand& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.DeleteCommand");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["cmdId"]=Json::Value(e.cmdId);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool DeleteCommandMarshaller::fromJSON(const Json::Value& json,DeleteCommand& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.DeleteCommand"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("cmdId") || !js["cmdId"].isInt())  return false;
-    c.cmdId=js["cmdId"].asInt();
-    if(c.cmdId>2000000000)  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandMarshaller.h
deleted file mode 100644
index 7ce55f67f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DELETECOMMANDMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DELETECOMMANDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteCommand.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct DeleteCommandMarshaller
-    {
-      static bool checkIntegrity(DeleteCommand& e);
-      static bool checkIntegrityConst(const DeleteCommand& e);
-    
-      static bool fromString(const std::string& s,DeleteCommand& e);
-      static const std::string toString(const DeleteCommand& e);
-    
-      static bool fromJSON(const Json::Value& s,DeleteCommand& e);
-      static Json::Value toJSON(const DeleteCommand& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandResponse.cpp
deleted file mode 100644
index e1dff2f5e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteCommandResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-DeleteCommandResponse& DeleteCommandResponse::operator =(const DeleteCommandResponse& c)
-{
-  return *this;
-}
-
-
-DeleteCommandResponse::~DeleteCommandResponse(void)
-{
-}
-
-
-DeleteCommandResponse::DeleteCommandResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DELETECOMMANDRESPONSE)
-{
-}
-
-
-DeleteCommandResponse::DeleteCommandResponse(const DeleteCommandResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DELETECOMMANDRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool DeleteCommandResponse::checkIntegrity(void)
-{
-  return DeleteCommandResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandResponseMarshaller.cpp
deleted file mode 100644
index a1c4962c9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteCommandResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DeleteCommandResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool DeleteCommandResponseMarshaller::checkIntegrity(DeleteCommandResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteCommandResponseMarshaller::fromString(const std::string& s,DeleteCommandResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteCommandResponseMarshaller::toString(const DeleteCommandResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteCommandResponseMarshaller::checkIntegrityConst(const DeleteCommandResponse& s)
-{
-  return true;
-}
-
-
-Json::Value DeleteCommandResponseMarshaller::toJSON(const DeleteCommandResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.DeleteCommandResponse");
-
-  return json;
-}
-
-
-bool DeleteCommandResponseMarshaller::fromJSON(const Json::Value& json,DeleteCommandResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.DeleteCommandResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandResponseMarshaller.h
deleted file mode 100644
index 5555926d7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteCommandResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DELETECOMMANDRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DELETECOMMANDRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteCommandResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct DeleteCommandResponseMarshaller
-    {
-      static bool checkIntegrity(DeleteCommandResponse& e);
-      static bool checkIntegrityConst(const DeleteCommandResponse& e);
-    
-      static bool fromString(const std::string& s,DeleteCommandResponse& e);
-      static const std::string toString(const DeleteCommandResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,DeleteCommandResponse& e);
-      static Json::Value toJSON(const DeleteCommandResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSet.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSet.cpp
deleted file mode 100644
index fb0659300..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSet.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteInteractionChoiceSet.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-DeleteInteractionChoiceSet& DeleteInteractionChoiceSet::operator =(const DeleteInteractionChoiceSet& c)
-{
-  interactionChoiceSetID=c.interactionChoiceSetID;
-  appId=c.appId;
-  return *this;
-}
-
-
-DeleteInteractionChoiceSet::~DeleteInteractionChoiceSet(void)
-{
-}
-
-
-DeleteInteractionChoiceSet::DeleteInteractionChoiceSet(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DELETEINTERACTIONCHOICESET)
-{
-}
-
-
-DeleteInteractionChoiceSet::DeleteInteractionChoiceSet(const DeleteInteractionChoiceSet& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DELETEINTERACTIONCHOICESET,c.getId())
-{
-  *this=c;
-}
-
-
-unsigned int DeleteInteractionChoiceSet::get_interactionChoiceSetID(void)
-{
-  return interactionChoiceSetID;
-}
-
-bool DeleteInteractionChoiceSet::set_interactionChoiceSetID(unsigned int interactionChoiceSetID_)
-{
-  interactionChoiceSetID=interactionChoiceSetID_;
-  return true;
-}
-
-int DeleteInteractionChoiceSet::get_appId(void)
-{
-  return appId;
-}
-
-bool DeleteInteractionChoiceSet::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool DeleteInteractionChoiceSet::checkIntegrity(void)
-{
-  return DeleteInteractionChoiceSetMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetMarshaller.cpp
deleted file mode 100644
index 02beef484..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteInteractionChoiceSet.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DeleteInteractionChoiceSetMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool DeleteInteractionChoiceSetMarshaller::checkIntegrity(DeleteInteractionChoiceSet& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteInteractionChoiceSetMarshaller::fromString(const std::string& s,DeleteInteractionChoiceSet& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteInteractionChoiceSetMarshaller::toString(const DeleteInteractionChoiceSet& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteInteractionChoiceSetMarshaller::checkIntegrityConst(const DeleteInteractionChoiceSet& s)
-{
-  if(s.interactionChoiceSetID>2000000000)  return false;
-
-  return true;
-}
-
-
-Json::Value DeleteInteractionChoiceSetMarshaller::toJSON(const DeleteInteractionChoiceSet& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.DeleteInteractionChoiceSet");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["interactionChoiceSetID"]=Json::Value(e.interactionChoiceSetID);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool DeleteInteractionChoiceSetMarshaller::fromJSON(const Json::Value& json,DeleteInteractionChoiceSet& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.DeleteInteractionChoiceSet"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("interactionChoiceSetID") || !js["interactionChoiceSetID"].isInt())  return false;
-    c.interactionChoiceSetID=js["interactionChoiceSetID"].asInt();
-    if(c.interactionChoiceSetID>2000000000)  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetMarshaller.h
deleted file mode 100644
index 79c27127b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DELETEINTERACTIONCHOICESETMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DELETEINTERACTIONCHOICESETMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteInteractionChoiceSet.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct DeleteInteractionChoiceSetMarshaller
-    {
-      static bool checkIntegrity(DeleteInteractionChoiceSet& e);
-      static bool checkIntegrityConst(const DeleteInteractionChoiceSet& e);
-    
-      static bool fromString(const std::string& s,DeleteInteractionChoiceSet& e);
-      static const std::string toString(const DeleteInteractionChoiceSet& e);
-    
-      static bool fromJSON(const Json::Value& s,DeleteInteractionChoiceSet& e);
-      static Json::Value toJSON(const DeleteInteractionChoiceSet& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponse.cpp
deleted file mode 100644
index d5d3d6b16..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-DeleteInteractionChoiceSetResponse& DeleteInteractionChoiceSetResponse::operator =(const DeleteInteractionChoiceSetResponse& c)
-{
-  return *this;
-}
-
-
-DeleteInteractionChoiceSetResponse::~DeleteInteractionChoiceSetResponse(void)
-{
-}
-
-
-DeleteInteractionChoiceSetResponse::DeleteInteractionChoiceSetResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DELETEINTERACTIONCHOICESETRESPONSE)
-{
-}
-
-
-DeleteInteractionChoiceSetResponse::DeleteInteractionChoiceSetResponse(const DeleteInteractionChoiceSetResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DELETEINTERACTIONCHOICESETRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool DeleteInteractionChoiceSetResponse::checkIntegrity(void)
-{
-  return DeleteInteractionChoiceSetResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponseMarshaller.cpp
deleted file mode 100644
index 568cfe8fd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DeleteInteractionChoiceSetResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool DeleteInteractionChoiceSetResponseMarshaller::checkIntegrity(DeleteInteractionChoiceSetResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteInteractionChoiceSetResponseMarshaller::fromString(const std::string& s,DeleteInteractionChoiceSetResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteInteractionChoiceSetResponseMarshaller::toString(const DeleteInteractionChoiceSetResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteInteractionChoiceSetResponseMarshaller::checkIntegrityConst(const DeleteInteractionChoiceSetResponse& s)
-{
-  return true;
-}
-
-
-Json::Value DeleteInteractionChoiceSetResponseMarshaller::toJSON(const DeleteInteractionChoiceSetResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.DeleteInteractionChoiceSetResponse");
-
-  return json;
-}
-
-
-bool DeleteInteractionChoiceSetResponseMarshaller::fromJSON(const Json::Value& json,DeleteInteractionChoiceSetResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.DeleteInteractionChoiceSetResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponseMarshaller.h
deleted file mode 100644
index 2cf4fca55..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DELETEINTERACTIONCHOICESETRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DELETEINTERACTIONCHOICESETRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteInteractionChoiceSetResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct DeleteInteractionChoiceSetResponseMarshaller
-    {
-      static bool checkIntegrity(DeleteInteractionChoiceSetResponse& e);
-      static bool checkIntegrityConst(const DeleteInteractionChoiceSetResponse& e);
-    
-      static bool fromString(const std::string& s,DeleteInteractionChoiceSetResponse& e);
-      static const std::string toString(const DeleteInteractionChoiceSetResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,DeleteInteractionChoiceSetResponse& e);
-      static Json::Value toJSON(const DeleteInteractionChoiceSetResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenu.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenu.cpp
deleted file mode 100644
index 99f1bb0c3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenu.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteSubMenu.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-DeleteSubMenu& DeleteSubMenu::operator =(const DeleteSubMenu& c)
-{
-  menuId=c.menuId;
-  appId=c.appId;
-  return *this;
-}
-
-
-DeleteSubMenu::~DeleteSubMenu(void)
-{
-}
-
-
-DeleteSubMenu::DeleteSubMenu(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DELETESUBMENU)
-{
-}
-
-
-DeleteSubMenu::DeleteSubMenu(const DeleteSubMenu& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DELETESUBMENU,c.getId())
-{
-  *this=c;
-}
-
-
-unsigned int DeleteSubMenu::get_menuId(void)
-{
-  return menuId;
-}
-
-bool DeleteSubMenu::set_menuId(unsigned int menuId_)
-{
-  menuId=menuId_;
-  return true;
-}
-
-int DeleteSubMenu::get_appId(void)
-{
-  return appId;
-}
-
-bool DeleteSubMenu::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool DeleteSubMenu::checkIntegrity(void)
-{
-  return DeleteSubMenuMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuMarshaller.cpp
deleted file mode 100644
index 564d0902e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteSubMenu.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DeleteSubMenuMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool DeleteSubMenuMarshaller::checkIntegrity(DeleteSubMenu& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteSubMenuMarshaller::fromString(const std::string& s,DeleteSubMenu& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteSubMenuMarshaller::toString(const DeleteSubMenu& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteSubMenuMarshaller::checkIntegrityConst(const DeleteSubMenu& s)
-{
-  if(s.menuId>2000000000)  return false;
-
-  return true;
-}
-
-
-Json::Value DeleteSubMenuMarshaller::toJSON(const DeleteSubMenu& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.DeleteSubMenu");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["menuId"]=Json::Value(e.menuId);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool DeleteSubMenuMarshaller::fromJSON(const Json::Value& json,DeleteSubMenu& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.DeleteSubMenu"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("menuId") || !js["menuId"].isInt())  return false;
-    c.menuId=js["menuId"].asInt();
-    if(c.menuId>2000000000)  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuMarshaller.h
deleted file mode 100644
index 348720175..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DELETESUBMENUMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DELETESUBMENUMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteSubMenu.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct DeleteSubMenuMarshaller
-    {
-      static bool checkIntegrity(DeleteSubMenu& e);
-      static bool checkIntegrityConst(const DeleteSubMenu& e);
-    
-      static bool fromString(const std::string& s,DeleteSubMenu& e);
-      static const std::string toString(const DeleteSubMenu& e);
-    
-      static bool fromJSON(const Json::Value& s,DeleteSubMenu& e);
-      static Json::Value toJSON(const DeleteSubMenu& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuResponse.cpp
deleted file mode 100644
index 818e52032..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteSubMenuResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-DeleteSubMenuResponse& DeleteSubMenuResponse::operator =(const DeleteSubMenuResponse& c)
-{
-  return *this;
-}
-
-
-DeleteSubMenuResponse::~DeleteSubMenuResponse(void)
-{
-}
-
-
-DeleteSubMenuResponse::DeleteSubMenuResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DELETESUBMENURESPONSE)
-{
-}
-
-
-DeleteSubMenuResponse::DeleteSubMenuResponse(const DeleteSubMenuResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DELETESUBMENURESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool DeleteSubMenuResponse::checkIntegrity(void)
-{
-  return DeleteSubMenuResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuResponseMarshaller.cpp
deleted file mode 100644
index acc82de87..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteSubMenuResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DeleteSubMenuResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool DeleteSubMenuResponseMarshaller::checkIntegrity(DeleteSubMenuResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteSubMenuResponseMarshaller::fromString(const std::string& s,DeleteSubMenuResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteSubMenuResponseMarshaller::toString(const DeleteSubMenuResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteSubMenuResponseMarshaller::checkIntegrityConst(const DeleteSubMenuResponse& s)
-{
-  return true;
-}
-
-
-Json::Value DeleteSubMenuResponseMarshaller::toJSON(const DeleteSubMenuResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.DeleteSubMenuResponse");
-
-  return json;
-}
-
-
-bool DeleteSubMenuResponseMarshaller::fromJSON(const Json::Value& json,DeleteSubMenuResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.DeleteSubMenuResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuResponseMarshaller.h
deleted file mode 100644
index 52ea48acb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DeleteSubMenuResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DELETESUBMENURESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DELETESUBMENURESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DeleteSubMenuResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct DeleteSubMenuResponseMarshaller
-    {
-      static bool checkIntegrity(DeleteSubMenuResponse& e);
-      static bool checkIntegrityConst(const DeleteSubMenuResponse& e);
-    
-      static bool fromString(const std::string& s,DeleteSubMenuResponse& e);
-      static const std::string toString(const DeleteSubMenuResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,DeleteSubMenuResponse& e);
-      static Json::Value toJSON(const DeleteSubMenuResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumber.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumber.cpp
deleted file mode 100644
index a897f23d0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumber.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DialNumber.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-DialNumber& DialNumber::operator =(const DialNumber& c)
-{
-  number=c.number;
-  appId=c.appId;
-  return *this;
-}
-
-
-DialNumber::~DialNumber(void)
-{
-}
-
-
-DialNumber::DialNumber(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DIALNUMBER)
-{
-}
-
-
-DialNumber::DialNumber(const DialNumber& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DIALNUMBER,c.getId())
-{
-  *this=c;
-}
-
-
-const std::string& DialNumber::get_number(void)
-{
-  return number;
-}
-
-bool DialNumber::set_number(const std::string& number_)
-{
-  number=number_;
-  return true;
-}
-
-int DialNumber::get_appId(void)
-{
-  return appId;
-}
-
-bool DialNumber::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool DialNumber::checkIntegrity(void)
-{
-  return DialNumberMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberMarshaller.cpp
deleted file mode 100644
index 409658320..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DialNumber.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DialNumberMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool DialNumberMarshaller::checkIntegrity(DialNumber& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DialNumberMarshaller::fromString(const std::string& s,DialNumber& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DialNumberMarshaller::toString(const DialNumber& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DialNumberMarshaller::checkIntegrityConst(const DialNumber& s)
-{
-  if(s.number.length()>500)  return false;
-
-  return true;
-}
-
-
-Json::Value DialNumberMarshaller::toJSON(const DialNumber& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.DialNumber");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["number"]=Json::Value(e.number);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool DialNumberMarshaller::fromJSON(const Json::Value& json,DialNumber& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.DialNumber"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("number") || !js["number"].isString())  return false;
-    c.number=js["number"].asString();
-    if(c.number.length()>500)  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberMarshaller.h
deleted file mode 100644
index 58ae4033b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DIALNUMBERMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DIALNUMBERMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DialNumber.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct DialNumberMarshaller
-    {
-      static bool checkIntegrity(DialNumber& e);
-      static bool checkIntegrityConst(const DialNumber& e);
-    
-      static bool fromString(const std::string& s,DialNumber& e);
-      static const std::string toString(const DialNumber& e);
-    
-      static bool fromJSON(const Json::Value& s,DialNumber& e);
-      static Json::Value toJSON(const DialNumber& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberResponse.cpp
deleted file mode 100644
index fe6963ce3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DialNumberResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-DialNumberResponse& DialNumberResponse::operator =(const DialNumberResponse& c)
-{
-  return *this;
-}
-
-
-DialNumberResponse::~DialNumberResponse(void)
-{
-}
-
-
-DialNumberResponse::DialNumberResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DIALNUMBERRESPONSE)
-{
-}
-
-
-DialNumberResponse::DialNumberResponse(const DialNumberResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__DIALNUMBERRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool DialNumberResponse::checkIntegrity(void)
-{
-  return DialNumberResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberResponseMarshaller.cpp
deleted file mode 100644
index 062df7e7a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DialNumberResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/DialNumberResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool DialNumberResponseMarshaller::checkIntegrity(DialNumberResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DialNumberResponseMarshaller::fromString(const std::string& s,DialNumberResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DialNumberResponseMarshaller::toString(const DialNumberResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DialNumberResponseMarshaller::checkIntegrityConst(const DialNumberResponse& s)
-{
-  return true;
-}
-
-
-Json::Value DialNumberResponseMarshaller::toJSON(const DialNumberResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.DialNumberResponse");
-
-  return json;
-}
-
-
-bool DialNumberResponseMarshaller::fromJSON(const Json::Value& json,DialNumberResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.DialNumberResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberResponseMarshaller.h
deleted file mode 100644
index df442bd4e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/DialNumberResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_DIALNUMBERRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_DIALNUMBERRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/DialNumberResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct DialNumberResponseMarshaller
-    {
-      static bool checkIntegrity(DialNumberResponse& e);
-      static bool checkIntegrityConst(const DialNumberResponse& e);
-    
-      static bool fromString(const std::string& s,DialNumberResponse& e);
-      static const std::string toString(const DialNumberResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,DialNumberResponse& e);
-      static Json::Value toJSON(const DialNumberResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThru.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThru.cpp
deleted file mode 100644
index 6da0b38d5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThru.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/EndAudioPassThru.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-EndAudioPassThru& EndAudioPassThru::operator =(const EndAudioPassThru& c)
-{
-  appId=c.appId;
-  return *this;
-}
-
-
-EndAudioPassThru::~EndAudioPassThru(void)
-{
-}
-
-
-EndAudioPassThru::EndAudioPassThru(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ENDAUDIOPASSTHRU)
-{
-}
-
-
-EndAudioPassThru::EndAudioPassThru(const EndAudioPassThru& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ENDAUDIOPASSTHRU,c.getId())
-{
-  *this=c;
-}
-
-
-int EndAudioPassThru::get_appId(void)
-{
-  return appId;
-}
-
-bool EndAudioPassThru::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool EndAudioPassThru::checkIntegrity(void)
-{
-  return EndAudioPassThruMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruMarshaller.cpp
deleted file mode 100644
index 23495dde7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruMarshaller.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/EndAudioPassThru.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/EndAudioPassThruMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool EndAudioPassThruMarshaller::checkIntegrity(EndAudioPassThru& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool EndAudioPassThruMarshaller::fromString(const std::string& s,EndAudioPassThru& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string EndAudioPassThruMarshaller::toString(const EndAudioPassThru& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool EndAudioPassThruMarshaller::checkIntegrityConst(const EndAudioPassThru& s)
-{
-  return true;
-}
-
-
-Json::Value EndAudioPassThruMarshaller::toJSON(const EndAudioPassThru& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.EndAudioPassThru");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool EndAudioPassThruMarshaller::fromJSON(const Json::Value& json,EndAudioPassThru& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.EndAudioPassThru"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruMarshaller.h
deleted file mode 100644
index 5c1649272..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ENDAUDIOPASSTHRUMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ENDAUDIOPASSTHRUMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/EndAudioPassThru.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct EndAudioPassThruMarshaller
-    {
-      static bool checkIntegrity(EndAudioPassThru& e);
-      static bool checkIntegrityConst(const EndAudioPassThru& e);
-    
-      static bool fromString(const std::string& s,EndAudioPassThru& e);
-      static const std::string toString(const EndAudioPassThru& e);
-    
-      static bool fromJSON(const Json::Value& s,EndAudioPassThru& e);
-      static Json::Value toJSON(const EndAudioPassThru& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruResponse.cpp
deleted file mode 100644
index 82d04ef74..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/EndAudioPassThruResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-EndAudioPassThruResponse& EndAudioPassThruResponse::operator =(const EndAudioPassThruResponse& c)
-{
-  return *this;
-}
-
-
-EndAudioPassThruResponse::~EndAudioPassThruResponse(void)
-{
-}
-
-
-EndAudioPassThruResponse::EndAudioPassThruResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ENDAUDIOPASSTHRURESPONSE)
-{
-}
-
-
-EndAudioPassThruResponse::EndAudioPassThruResponse(const EndAudioPassThruResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ENDAUDIOPASSTHRURESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool EndAudioPassThruResponse::checkIntegrity(void)
-{
-  return EndAudioPassThruResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruResponseMarshaller.cpp
deleted file mode 100644
index dd5399fc5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/EndAudioPassThruResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/EndAudioPassThruResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool EndAudioPassThruResponseMarshaller::checkIntegrity(EndAudioPassThruResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool EndAudioPassThruResponseMarshaller::fromString(const std::string& s,EndAudioPassThruResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string EndAudioPassThruResponseMarshaller::toString(const EndAudioPassThruResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool EndAudioPassThruResponseMarshaller::checkIntegrityConst(const EndAudioPassThruResponse& s)
-{
-  return true;
-}
-
-
-Json::Value EndAudioPassThruResponseMarshaller::toJSON(const EndAudioPassThruResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.EndAudioPassThruResponse");
-
-  return json;
-}
-
-
-bool EndAudioPassThruResponseMarshaller::fromJSON(const Json::Value& json,EndAudioPassThruResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.EndAudioPassThruResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruResponseMarshaller.h
deleted file mode 100644
index f4990c054..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/EndAudioPassThruResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ENDAUDIOPASSTHRURESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ENDAUDIOPASSTHRURESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/EndAudioPassThruResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct EndAudioPassThruResponseMarshaller
-    {
-      static bool checkIntegrity(EndAudioPassThruResponse& e);
-      static bool checkIntegrityConst(const EndAudioPassThruResponse& e);
-    
-      static bool fromString(const std::string& s,EndAudioPassThruResponse& e);
-      static const std::string toString(const EndAudioPassThruResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,EndAudioPassThruResponse& e);
-      static Json::Value toJSON(const EndAudioPassThruResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilities.cpp
deleted file mode 100644
index ed2176a3a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilities.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetCapabilities.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-GetCapabilities& GetCapabilities::operator =(const GetCapabilities& c)
-{
-  return *this;
-}
-
-
-GetCapabilities::~GetCapabilities(void)
-{
-}
-
-
-GetCapabilities::GetCapabilities(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__GETCAPABILITIES)
-{
-}
-
-
-GetCapabilities::GetCapabilities(const GetCapabilities& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__GETCAPABILITIES,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetCapabilities::checkIntegrity(void)
-{
-  return GetCapabilitiesMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesMarshaller.cpp
deleted file mode 100644
index 9a19ca9c2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetCapabilities.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/GetCapabilitiesMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool GetCapabilitiesMarshaller::checkIntegrity(GetCapabilities& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetCapabilitiesMarshaller::fromString(const std::string& s,GetCapabilities& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetCapabilitiesMarshaller::toString(const GetCapabilities& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetCapabilitiesMarshaller::checkIntegrityConst(const GetCapabilities& s)
-{
-  return true;
-}
-
-
-Json::Value GetCapabilitiesMarshaller::toJSON(const GetCapabilities& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.GetCapabilities");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetCapabilitiesMarshaller::fromJSON(const Json::Value& json,GetCapabilities& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.GetCapabilities"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesMarshaller.h
deleted file mode 100644
index 390510e68..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_GETCAPABILITIESMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_GETCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetCapabilities.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct GetCapabilitiesMarshaller
-    {
-      static bool checkIntegrity(GetCapabilities& e);
-      static bool checkIntegrityConst(const GetCapabilities& e);
-    
-      static bool fromString(const std::string& s,GetCapabilities& e);
-      static const std::string toString(const GetCapabilities& e);
-    
-      static bool fromJSON(const Json::Value& s,GetCapabilities& e);
-      static Json::Value toJSON(const GetCapabilities& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesResponse.cpp
deleted file mode 100644
index 204f6450a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesResponse.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetCapabilitiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-GetCapabilitiesResponse& GetCapabilitiesResponse::operator =(const GetCapabilitiesResponse& c)
-{
-  displayCapabilities=c.displayCapabilities;
-  hmiZoneCapabilities=c.hmiZoneCapabilities;
-  if(softButtonCapabilities)  delete softButtonCapabilities;
-  softButtonCapabilities= c.softButtonCapabilities ? new std::vector<NsSmartDeviceLinkRPCV2::SoftButtonCapabilities>(c.softButtonCapabilities[0]) : 0;
-  return *this;
-}
-
-
-GetCapabilitiesResponse::~GetCapabilitiesResponse(void)
-{
-  if(softButtonCapabilities)  delete softButtonCapabilities;
-}
-
-
-GetCapabilitiesResponse::GetCapabilitiesResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__GETCAPABILITIESRESPONSE),
-  softButtonCapabilities(0)
-{
-}
-
-
-GetCapabilitiesResponse::GetCapabilitiesResponse(const GetCapabilitiesResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__GETCAPABILITIESRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::DisplayCapabilities& GetCapabilitiesResponse::get_displayCapabilities(void)
-{
-  return displayCapabilities;
-}
-
-bool GetCapabilitiesResponse::set_displayCapabilities(const NsSmartDeviceLinkRPCV2::DisplayCapabilities& displayCapabilities_)
-{
-  displayCapabilities=displayCapabilities_;
-  return true;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::HmiZoneCapabilities>& GetCapabilitiesResponse::get_hmiZoneCapabilities(void)
-{
-  return hmiZoneCapabilities;
-}
-
-bool GetCapabilitiesResponse::set_hmiZoneCapabilities(const std::vector< NsSmartDeviceLinkRPCV2::HmiZoneCapabilities>& hmiZoneCapabilities_)
-{
-  hmiZoneCapabilities=hmiZoneCapabilities_;
-  return true;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::SoftButtonCapabilities>* GetCapabilitiesResponse::get_softButtonCapabilities(void)
-{
-  return softButtonCapabilities;
-}
-
-bool GetCapabilitiesResponse::set_softButtonCapabilities(const std::vector< NsSmartDeviceLinkRPCV2::SoftButtonCapabilities>& softButtonCapabilities_)
-{
-  if(softButtonCapabilities)  delete softButtonCapabilities;
-  softButtonCapabilities=new std::vector< NsSmartDeviceLinkRPCV2::SoftButtonCapabilities>(softButtonCapabilities_);
-  return true;
-}
-
-void GetCapabilitiesResponse::reset_softButtonCapabilities(void)
-{
-  if(softButtonCapabilities)  delete softButtonCapabilities;
-  softButtonCapabilities=0;
-}
-
-bool GetCapabilitiesResponse::checkIntegrity(void)
-{
-  return GetCapabilitiesResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesResponseMarshaller.cpp
deleted file mode 100644
index c6ee9c41e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesResponseMarshaller.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetCapabilitiesResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/GetCapabilitiesResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool GetCapabilitiesResponseMarshaller::checkIntegrity(GetCapabilitiesResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetCapabilitiesResponseMarshaller::fromString(const std::string& s,GetCapabilitiesResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetCapabilitiesResponseMarshaller::toString(const GetCapabilitiesResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetCapabilitiesResponseMarshaller::checkIntegrityConst(const GetCapabilitiesResponse& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::DisplayCapabilitiesMarshaller::checkIntegrityConst(s.displayCapabilities))  return false;
-
-  {
-    unsigned int i=s.hmiZoneCapabilities.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  if(s.softButtonCapabilities)
-  {
-    unsigned int i=s.softButtonCapabilities[0].size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value GetCapabilitiesResponseMarshaller::toJSON(const GetCapabilitiesResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.GetCapabilitiesResponse");
-
-  json["result"]["displayCapabilities"]=NsSmartDeviceLinkRPCV2::DisplayCapabilitiesMarshaller::toJSON(e.displayCapabilities);;
-  {
-    unsigned int i=e.hmiZoneCapabilities.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::HmiZoneCapabilitiesMarshaller::toJSON(e.hmiZoneCapabilities[i]);
-
-    json["result"]["hmiZoneCapabilities"]=j;
-  }
-  if(e.softButtonCapabilities)
-  {
-    unsigned int i=e.softButtonCapabilities[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::SoftButtonCapabilitiesMarshaller::toJSON(e.softButtonCapabilities[0][i]);
-
-    json["result"]["softButtonCapabilities"]=j;
-  }
-  return json;
-}
-
-
-bool GetCapabilitiesResponseMarshaller::fromJSON(const Json::Value& json,GetCapabilitiesResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.GetCapabilitiesResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("displayCapabilities") || !NsSmartDeviceLinkRPCV2::DisplayCapabilitiesMarshaller::fromJSON(js["displayCapabilities"],c.displayCapabilities))  return false;
-
-    if(!js.isMember("hmiZoneCapabilities") || !js["hmiZoneCapabilities"].isArray())  return false;
-    {
-      unsigned int i=js["hmiZoneCapabilities"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.hmiZoneCapabilities.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::HmiZoneCapabilities t;
-        if(!NsSmartDeviceLinkRPCV2::HmiZoneCapabilitiesMarshaller::fromJSON(js["hmiZoneCapabilities"][i],t))
-          return false;
-         c.hmiZoneCapabilities[i]=t;
-      }
-    }
-
-    if(c.softButtonCapabilities)  delete c.softButtonCapabilities;
-    c.softButtonCapabilities=0;
-    if(js.isMember("softButtonCapabilities"))
-    {
-      if(!js["softButtonCapabilities"].isArray()) return false;
-      unsigned int i=js["softButtonCapabilities"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-
-      c.softButtonCapabilities=new std::vector<NsSmartDeviceLinkRPCV2::SoftButtonCapabilities>();
-      c.softButtonCapabilities->resize(js["softButtonCapabilities"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::SoftButtonCapabilitiesMarshaller::fromJSON(js["softButtonCapabilities"][i],c.softButtonCapabilities[0][i]))  return false;
-    }
-
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesResponseMarshaller.h
deleted file mode 100644
index 1eeeaf76f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetCapabilitiesResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_GETCAPABILITIESRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_GETCAPABILITIESRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetCapabilitiesResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct GetCapabilitiesResponseMarshaller
-    {
-      static bool checkIntegrity(GetCapabilitiesResponse& e);
-      static bool checkIntegrityConst(const GetCapabilitiesResponse& e);
-    
-      static bool fromString(const std::string& s,GetCapabilitiesResponse& e);
-      static const std::string toString(const GetCapabilitiesResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetCapabilitiesResponse& e);
-      static Json::Value toJSON(const GetCapabilitiesResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguage.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguage.cpp
deleted file mode 100644
index 36e740f20..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguage.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetLanguage.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-GetLanguage& GetLanguage::operator =(const GetLanguage& c)
-{
-  return *this;
-}
-
-
-GetLanguage::~GetLanguage(void)
-{
-}
-
-
-GetLanguage::GetLanguage(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__GETLANGUAGE)
-{
-}
-
-
-GetLanguage::GetLanguage(const GetLanguage& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__GETLANGUAGE,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetLanguage::checkIntegrity(void)
-{
-  return GetLanguageMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageMarshaller.cpp
deleted file mode 100644
index 1310baef3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetLanguage.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/GetLanguageMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool GetLanguageMarshaller::checkIntegrity(GetLanguage& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetLanguageMarshaller::fromString(const std::string& s,GetLanguage& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetLanguageMarshaller::toString(const GetLanguage& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetLanguageMarshaller::checkIntegrityConst(const GetLanguage& s)
-{
-  return true;
-}
-
-
-Json::Value GetLanguageMarshaller::toJSON(const GetLanguage& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.GetLanguage");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetLanguageMarshaller::fromJSON(const Json::Value& json,GetLanguage& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.GetLanguage"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageMarshaller.h
deleted file mode 100644
index 03ed2fded..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_GETLANGUAGEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_GETLANGUAGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetLanguage.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct GetLanguageMarshaller
-    {
-      static bool checkIntegrity(GetLanguage& e);
-      static bool checkIntegrityConst(const GetLanguage& e);
-    
-      static bool fromString(const std::string& s,GetLanguage& e);
-      static const std::string toString(const GetLanguage& e);
-    
-      static bool fromJSON(const Json::Value& s,GetLanguage& e);
-      static Json::Value toJSON(const GetLanguage& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageResponse.cpp
deleted file mode 100644
index 72e118ac9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageResponse.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetLanguageResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-GetLanguageResponse& GetLanguageResponse::operator =(const GetLanguageResponse& c)
-{
-  hmiDisplayLanguage=c.hmiDisplayLanguage;
-  return *this;
-}
-
-
-GetLanguageResponse::~GetLanguageResponse(void)
-{
-}
-
-
-GetLanguageResponse::GetLanguageResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__GETLANGUAGERESPONSE)
-{
-}
-
-
-GetLanguageResponse::GetLanguageResponse(const GetLanguageResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__GETLANGUAGERESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::Language& GetLanguageResponse::get_hmiDisplayLanguage(void)
-{
-  return hmiDisplayLanguage;
-}
-
-bool GetLanguageResponse::set_hmiDisplayLanguage(const NsSmartDeviceLinkRPCV2::Language& hmiDisplayLanguage_)
-{
-  hmiDisplayLanguage=hmiDisplayLanguage_;
-  return true;
-}
-
-bool GetLanguageResponse::checkIntegrity(void)
-{
-  return GetLanguageResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageResponseMarshaller.cpp
deleted file mode 100644
index e4f04dfa1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageResponseMarshaller.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetLanguageResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/GetLanguageResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool GetLanguageResponseMarshaller::checkIntegrity(GetLanguageResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetLanguageResponseMarshaller::fromString(const std::string& s,GetLanguageResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetLanguageResponseMarshaller::toString(const GetLanguageResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetLanguageResponseMarshaller::checkIntegrityConst(const GetLanguageResponse& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::LanguageMarshaller::checkIntegrityConst(s.hmiDisplayLanguage))  return false;
-
-  return true;
-}
-
-
-Json::Value GetLanguageResponseMarshaller::toJSON(const GetLanguageResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.GetLanguageResponse");
-
-  json["result"]["hmiDisplayLanguage"]=NsSmartDeviceLinkRPCV2::LanguageMarshaller::toJSON(e.hmiDisplayLanguage);;
-  return json;
-}
-
-
-bool GetLanguageResponseMarshaller::fromJSON(const Json::Value& json,GetLanguageResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.GetLanguageResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("hmiDisplayLanguage") || !NsSmartDeviceLinkRPCV2::LanguageMarshaller::fromJSON(js["hmiDisplayLanguage"],c.hmiDisplayLanguage))  return false;
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageResponseMarshaller.h
deleted file mode 100644
index 01e9fada2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetLanguageResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_GETLANGUAGERESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_GETLANGUAGERESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetLanguageResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct GetLanguageResponseMarshaller
-    {
-      static bool checkIntegrity(GetLanguageResponse& e);
-      static bool checkIntegrityConst(const GetLanguageResponse& e);
-    
-      static bool fromString(const std::string& s,GetLanguageResponse& e);
-      static const std::string toString(const GetLanguageResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetLanguageResponse& e);
-      static Json::Value toJSON(const GetLanguageResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguages.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguages.cpp
deleted file mode 100644
index b68b5462e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguages.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetSupportedLanguages.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-GetSupportedLanguages& GetSupportedLanguages::operator =(const GetSupportedLanguages& c)
-{
-  return *this;
-}
-
-
-GetSupportedLanguages::~GetSupportedLanguages(void)
-{
-}
-
-
-GetSupportedLanguages::GetSupportedLanguages(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__GETSUPPORTEDLANGUAGES)
-{
-}
-
-
-GetSupportedLanguages::GetSupportedLanguages(const GetSupportedLanguages& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__GETSUPPORTEDLANGUAGES,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetSupportedLanguages::checkIntegrity(void)
-{
-  return GetSupportedLanguagesMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesMarshaller.cpp
deleted file mode 100644
index 1aa123469..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetSupportedLanguages.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/GetSupportedLanguagesMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool GetSupportedLanguagesMarshaller::checkIntegrity(GetSupportedLanguages& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetSupportedLanguagesMarshaller::fromString(const std::string& s,GetSupportedLanguages& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetSupportedLanguagesMarshaller::toString(const GetSupportedLanguages& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetSupportedLanguagesMarshaller::checkIntegrityConst(const GetSupportedLanguages& s)
-{
-  return true;
-}
-
-
-Json::Value GetSupportedLanguagesMarshaller::toJSON(const GetSupportedLanguages& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.GetSupportedLanguages");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetSupportedLanguagesMarshaller::fromJSON(const Json::Value& json,GetSupportedLanguages& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.GetSupportedLanguages"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesMarshaller.h
deleted file mode 100644
index e518431b4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_GETSUPPORTEDLANGUAGESMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_GETSUPPORTEDLANGUAGESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetSupportedLanguages.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct GetSupportedLanguagesMarshaller
-    {
-      static bool checkIntegrity(GetSupportedLanguages& e);
-      static bool checkIntegrityConst(const GetSupportedLanguages& e);
-    
-      static bool fromString(const std::string& s,GetSupportedLanguages& e);
-      static const std::string toString(const GetSupportedLanguages& e);
-    
-      static bool fromJSON(const Json::Value& s,GetSupportedLanguages& e);
-      static Json::Value toJSON(const GetSupportedLanguages& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesResponse.cpp
deleted file mode 100644
index 3ead1761c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesResponse.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetSupportedLanguagesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-GetSupportedLanguagesResponse& GetSupportedLanguagesResponse::operator =(const GetSupportedLanguagesResponse& c)
-{
-  languages=c.languages;
-  return *this;
-}
-
-
-GetSupportedLanguagesResponse::~GetSupportedLanguagesResponse(void)
-{
-}
-
-
-GetSupportedLanguagesResponse::GetSupportedLanguagesResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__GETSUPPORTEDLANGUAGESRESPONSE)
-{
-}
-
-
-GetSupportedLanguagesResponse::GetSupportedLanguagesResponse(const GetSupportedLanguagesResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__GETSUPPORTEDLANGUAGESRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::Language>& GetSupportedLanguagesResponse::get_languages(void)
-{
-  return languages;
-}
-
-bool GetSupportedLanguagesResponse::set_languages(const std::vector< NsSmartDeviceLinkRPCV2::Language>& languages_)
-{
-  languages=languages_;
-  return true;
-}
-
-bool GetSupportedLanguagesResponse::checkIntegrity(void)
-{
-  return GetSupportedLanguagesResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesResponseMarshaller.cpp
deleted file mode 100644
index 6c947feb1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesResponseMarshaller.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetSupportedLanguagesResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/GetSupportedLanguagesResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool GetSupportedLanguagesResponseMarshaller::checkIntegrity(GetSupportedLanguagesResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetSupportedLanguagesResponseMarshaller::fromString(const std::string& s,GetSupportedLanguagesResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetSupportedLanguagesResponseMarshaller::toString(const GetSupportedLanguagesResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetSupportedLanguagesResponseMarshaller::checkIntegrityConst(const GetSupportedLanguagesResponse& s)
-{
-  {
-    unsigned int i=s.languages.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value GetSupportedLanguagesResponseMarshaller::toJSON(const GetSupportedLanguagesResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.GetSupportedLanguagesResponse");
-
-  {
-    unsigned int i=e.languages.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::LanguageMarshaller::toJSON(e.languages[i]);
-
-    json["result"]["languages"]=j;
-  }
-  return json;
-}
-
-
-bool GetSupportedLanguagesResponseMarshaller::fromJSON(const Json::Value& json,GetSupportedLanguagesResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.GetSupportedLanguagesResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("languages") || !js["languages"].isArray())  return false;
-    {
-      unsigned int i=js["languages"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.languages.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::Language t;
-        if(!NsSmartDeviceLinkRPCV2::LanguageMarshaller::fromJSON(js["languages"][i],t))
-          return false;
-         c.languages[i]=t;
-      }
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesResponseMarshaller.h
deleted file mode 100644
index f0d17f125..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/GetSupportedLanguagesResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_GETSUPPORTEDLANGUAGESRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_GETSUPPORTEDLANGUAGESRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/GetSupportedLanguagesResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct GetSupportedLanguagesResponseMarshaller
-    {
-      static bool checkIntegrity(GetSupportedLanguagesResponse& e);
-      static bool checkIntegrityConst(const GetSupportedLanguagesResponse& e);
-    
-      static bool fromString(const std::string& s,GetSupportedLanguagesResponse& e);
-      static const std::string toString(const GetSupportedLanguagesResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetSupportedLanguagesResponse& e);
-      static Json::Value toJSON(const GetSupportedLanguagesResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnCommand.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnCommand.cpp
deleted file mode 100644
index 07fb31b9b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnCommand.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-OnCommand& OnCommand::operator =(const OnCommand& c)
-{
-  commandId=c.commandId;
-  appId=c.appId;
-  return *this;
-}
-
-
-OnCommand::~OnCommand(void)
-{
-}
-
-
-OnCommand::OnCommand(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONCOMMAND)
-{
-}
-
-
-OnCommand::OnCommand(const OnCommand& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONCOMMAND)
-{
-  *this=c;
-}
-
-
-unsigned int OnCommand::get_commandId(void)
-{
-  return commandId;
-}
-
-bool OnCommand::set_commandId(unsigned int commandId_)
-{
-  commandId=commandId_;
-  return true;
-}
-
-int OnCommand::get_appId(void)
-{
-  return appId;
-}
-
-bool OnCommand::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool OnCommand::checkIntegrity(void)
-{
-  return OnCommandMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnCommandMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnCommandMarshaller.cpp
deleted file mode 100644
index a9cddfd63..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnCommandMarshaller.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnCommand.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnCommandMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool OnCommandMarshaller::checkIntegrity(OnCommand& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnCommandMarshaller::fromString(const std::string& s,OnCommand& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnCommandMarshaller::toString(const OnCommand& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnCommandMarshaller::checkIntegrityConst(const OnCommand& s)
-{
-  if(s.commandId>2000000000)  return false;
-
-  return true;
-}
-
-
-Json::Value OnCommandMarshaller::toJSON(const OnCommand& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.OnCommand");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["commandId"]=Json::Value(e.commandId);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool OnCommandMarshaller::fromJSON(const Json::Value& json,OnCommand& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.OnCommand"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("commandId") || !js["commandId"].isInt())  return false;
-    c.commandId=js["commandId"].asInt();
-    if(c.commandId>2000000000)  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnCommandMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnCommandMarshaller.h
deleted file mode 100644
index 452bc9023..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnCommandMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONCOMMANDMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONCOMMANDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnCommand.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct OnCommandMarshaller
-    {
-      static bool checkIntegrity(OnCommand& e);
-      static bool checkIntegrityConst(const OnCommand& e);
-    
-      static bool fromString(const std::string& s,OnCommand& e);
-      static const std::string toString(const OnCommand& e);
-    
-      static bool fromJSON(const Json::Value& s,OnCommand& e);
-      static Json::Value toJSON(const OnCommand& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDeviceChosen.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDeviceChosen.cpp
deleted file mode 100644
index 64030c3ef..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDeviceChosen.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnDeviceChosen.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-OnDeviceChosen& OnDeviceChosen::operator =(const OnDeviceChosen& c)
-{
-  deviceName=c.deviceName;
-  return *this;
-}
-
-
-OnDeviceChosen::~OnDeviceChosen(void)
-{
-}
-
-
-OnDeviceChosen::OnDeviceChosen(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONDEVICECHOSEN)
-{
-}
-
-
-OnDeviceChosen::OnDeviceChosen(const OnDeviceChosen& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONDEVICECHOSEN)
-{
-  *this=c;
-}
-
-
-const std::string& OnDeviceChosen::get_deviceName(void)
-{
-  return deviceName;
-}
-
-bool OnDeviceChosen::set_deviceName(const std::string& deviceName_)
-{
-  deviceName=deviceName_;
-  return true;
-}
-
-bool OnDeviceChosen::checkIntegrity(void)
-{
-  return OnDeviceChosenMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDeviceChosenMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDeviceChosenMarshaller.cpp
deleted file mode 100644
index b9ce689ec..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDeviceChosenMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnDeviceChosen.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnDeviceChosenMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool OnDeviceChosenMarshaller::checkIntegrity(OnDeviceChosen& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnDeviceChosenMarshaller::fromString(const std::string& s,OnDeviceChosen& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnDeviceChosenMarshaller::toString(const OnDeviceChosen& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnDeviceChosenMarshaller::checkIntegrityConst(const OnDeviceChosen& s)
-{
-  return true;
-}
-
-
-Json::Value OnDeviceChosenMarshaller::toJSON(const OnDeviceChosen& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.OnDeviceChosen");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["deviceName"]=Json::Value(e.deviceName);;
-  return json;
-}
-
-
-bool OnDeviceChosenMarshaller::fromJSON(const Json::Value& json,OnDeviceChosen& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.OnDeviceChosen"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("deviceName") || !js["deviceName"].isString())  return false;
-    c.deviceName=js["deviceName"].asString();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDeviceChosenMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDeviceChosenMarshaller.h
deleted file mode 100644
index eeb41cbad..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDeviceChosenMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONDEVICECHOSENMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONDEVICECHOSENMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnDeviceChosen.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct OnDeviceChosenMarshaller
-    {
-      static bool checkIntegrity(OnDeviceChosen& e);
-      static bool checkIntegrityConst(const OnDeviceChosen& e);
-    
-      static bool fromString(const std::string& s,OnDeviceChosen& e);
-      static const std::string toString(const OnDeviceChosen& e);
-    
-      static bool fromJSON(const Json::Value& s,OnDeviceChosen& e);
-      static Json::Value toJSON(const OnDeviceChosen& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDriverDistraction.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDriverDistraction.cpp
deleted file mode 100644
index 68cf2740d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDriverDistraction.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnDriverDistraction.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-OnDriverDistraction& OnDriverDistraction::operator =(const OnDriverDistraction& c)
-{
-  state=c.state;
-  return *this;
-}
-
-
-OnDriverDistraction::~OnDriverDistraction(void)
-{
-}
-
-
-OnDriverDistraction::OnDriverDistraction(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONDRIVERDISTRACTION)
-{
-}
-
-
-OnDriverDistraction::OnDriverDistraction(const OnDriverDistraction& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONDRIVERDISTRACTION)
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::DriverDistractionState& OnDriverDistraction::get_state(void)
-{
-  return state;
-}
-
-bool OnDriverDistraction::set_state(const NsSmartDeviceLinkRPCV2::DriverDistractionState& state_)
-{
-  state=state_;
-  return true;
-}
-
-bool OnDriverDistraction::checkIntegrity(void)
-{
-  return OnDriverDistractionMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDriverDistractionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDriverDistractionMarshaller.cpp
deleted file mode 100644
index c62901454..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDriverDistractionMarshaller.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnDriverDistraction.h"
-#include "../src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnDriverDistractionMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool OnDriverDistractionMarshaller::checkIntegrity(OnDriverDistraction& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnDriverDistractionMarshaller::fromString(const std::string& s,OnDriverDistraction& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnDriverDistractionMarshaller::toString(const OnDriverDistraction& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnDriverDistractionMarshaller::checkIntegrityConst(const OnDriverDistraction& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::DriverDistractionStateMarshaller::checkIntegrityConst(s.state))  return false;
-
-  return true;
-}
-
-
-Json::Value OnDriverDistractionMarshaller::toJSON(const OnDriverDistraction& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.OnDriverDistraction");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["state"]=NsSmartDeviceLinkRPCV2::DriverDistractionStateMarshaller::toJSON(e.state);;
-  return json;
-}
-
-
-bool OnDriverDistractionMarshaller::fromJSON(const Json::Value& json,OnDriverDistraction& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.OnDriverDistraction"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("state") || !NsSmartDeviceLinkRPCV2::DriverDistractionStateMarshaller::fromJSON(js["state"],c.state))  return false;
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDriverDistractionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDriverDistractionMarshaller.h
deleted file mode 100644
index 470fe089d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnDriverDistractionMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONDRIVERDISTRACTIONMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONDRIVERDISTRACTIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnDriverDistraction.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct OnDriverDistractionMarshaller
-    {
-      static bool checkIntegrity(OnDriverDistraction& e);
-      static bool checkIntegrityConst(const OnDriverDistraction& e);
-    
-      static bool fromString(const std::string& s,OnDriverDistraction& e);
-      static const std::string toString(const OnDriverDistraction& e);
-    
-      static bool fromJSON(const Json::Value& s,OnDriverDistraction& e);
-      static Json::Value toJSON(const OnDriverDistraction& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnLanguageChange.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnLanguageChange.cpp
deleted file mode 100644
index 0418a8f33..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnLanguageChange.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnLanguageChange.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-OnLanguageChange& OnLanguageChange::operator =(const OnLanguageChange& c)
-{
-  hmiDisplayLanguage=c.hmiDisplayLanguage;
-  return *this;
-}
-
-
-OnLanguageChange::~OnLanguageChange(void)
-{
-}
-
-
-OnLanguageChange::OnLanguageChange(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONLANGUAGECHANGE)
-{
-}
-
-
-OnLanguageChange::OnLanguageChange(const OnLanguageChange& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONLANGUAGECHANGE)
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::Language& OnLanguageChange::get_hmiDisplayLanguage(void)
-{
-  return hmiDisplayLanguage;
-}
-
-bool OnLanguageChange::set_hmiDisplayLanguage(const NsSmartDeviceLinkRPCV2::Language& hmiDisplayLanguage_)
-{
-  hmiDisplayLanguage=hmiDisplayLanguage_;
-  return true;
-}
-
-bool OnLanguageChange::checkIntegrity(void)
-{
-  return OnLanguageChangeMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnLanguageChangeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnLanguageChangeMarshaller.cpp
deleted file mode 100644
index 57e0b8c10..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnLanguageChangeMarshaller.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnLanguageChange.h"
-#include "../src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnLanguageChangeMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool OnLanguageChangeMarshaller::checkIntegrity(OnLanguageChange& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnLanguageChangeMarshaller::fromString(const std::string& s,OnLanguageChange& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnLanguageChangeMarshaller::toString(const OnLanguageChange& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnLanguageChangeMarshaller::checkIntegrityConst(const OnLanguageChange& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::LanguageMarshaller::checkIntegrityConst(s.hmiDisplayLanguage))  return false;
-
-  return true;
-}
-
-
-Json::Value OnLanguageChangeMarshaller::toJSON(const OnLanguageChange& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.OnLanguageChange");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["hmiDisplayLanguage"]=NsSmartDeviceLinkRPCV2::LanguageMarshaller::toJSON(e.hmiDisplayLanguage);;
-  return json;
-}
-
-
-bool OnLanguageChangeMarshaller::fromJSON(const Json::Value& json,OnLanguageChange& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.OnLanguageChange"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("hmiDisplayLanguage") || !NsSmartDeviceLinkRPCV2::LanguageMarshaller::fromJSON(js["hmiDisplayLanguage"],c.hmiDisplayLanguage))  return false;
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnLanguageChangeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnLanguageChangeMarshaller.h
deleted file mode 100644
index 286ae7eb9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnLanguageChangeMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONLANGUAGECHANGEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONLANGUAGECHANGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnLanguageChange.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct OnLanguageChangeMarshaller
-    {
-      static bool checkIntegrity(OnLanguageChange& e);
-      static bool checkIntegrityConst(const OnLanguageChange& e);
-    
-      static bool fromString(const std::string& s,OnLanguageChange& e);
-      static const std::string toString(const OnLanguageChange& e);
-    
-      static bool fromJSON(const Json::Value& s,OnLanguageChange& e);
-      static Json::Value toJSON(const OnLanguageChange& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnReady.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnReady.cpp
deleted file mode 100644
index af4d65a2f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnReady.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnReady.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-OnReady& OnReady::operator =(const OnReady& c)
-{
-  return *this;
-}
-
-
-OnReady::~OnReady(void)
-{
-}
-
-
-OnReady::OnReady(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONREADY)
-{
-}
-
-
-OnReady::OnReady(const OnReady& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONREADY)
-{
-  *this=c;
-}
-
-
-bool OnReady::checkIntegrity(void)
-{
-  return OnReadyMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnReadyMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnReadyMarshaller.cpp
deleted file mode 100644
index 5fc0178cc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnReadyMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnReady.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnReadyMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool OnReadyMarshaller::checkIntegrity(OnReady& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnReadyMarshaller::fromString(const std::string& s,OnReady& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnReadyMarshaller::toString(const OnReady& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnReadyMarshaller::checkIntegrityConst(const OnReady& s)
-{
-  return true;
-}
-
-
-Json::Value OnReadyMarshaller::toJSON(const OnReady& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.OnReady");
-
-  return json;
-}
-
-
-bool OnReadyMarshaller::fromJSON(const Json::Value& json,OnReady& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.OnReady"))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnReadyMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnReadyMarshaller.h
deleted file mode 100644
index f96808e44..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnReadyMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONREADYMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONREADYMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnReady.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct OnReadyMarshaller
-    {
-      static bool checkIntegrity(OnReady& e);
-      static bool checkIntegrityConst(const OnReady& e);
-    
-      static bool fromString(const std::string& s,OnReady& e);
-      static const std::string toString(const OnReady& e);
-    
-      static bool fromJSON(const Json::Value& s,OnReady& e);
-      static Json::Value toJSON(const OnReady& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnSystemContext.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnSystemContext.cpp
deleted file mode 100644
index 1b87a26be..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnSystemContext.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnSystemContext.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-OnSystemContext& OnSystemContext::operator =(const OnSystemContext& c)
-{
-  systemContext=c.systemContext;
-  return *this;
-}
-
-
-OnSystemContext::~OnSystemContext(void)
-{
-}
-
-
-OnSystemContext::OnSystemContext(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONSYSTEMCONTEXT)
-{
-}
-
-
-OnSystemContext::OnSystemContext(const OnSystemContext& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONSYSTEMCONTEXT)
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::SystemContext& OnSystemContext::get_systemContext(void)
-{
-  return systemContext;
-}
-
-bool OnSystemContext::set_systemContext(const NsSmartDeviceLinkRPCV2::SystemContext& systemContext_)
-{
-  systemContext=systemContext_;
-  return true;
-}
-
-bool OnSystemContext::checkIntegrity(void)
-{
-  return OnSystemContextMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnSystemContextMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnSystemContextMarshaller.cpp
deleted file mode 100644
index 471b5330d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnSystemContextMarshaller.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnSystemContext.h"
-#include "../src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnSystemContextMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool OnSystemContextMarshaller::checkIntegrity(OnSystemContext& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnSystemContextMarshaller::fromString(const std::string& s,OnSystemContext& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnSystemContextMarshaller::toString(const OnSystemContext& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnSystemContextMarshaller::checkIntegrityConst(const OnSystemContext& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::SystemContextMarshaller::checkIntegrityConst(s.systemContext))  return false;
-
-  return true;
-}
-
-
-Json::Value OnSystemContextMarshaller::toJSON(const OnSystemContext& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.OnSystemContext");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["systemContext"]=NsSmartDeviceLinkRPCV2::SystemContextMarshaller::toJSON(e.systemContext);;
-  return json;
-}
-
-
-bool OnSystemContextMarshaller::fromJSON(const Json::Value& json,OnSystemContext& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.OnSystemContext"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("systemContext") || !NsSmartDeviceLinkRPCV2::SystemContextMarshaller::fromJSON(js["systemContext"],c.systemContext))  return false;
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnSystemContextMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnSystemContextMarshaller.h
deleted file mode 100644
index e9cece0ac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnSystemContextMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONSYSTEMCONTEXTMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONSYSTEMCONTEXTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnSystemContext.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct OnSystemContextMarshaller
-    {
-      static bool checkIntegrity(OnSystemContext& e);
-      static bool checkIntegrityConst(const OnSystemContext& e);
-    
-      static bool fromString(const std::string& s,OnSystemContext& e);
-      static const std::string toString(const OnSystemContext& e);
-    
-      static bool fromJSON(const Json::Value& s,OnSystemContext& e);
-      static Json::Value toJSON(const OnSystemContext& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnTBTClientState.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnTBTClientState.cpp
deleted file mode 100644
index f1dce8016..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnTBTClientState.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnTBTClientState.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-OnTBTClientState& OnTBTClientState::operator =(const OnTBTClientState& c)
-{
-  state=c.state;
-  return *this;
-}
-
-
-OnTBTClientState::~OnTBTClientState(void)
-{
-}
-
-
-OnTBTClientState::OnTBTClientState(void) :
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONTBTCLIENTSTATE)
-{
-}
-
-
-OnTBTClientState::OnTBTClientState(const OnTBTClientState& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__ONTBTCLIENTSTATE)
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::TBTState& OnTBTClientState::get_state(void)
-{
-  return state;
-}
-
-bool OnTBTClientState::set_state(const NsSmartDeviceLinkRPCV2::TBTState& state_)
-{
-  state=state_;
-  return true;
-}
-
-int OnTBTClientState::get_appId(void)
-{
-  return appId;
-}
-
-bool OnTBTClientState::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool OnTBTClientState::checkIntegrity(void)
-{
-  return OnTBTClientStateMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnTBTClientStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnTBTClientStateMarshaller.cpp
deleted file mode 100644
index 891112e8e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnTBTClientStateMarshaller.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnTBTClientState.h"
-#include "../src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/OnTBTClientStateMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool OnTBTClientStateMarshaller::checkIntegrity(OnTBTClientState& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnTBTClientStateMarshaller::fromString(const std::string& s,OnTBTClientState& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnTBTClientStateMarshaller::toString(const OnTBTClientState& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnTBTClientStateMarshaller::checkIntegrityConst(const OnTBTClientState& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::TBTStateMarshaller::checkIntegrityConst(s.state))  return false;
-
-  return true;
-}
-
-
-Json::Value OnTBTClientStateMarshaller::toJSON(const OnTBTClientState& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.OnTBTClientState");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["state"]=NsSmartDeviceLinkRPCV2::TBTStateMarshaller::toJSON(e.state);
-  json["params"]["appId"]=Json::Value(e.appId);
-  return json;
-}
-
-
-bool OnTBTClientStateMarshaller::fromJSON(const Json::Value& json,OnTBTClientState& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.OnTBTClientState"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("state") || !NsSmartDeviceLinkRPCV2::TBTStateMarshaller::fromJSON(js["state"],c.state))  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnTBTClientStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnTBTClientStateMarshaller.h
deleted file mode 100644
index a78e8025f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/OnTBTClientStateMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_ONTBTCLIENTSTATEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_ONTBTCLIENTSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/OnTBTClientState.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct OnTBTClientStateMarshaller
-    {
-      static bool checkIntegrity(OnTBTClientState& e);
-      static bool checkIntegrityConst(const OnTBTClientState& e);
-    
-      static bool fromString(const std::string& s,OnTBTClientState& e);
-      static const std::string toString(const OnTBTClientState& e);
-    
-      static bool fromJSON(const Json::Value& s,OnTBTClientState& e);
-      static Json::Value toJSON(const OnTBTClientState& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThru.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThru.cpp
deleted file mode 100644
index 8365563d3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThru.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformAudioPassThru.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-PerformAudioPassThru& PerformAudioPassThru::operator =(const PerformAudioPassThru& c)
-{
-  initialPrompt=c.initialPrompt;
-  if(audioPassThruDisplayText1)  delete audioPassThruDisplayText1;
-  audioPassThruDisplayText1= c.audioPassThruDisplayText1 ? new std::string(c.audioPassThruDisplayText1[0]) : 0;
-  if(audioPassThruDisplayText2)  delete audioPassThruDisplayText2;
-  audioPassThruDisplayText2= c.audioPassThruDisplayText2 ? new std::string(c.audioPassThruDisplayText2[0]) : 0;
-  samplingRate=c.samplingRate;
-  maxDuration=c.maxDuration;
-  bitsPerSample=c.bitsPerSample;
-  audioType=c.audioType;
-  appId=c.appId;
-  return *this;
-}
-
-
-PerformAudioPassThru::~PerformAudioPassThru(void)
-{
-  if(audioPassThruDisplayText1)  delete audioPassThruDisplayText1;
-  if(audioPassThruDisplayText2)  delete audioPassThruDisplayText2;
-}
-
-
-PerformAudioPassThru::PerformAudioPassThru(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__PERFORMAUDIOPASSTHRU),
-  audioPassThruDisplayText1(0),
-  audioPassThruDisplayText2(0)
-{
-}
-
-
-PerformAudioPassThru::PerformAudioPassThru(const PerformAudioPassThru& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__PERFORMAUDIOPASSTHRU,c.getId())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& PerformAudioPassThru::get_initialPrompt(void)
-{
-  return initialPrompt;
-}
-
-bool PerformAudioPassThru::set_initialPrompt(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& initialPrompt_)
-{
-  initialPrompt=initialPrompt_;
-  return true;
-}
-
-const std::string* PerformAudioPassThru::get_audioPassThruDisplayText1(void)
-{
-  return audioPassThruDisplayText1;
-}
-
-bool PerformAudioPassThru::set_audioPassThruDisplayText1(const std::string& audioPassThruDisplayText1_)
-{
-  if(audioPassThruDisplayText1)  delete audioPassThruDisplayText1;
-  audioPassThruDisplayText1=new std::string(audioPassThruDisplayText1_);
-  return true;
-}
-
-void PerformAudioPassThru::reset_audioPassThruDisplayText1(void)
-{
-  if(audioPassThruDisplayText1)  delete audioPassThruDisplayText1;
-  audioPassThruDisplayText1=0;
-}
-
-const std::string* PerformAudioPassThru::get_audioPassThruDisplayText2(void)
-{
-  return audioPassThruDisplayText2;
-}
-
-bool PerformAudioPassThru::set_audioPassThruDisplayText2(const std::string& audioPassThruDisplayText2_)
-{
-  if(audioPassThruDisplayText2)  delete audioPassThruDisplayText2;
-  audioPassThruDisplayText2=new std::string(audioPassThruDisplayText2_);
-  return true;
-}
-
-void PerformAudioPassThru::reset_audioPassThruDisplayText2(void)
-{
-  if(audioPassThruDisplayText2)  delete audioPassThruDisplayText2;
-  audioPassThruDisplayText2=0;
-}
-
-const NsSmartDeviceLinkRPCV2::SamplingRate& PerformAudioPassThru::get_samplingRate(void)
-{
-  return samplingRate;
-}
-
-bool PerformAudioPassThru::set_samplingRate(const NsSmartDeviceLinkRPCV2::SamplingRate& samplingRate_)
-{
-  samplingRate=samplingRate_;
-  return true;
-}
-
-unsigned int PerformAudioPassThru::get_maxDuration(void)
-{
-  return maxDuration;
-}
-
-bool PerformAudioPassThru::set_maxDuration(unsigned int maxDuration_)
-{
-  maxDuration=maxDuration_;
-  return true;
-}
-
-const NsSmartDeviceLinkRPCV2::AudioCaptureQuality& PerformAudioPassThru::get_bitsPerSample(void)
-{
-  return bitsPerSample;
-}
-
-bool PerformAudioPassThru::set_bitsPerSample(const NsSmartDeviceLinkRPCV2::AudioCaptureQuality& bitsPerSample_)
-{
-  bitsPerSample=bitsPerSample_;
-  return true;
-}
-
-const NsSmartDeviceLinkRPCV2::AudioType& PerformAudioPassThru::get_audioType(void)
-{
-  return audioType;
-}
-
-bool PerformAudioPassThru::set_audioType(const NsSmartDeviceLinkRPCV2::AudioType& audioType_)
-{
-  audioType=audioType_;
-  return true;
-}
-
-int PerformAudioPassThru::get_appId(void)
-{
-  return appId;
-}
-
-bool PerformAudioPassThru::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool PerformAudioPassThru::checkIntegrity(void)
-{
-  return PerformAudioPassThruMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruMarshaller.cpp
deleted file mode 100644
index bda449899..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruMarshaller.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformAudioPassThru.h"
-#include "../src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/PerformAudioPassThruMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool PerformAudioPassThruMarshaller::checkIntegrity(PerformAudioPassThru& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PerformAudioPassThruMarshaller::fromString(const std::string& s,PerformAudioPassThru& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PerformAudioPassThruMarshaller::toString(const PerformAudioPassThru& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformAudioPassThruMarshaller::checkIntegrityConst(const PerformAudioPassThru& s)
-{
-  {
-    unsigned int i=s.initialPrompt.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  if(s.audioPassThruDisplayText1 && (s.audioPassThruDisplayText1[0].length()>500))  return false;
-
-  if(s.audioPassThruDisplayText2 && (s.audioPassThruDisplayText2[0].length()>500))  return false;
-
-  if(!NsSmartDeviceLinkRPCV2::SamplingRateMarshaller::checkIntegrityConst(s.samplingRate))  return false;
-
-  if(s.maxDuration>1000000)  return false;
-
-  if(!NsSmartDeviceLinkRPCV2::AudioCaptureQualityMarshaller::checkIntegrityConst(s.bitsPerSample))  return false;
-
-  if(!NsSmartDeviceLinkRPCV2::AudioTypeMarshaller::checkIntegrityConst(s.audioType))  return false;
-
-  return true;
-}
-
-
-Json::Value PerformAudioPassThruMarshaller::toJSON(const PerformAudioPassThru& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.PerformAudioPassThru");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  {
-    unsigned int i=e.initialPrompt.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::toJSON(e.initialPrompt[i]);
-
-    json["params"]["initialPrompt"]=j;
-  }
-  if(e.audioPassThruDisplayText1)
-    json["params"]["audioPassThruDisplayText1"]=Json::Value(e.audioPassThruDisplayText1[0]);;
-  if(e.audioPassThruDisplayText2)
-    json["params"]["audioPassThruDisplayText2"]=Json::Value(e.audioPassThruDisplayText2[0]);;
-  json["params"]["samplingRate"]=NsSmartDeviceLinkRPCV2::SamplingRateMarshaller::toJSON(e.samplingRate);;
-  json["params"]["maxDuration"]=Json::Value(e.maxDuration);;
-  json["params"]["bitsPerSample"]=NsSmartDeviceLinkRPCV2::AudioCaptureQualityMarshaller::toJSON(e.bitsPerSample);;
-  json["params"]["audioType"]=NsSmartDeviceLinkRPCV2::AudioTypeMarshaller::toJSON(e.audioType);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool PerformAudioPassThruMarshaller::fromJSON(const Json::Value& json,PerformAudioPassThru& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.PerformAudioPassThru"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("initialPrompt") || !js["initialPrompt"].isArray())  return false;
-    {
-      unsigned int i=js["initialPrompt"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.initialPrompt.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::TTSChunk t;
-        if(!NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::fromJSON(js["initialPrompt"][i],t))
-          return false;
-         c.initialPrompt[i]=t;
-      }
-    }
-
-    if(c.audioPassThruDisplayText1)  delete c.audioPassThruDisplayText1;
-    c.audioPassThruDisplayText1=0;
-    if(js.isMember("audioPassThruDisplayText1"))
-    {
-      if(!js["audioPassThruDisplayText1"].isString())  return false;
-      c.audioPassThruDisplayText1=new std::string();
-      c.audioPassThruDisplayText1[0]=js["audioPassThruDisplayText1"].asString();
-      if(c.audioPassThruDisplayText1[0].length()>500)  return false;
-
-    }
-
-    if(c.audioPassThruDisplayText2)  delete c.audioPassThruDisplayText2;
-    c.audioPassThruDisplayText2=0;
-    if(js.isMember("audioPassThruDisplayText2"))
-    {
-      if(!js["audioPassThruDisplayText2"].isString())  return false;
-      c.audioPassThruDisplayText2=new std::string();
-      c.audioPassThruDisplayText2[0]=js["audioPassThruDisplayText2"].asString();
-      if(c.audioPassThruDisplayText2[0].length()>500)  return false;
-
-    }
-
-    if(!js.isMember("samplingRate") || !NsSmartDeviceLinkRPCV2::SamplingRateMarshaller::fromJSON(js["samplingRate"],c.samplingRate))  return false;
-
-    if(!js.isMember("maxDuration") || !js["maxDuration"].isInt())  return false;
-    c.maxDuration=js["maxDuration"].asInt();
-    if(c.maxDuration>1000000)  return false;
-
-    if(!js.isMember("bitsPerSample") || !NsSmartDeviceLinkRPCV2::AudioCaptureQualityMarshaller::fromJSON(js["bitsPerSample"],c.bitsPerSample))  return false;
-
-    if(!js.isMember("audioType") || !NsSmartDeviceLinkRPCV2::AudioTypeMarshaller::fromJSON(js["audioType"],c.audioType))  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruMarshaller.h
deleted file mode 100644
index 76b662ff5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_PERFORMAUDIOPASSTHRUMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_PERFORMAUDIOPASSTHRUMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformAudioPassThru.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct PerformAudioPassThruMarshaller
-    {
-      static bool checkIntegrity(PerformAudioPassThru& e);
-      static bool checkIntegrityConst(const PerformAudioPassThru& e);
-    
-      static bool fromString(const std::string& s,PerformAudioPassThru& e);
-      static const std::string toString(const PerformAudioPassThru& e);
-    
-      static bool fromJSON(const Json::Value& s,PerformAudioPassThru& e);
-      static Json::Value toJSON(const PerformAudioPassThru& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruResponse.cpp
deleted file mode 100644
index a622237d9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformAudioPassThruResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-PerformAudioPassThruResponse& PerformAudioPassThruResponse::operator =(const PerformAudioPassThruResponse& c)
-{
-  return *this;
-}
-
-
-PerformAudioPassThruResponse::~PerformAudioPassThruResponse(void)
-{
-}
-
-
-PerformAudioPassThruResponse::PerformAudioPassThruResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__PERFORMAUDIOPASSTHRURESPONSE)
-{
-}
-
-
-PerformAudioPassThruResponse::PerformAudioPassThruResponse(const PerformAudioPassThruResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__PERFORMAUDIOPASSTHRURESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool PerformAudioPassThruResponse::checkIntegrity(void)
-{
-  return PerformAudioPassThruResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruResponseMarshaller.cpp
deleted file mode 100644
index fef6ca726..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformAudioPassThruResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/PerformAudioPassThruResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool PerformAudioPassThruResponseMarshaller::checkIntegrity(PerformAudioPassThruResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PerformAudioPassThruResponseMarshaller::fromString(const std::string& s,PerformAudioPassThruResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PerformAudioPassThruResponseMarshaller::toString(const PerformAudioPassThruResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformAudioPassThruResponseMarshaller::checkIntegrityConst(const PerformAudioPassThruResponse& s)
-{
-  return true;
-}
-
-
-Json::Value PerformAudioPassThruResponseMarshaller::toJSON(const PerformAudioPassThruResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.PerformAudioPassThruResponse");
-
-  return json;
-}
-
-
-bool PerformAudioPassThruResponseMarshaller::fromJSON(const Json::Value& json,PerformAudioPassThruResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.PerformAudioPassThruResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruResponseMarshaller.h
deleted file mode 100644
index 45127eadb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformAudioPassThruResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_PERFORMAUDIOPASSTHRURESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_PERFORMAUDIOPASSTHRURESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformAudioPassThruResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct PerformAudioPassThruResponseMarshaller
-    {
-      static bool checkIntegrity(PerformAudioPassThruResponse& e);
-      static bool checkIntegrityConst(const PerformAudioPassThruResponse& e);
-    
-      static bool fromString(const std::string& s,PerformAudioPassThruResponse& e);
-      static const std::string toString(const PerformAudioPassThruResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,PerformAudioPassThruResponse& e);
-      static Json::Value toJSON(const PerformAudioPassThruResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteraction.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteraction.cpp
deleted file mode 100644
index afd958da5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteraction.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformInteraction.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-PerformInteraction& PerformInteraction::operator =(const PerformInteraction& c)
-{
-  initialText=c.initialText;
-  initialPrompt=c.initialPrompt;
-  interactionMode=c.interactionMode;
-  interactionChoiceSetIDList=c.interactionChoiceSetIDList;
-  if(helpPrompt)  delete helpPrompt;
-  helpPrompt= c.helpPrompt ? new std::vector<NsSmartDeviceLinkRPCV2::TTSChunk>(c.helpPrompt[0]) : 0;
-  if(timeoutPrompt)  delete timeoutPrompt;
-  timeoutPrompt= c.timeoutPrompt ? new std::vector<NsSmartDeviceLinkRPCV2::TTSChunk>(c.timeoutPrompt[0]) : 0;
-  if(timeout)  delete timeout;
-  timeout= c.timeout ? new unsigned int(c.timeout[0]) : 0;
-  if(vrHelp)  delete vrHelp;
-  vrHelp= c.vrHelp ? new std::vector<NsSmartDeviceLinkRPCV2::VrHelpItem>(c.vrHelp[0]) : 0;
-  appId=c.appId;
-  return *this;
-}
-
-
-PerformInteraction::~PerformInteraction(void)
-{
-  if(helpPrompt)  delete helpPrompt;
-  if(timeoutPrompt)  delete timeoutPrompt;
-  if(timeout)  delete timeout;
-  if(vrHelp)  delete vrHelp;
-}
-
-
-PerformInteraction::PerformInteraction(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__PERFORMINTERACTION),
-  helpPrompt(0),
-  timeoutPrompt(0),
-  timeout(0),
-  vrHelp(0)
-{
-}
-
-
-PerformInteraction::PerformInteraction(const PerformInteraction& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__PERFORMINTERACTION,c.getId())
-{
-  *this=c;
-}
-
-
-const std::string& PerformInteraction::get_initialText(void)
-{
-  return initialText;
-}
-
-bool PerformInteraction::set_initialText(const std::string& initialText_)
-{
-  initialText=initialText_;
-  return true;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& PerformInteraction::get_initialPrompt(void)
-{
-  return initialPrompt;
-}
-
-bool PerformInteraction::set_initialPrompt(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& initialPrompt_)
-{
-  initialPrompt=initialPrompt_;
-  return true;
-}
-
-const NsSmartDeviceLinkRPCV2::InteractionMode& PerformInteraction::get_interactionMode(void)
-{
-  return interactionMode;
-}
-
-bool PerformInteraction::set_interactionMode(const NsSmartDeviceLinkRPCV2::InteractionMode& interactionMode_)
-{
-  interactionMode=interactionMode_;
-  return true;
-}
-
-const std::vector< unsigned int>& PerformInteraction::get_interactionChoiceSetIDList(void)
-{
-  return interactionChoiceSetIDList;
-}
-
-bool PerformInteraction::set_interactionChoiceSetIDList(const std::vector< unsigned int>& interactionChoiceSetIDList_)
-{
-  interactionChoiceSetIDList=interactionChoiceSetIDList_;
-  return true;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* PerformInteraction::get_helpPrompt(void)
-{
-  return helpPrompt;
-}
-
-bool PerformInteraction::set_helpPrompt(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& helpPrompt_)
-{
-  if(helpPrompt)  delete helpPrompt;
-  helpPrompt=new std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>(helpPrompt_);
-  return true;
-}
-
-void PerformInteraction::reset_helpPrompt(void)
-{
-  if(helpPrompt)  delete helpPrompt;
-  helpPrompt=0;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* PerformInteraction::get_timeoutPrompt(void)
-{
-  return timeoutPrompt;
-}
-
-bool PerformInteraction::set_timeoutPrompt(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& timeoutPrompt_)
-{
-  if(timeoutPrompt)  delete timeoutPrompt;
-  timeoutPrompt=new std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>(timeoutPrompt_);
-  return true;
-}
-
-void PerformInteraction::reset_timeoutPrompt(void)
-{
-  if(timeoutPrompt)  delete timeoutPrompt;
-  timeoutPrompt=0;
-}
-
-const unsigned int* PerformInteraction::get_timeout(void)
-{
-  return timeout;
-}
-
-bool PerformInteraction::set_timeout(const unsigned int& timeout_)
-{
-  if(timeout)  delete timeout;
-  timeout=new unsigned int(timeout_);
-  return true;
-}
-
-void PerformInteraction::reset_timeout(void)
-{
-  if(timeout)  delete timeout;
-  timeout=0;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::VrHelpItem>* PerformInteraction::get_vrHelp(void)
-{
-  return vrHelp;
-}
-
-bool PerformInteraction::set_vrHelp(const std::vector< NsSmartDeviceLinkRPCV2::VrHelpItem>& vrHelp_)
-{
-  if(vrHelp)  delete vrHelp;
-  vrHelp=new std::vector< NsSmartDeviceLinkRPCV2::VrHelpItem>(vrHelp_);
-  return true;
-}
-
-void PerformInteraction::reset_vrHelp(void)
-{
-  if(vrHelp)  delete vrHelp;
-  vrHelp=0;
-}
-
-int PerformInteraction::get_appId(void)
-{
-  return appId;
-}
-
-bool PerformInteraction::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool PerformInteraction::checkIntegrity(void)
-{
-  return PerformInteractionMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionMarshaller.cpp
deleted file mode 100644
index 52b49e374..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionMarshaller.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformInteraction.h"
-#include "../src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/PerformInteractionMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool PerformInteractionMarshaller::checkIntegrity(PerformInteraction& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PerformInteractionMarshaller::fromString(const std::string& s,PerformInteraction& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PerformInteractionMarshaller::toString(const PerformInteraction& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformInteractionMarshaller::checkIntegrityConst(const PerformInteraction& s)
-{
-  if(s.initialText.length()>500)  return false;
-
-  {
-    unsigned int i=s.initialPrompt.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  if(!NsSmartDeviceLinkRPCV2::InteractionModeMarshaller::checkIntegrityConst(s.interactionMode))  return false;
-
-  {
-    unsigned int i=s.interactionChoiceSetIDList.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-    while(i--)
-    {
-      if(s.interactionChoiceSetIDList[i]>2000000000)  return false;
-    }
-  }
-
-  if(s.helpPrompt)
-  {
-    unsigned int i=s.helpPrompt[0].size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  if(s.timeoutPrompt)
-  {
-    unsigned int i=s.timeoutPrompt[0].size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  if(s.timeout && (s.timeout[0]<5000 || s.timeout[0]>100000))  return false;
-
-  if(s.vrHelp)
-  {
-    unsigned int i=s.vrHelp[0].size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value PerformInteractionMarshaller::toJSON(const PerformInteraction& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.PerformInteraction");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["initialText"]=Json::Value(e.initialText);;
-  {
-    unsigned int i=e.initialPrompt.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::toJSON(e.initialPrompt[i]);
-
-    json["params"]["initialPrompt"]=j;
-  }
-  json["params"]["interactionMode"]=NsSmartDeviceLinkRPCV2::InteractionModeMarshaller::toJSON(e.interactionMode);;
-  {
-    unsigned int i=e.interactionChoiceSetIDList.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=Json::Value(e.interactionChoiceSetIDList[i]);
-
-    json["params"]["interactionChoiceSetIDList"]=j;
-  }
-  if(e.helpPrompt)
-  {
-    unsigned int i=e.helpPrompt[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::toJSON(e.helpPrompt[0][i]);
-
-    json["params"]["helpPrompt"]=j;
-  }
-  if(e.timeoutPrompt)
-  {
-    unsigned int i=e.timeoutPrompt[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::toJSON(e.timeoutPrompt[0][i]);
-
-    json["params"]["timeoutPrompt"]=j;
-  }
-  if(e.timeout)
-    json["params"]["timeout"]=Json::Value(e.timeout[0]);;
-  if(e.vrHelp)
-  {
-    unsigned int i=e.vrHelp[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::VrHelpItemMarshaller::toJSON(e.vrHelp[0][i]);
-
-    json["params"]["vrHelp"]=j;
-  }
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool PerformInteractionMarshaller::fromJSON(const Json::Value& json,PerformInteraction& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.PerformInteraction"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("initialText") || !js["initialText"].isString())  return false;
-    c.initialText=js["initialText"].asString();
-    if(c.initialText.length()>500)  return false;
-
-    if(!js.isMember("initialPrompt") || !js["initialPrompt"].isArray())  return false;
-    {
-      unsigned int i=js["initialPrompt"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.initialPrompt.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::TTSChunk t;
-        if(!NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::fromJSON(js["initialPrompt"][i],t))
-          return false;
-         c.initialPrompt[i]=t;
-      }
-    }
-
-    if(!js.isMember("interactionMode") || !NsSmartDeviceLinkRPCV2::InteractionModeMarshaller::fromJSON(js["interactionMode"],c.interactionMode))  return false;
-
-    if(!js.isMember("interactionChoiceSetIDList") || !js["interactionChoiceSetIDList"].isArray())
-      return false;
-    {
-      c.interactionChoiceSetIDList.clear();
-      unsigned int i=js["interactionChoiceSetIDList"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.interactionChoiceSetIDList.resize(i);
-      while(i--)
-      {
-        if(!js["interactionChoiceSetIDList"][i].isInt())
-          return false;
-        c.interactionChoiceSetIDList[i]=js["interactionChoiceSetIDList"][i].asInt();
-        if(c.interactionChoiceSetIDList[i]>2000000000)  return false;
-
-      }
-    }
-
-
-    if(c.helpPrompt)  delete c.helpPrompt;
-    c.helpPrompt=0;
-    if(js.isMember("helpPrompt"))
-    {
-      if(!js["helpPrompt"].isArray()) return false;
-      unsigned int i=js["helpPrompt"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-
-      c.helpPrompt=new std::vector<NsSmartDeviceLinkRPCV2::TTSChunk>();
-      c.helpPrompt->resize(js["helpPrompt"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::fromJSON(js["helpPrompt"][i],c.helpPrompt[0][i]))  return false;
-    }
-
-
-    if(c.timeoutPrompt)  delete c.timeoutPrompt;
-    c.timeoutPrompt=0;
-    if(js.isMember("timeoutPrompt"))
-    {
-      if(!js["timeoutPrompt"].isArray()) return false;
-      unsigned int i=js["timeoutPrompt"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-
-      c.timeoutPrompt=new std::vector<NsSmartDeviceLinkRPCV2::TTSChunk>();
-      c.timeoutPrompt->resize(js["timeoutPrompt"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::fromJSON(js["timeoutPrompt"][i],c.timeoutPrompt[0][i]))  return false;
-    }
-
-
-    if(c.timeout)  delete c.timeout;
-    c.timeout=0;
-    if(js.isMember("timeout"))
-    {
-      if(!js["timeout"].isInt())  return false;
-      c.timeout=new unsigned int();
-      c.timeout[0]=js["timeout"].asInt();
-      if(c.timeout[0]<5000 || c.timeout[0]>100000)  return false;
-
-    }
-
-    if(c.vrHelp)  delete c.vrHelp;
-    c.vrHelp=0;
-    if(js.isMember("vrHelp"))
-    {
-      if(!js["vrHelp"].isArray()) return false;
-      unsigned int i=js["vrHelp"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-
-      c.vrHelp=new std::vector<NsSmartDeviceLinkRPCV2::VrHelpItem>();
-      c.vrHelp->resize(js["vrHelp"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::VrHelpItemMarshaller::fromJSON(js["vrHelp"][i],c.vrHelp[0][i]))  return false;
-    }
-
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionMarshaller.h
deleted file mode 100644
index 32abde5e3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_PERFORMINTERACTIONMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_PERFORMINTERACTIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformInteraction.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct PerformInteractionMarshaller
-    {
-      static bool checkIntegrity(PerformInteraction& e);
-      static bool checkIntegrityConst(const PerformInteraction& e);
-    
-      static bool fromString(const std::string& s,PerformInteraction& e);
-      static const std::string toString(const PerformInteraction& e);
-    
-      static bool fromJSON(const Json::Value& s,PerformInteraction& e);
-      static Json::Value toJSON(const PerformInteraction& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionResponse.cpp
deleted file mode 100644
index b357352ba..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionResponse.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformInteractionResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-PerformInteractionResponse& PerformInteractionResponse::operator =(const PerformInteractionResponse& c)
-{
-  if(choiceID)  delete choiceID;
-  choiceID= c.choiceID ? new unsigned int(c.choiceID[0]) : 0;
-  if(triggerSource)  delete triggerSource;
-  triggerSource= c.triggerSource ? new NsSmartDeviceLinkRPCV2::TriggerSource(c.triggerSource[0]) : 0;
-  return *this;
-}
-
-
-PerformInteractionResponse::~PerformInteractionResponse(void)
-{
-  if(choiceID)  delete choiceID;
-  if(triggerSource)  delete triggerSource;
-}
-
-
-PerformInteractionResponse::PerformInteractionResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__PERFORMINTERACTIONRESPONSE),
-  choiceID(0),
-  triggerSource(0)
-{
-}
-
-
-PerformInteractionResponse::PerformInteractionResponse(const PerformInteractionResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__PERFORMINTERACTIONRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const unsigned int* PerformInteractionResponse::get_choiceID(void)
-{
-  return choiceID;
-}
-
-bool PerformInteractionResponse::set_choiceID(const unsigned int& choiceID_)
-{
-  if(choiceID)  delete choiceID;
-  choiceID=new unsigned int(choiceID_);
-  return true;
-}
-
-void PerformInteractionResponse::reset_choiceID(void)
-{
-  if(choiceID)  delete choiceID;
-  choiceID=0;
-}
-
-const NsSmartDeviceLinkRPCV2::TriggerSource* PerformInteractionResponse::get_triggerSource(void)
-{
-  return triggerSource;
-}
-
-bool PerformInteractionResponse::set_triggerSource(const NsSmartDeviceLinkRPCV2::TriggerSource& triggerSource_)
-{
-  if(triggerSource)  delete triggerSource;
-  triggerSource=new NsSmartDeviceLinkRPCV2::TriggerSource(triggerSource_);
-  return true;
-}
-
-void PerformInteractionResponse::reset_triggerSource(void)
-{
-  if(triggerSource)  delete triggerSource;
-  triggerSource=0;
-}
-
-bool PerformInteractionResponse::checkIntegrity(void)
-{
-  return PerformInteractionResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionResponseMarshaller.cpp
deleted file mode 100644
index 884377fe3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionResponseMarshaller.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformInteractionResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/PerformInteractionResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool PerformInteractionResponseMarshaller::checkIntegrity(PerformInteractionResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PerformInteractionResponseMarshaller::fromString(const std::string& s,PerformInteractionResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PerformInteractionResponseMarshaller::toString(const PerformInteractionResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformInteractionResponseMarshaller::checkIntegrityConst(const PerformInteractionResponse& s)
-{
-  if(s.choiceID && (s.choiceID[0]>2000000000))  return false;
-
-  if(s.triggerSource && (!NsSmartDeviceLinkRPCV2::TriggerSourceMarshaller::checkIntegrityConst(s.triggerSource[0])))  return false;
-
-  return true;
-}
-
-
-Json::Value PerformInteractionResponseMarshaller::toJSON(const PerformInteractionResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.PerformInteractionResponse");
-
-  if(e.choiceID)
-    json["result"]["choiceID"]=Json::Value(e.choiceID[0]);;
-  if(e.triggerSource)
-    json["result"]["triggerSource"]=NsSmartDeviceLinkRPCV2::TriggerSourceMarshaller::toJSON(e.triggerSource[0]);;
-  return json;
-}
-
-
-bool PerformInteractionResponseMarshaller::fromJSON(const Json::Value& json,PerformInteractionResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.PerformInteractionResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(c.choiceID)  delete c.choiceID;
-    c.choiceID=0;
-    if(js.isMember("choiceID"))
-    {
-      if(!js["choiceID"].isInt())  return false;
-      c.choiceID=new unsigned int();
-      c.choiceID[0]=js["choiceID"].asInt();
-      if(c.choiceID[0]>2000000000)  return false;
-
-    }
-
-    if(c.triggerSource)  delete c.triggerSource;
-    c.triggerSource=0;
-    if(js.isMember("triggerSource"))
-    {
-      c.triggerSource=new NsSmartDeviceLinkRPCV2::TriggerSource();
-      if(!NsSmartDeviceLinkRPCV2::TriggerSourceMarshaller::fromJSON(js["triggerSource"],c.triggerSource[0]))  return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionResponseMarshaller.h
deleted file mode 100644
index 19ff0387b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/PerformInteractionResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_PERFORMINTERACTIONRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_PERFORMINTERACTIONRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/PerformInteractionResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct PerformInteractionResponseMarshaller
-    {
-      static bool checkIntegrity(PerformInteractionResponse& e);
-      static bool checkIntegrityConst(const PerformInteractionResponse& e);
-    
-      static bool fromString(const std::string& s,PerformInteractionResponse& e);
-      static const std::string toString(const PerformInteractionResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,PerformInteractionResponse& e);
-      static Json::Value toJSON(const PerformInteractionResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalProperties.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalProperties.cpp
deleted file mode 100644
index 01ee3bf89..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalProperties.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ResetGlobalProperties.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-ResetGlobalProperties& ResetGlobalProperties::operator =(const ResetGlobalProperties& c)
-{
-  properties=c.properties;
-  appId=c.appId;
-  return *this;
-}
-
-
-ResetGlobalProperties::~ResetGlobalProperties(void)
-{
-}
-
-
-ResetGlobalProperties::ResetGlobalProperties(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__RESETGLOBALPROPERTIES)
-{
-}
-
-
-ResetGlobalProperties::ResetGlobalProperties(const ResetGlobalProperties& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__RESETGLOBALPROPERTIES,c.getId())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::GlobalProperty>& ResetGlobalProperties::get_properties(void)
-{
-  return properties;
-}
-
-bool ResetGlobalProperties::set_properties(const std::vector< NsSmartDeviceLinkRPCV2::GlobalProperty>& properties_)
-{
-  properties=properties_;
-  return true;
-}
-
-int ResetGlobalProperties::get_appId(void)
-{
-  return appId;
-}
-
-bool ResetGlobalProperties::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool ResetGlobalProperties::checkIntegrity(void)
-{
-  return ResetGlobalPropertiesMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesMarshaller.cpp
deleted file mode 100644
index c66462c58..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesMarshaller.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ResetGlobalProperties.h"
-#include "../src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ResetGlobalPropertiesMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool ResetGlobalPropertiesMarshaller::checkIntegrity(ResetGlobalProperties& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ResetGlobalPropertiesMarshaller::fromString(const std::string& s,ResetGlobalProperties& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ResetGlobalPropertiesMarshaller::toString(const ResetGlobalProperties& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ResetGlobalPropertiesMarshaller::checkIntegrityConst(const ResetGlobalProperties& s)
-{
-  {
-    unsigned int i=s.properties.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value ResetGlobalPropertiesMarshaller::toJSON(const ResetGlobalProperties& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.ResetGlobalProperties");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  {
-    unsigned int i=e.properties.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::GlobalPropertyMarshaller::toJSON(e.properties[i]);
-
-    json["params"]["properties"]=j;
-  }
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool ResetGlobalPropertiesMarshaller::fromJSON(const Json::Value& json,ResetGlobalProperties& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.ResetGlobalProperties"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("properties") || !js["properties"].isArray())  return false;
-    {
-      unsigned int i=js["properties"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.properties.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::GlobalProperty t;
-        if(!NsSmartDeviceLinkRPCV2::GlobalPropertyMarshaller::fromJSON(js["properties"][i],t))
-          return false;
-         c.properties[i]=t;
-      }
-    }
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesMarshaller.h
deleted file mode 100644
index 4f0f41aee..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_RESETGLOBALPROPERTIESMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_RESETGLOBALPROPERTIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ResetGlobalProperties.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct ResetGlobalPropertiesMarshaller
-    {
-      static bool checkIntegrity(ResetGlobalProperties& e);
-      static bool checkIntegrityConst(const ResetGlobalProperties& e);
-    
-      static bool fromString(const std::string& s,ResetGlobalProperties& e);
-      static const std::string toString(const ResetGlobalProperties& e);
-    
-      static bool fromJSON(const Json::Value& s,ResetGlobalProperties& e);
-      static Json::Value toJSON(const ResetGlobalProperties& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesResponse.cpp
deleted file mode 100644
index 4321d5c84..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ResetGlobalPropertiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-ResetGlobalPropertiesResponse& ResetGlobalPropertiesResponse::operator =(const ResetGlobalPropertiesResponse& c)
-{
-  return *this;
-}
-
-
-ResetGlobalPropertiesResponse::~ResetGlobalPropertiesResponse(void)
-{
-}
-
-
-ResetGlobalPropertiesResponse::ResetGlobalPropertiesResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__RESETGLOBALPROPERTIESRESPONSE)
-{
-}
-
-
-ResetGlobalPropertiesResponse::ResetGlobalPropertiesResponse(const ResetGlobalPropertiesResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__RESETGLOBALPROPERTIESRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool ResetGlobalPropertiesResponse::checkIntegrity(void)
-{
-  return ResetGlobalPropertiesResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesResponseMarshaller.cpp
deleted file mode 100644
index a15c932d1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ResetGlobalPropertiesResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ResetGlobalPropertiesResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool ResetGlobalPropertiesResponseMarshaller::checkIntegrity(ResetGlobalPropertiesResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ResetGlobalPropertiesResponseMarshaller::fromString(const std::string& s,ResetGlobalPropertiesResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ResetGlobalPropertiesResponseMarshaller::toString(const ResetGlobalPropertiesResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ResetGlobalPropertiesResponseMarshaller::checkIntegrityConst(const ResetGlobalPropertiesResponse& s)
-{
-  return true;
-}
-
-
-Json::Value ResetGlobalPropertiesResponseMarshaller::toJSON(const ResetGlobalPropertiesResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.ResetGlobalPropertiesResponse");
-
-  return json;
-}
-
-
-bool ResetGlobalPropertiesResponseMarshaller::fromJSON(const Json::Value& json,ResetGlobalPropertiesResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.ResetGlobalPropertiesResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesResponseMarshaller.h
deleted file mode 100644
index ade01a3ab..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ResetGlobalPropertiesResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_RESETGLOBALPROPERTIESRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_RESETGLOBALPROPERTIESRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ResetGlobalPropertiesResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct ResetGlobalPropertiesResponseMarshaller
-    {
-      static bool checkIntegrity(ResetGlobalPropertiesResponse& e);
-      static bool checkIntegrityConst(const ResetGlobalPropertiesResponse& e);
-    
-      static bool fromString(const std::string& s,ResetGlobalPropertiesResponse& e);
-      static const std::string toString(const ResetGlobalPropertiesResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,ResetGlobalPropertiesResponse& e);
-      static Json::Value toJSON(const ResetGlobalPropertiesResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessage.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessage.cpp
deleted file mode 100644
index 47bffe006..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessage.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ScrollableMessage.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-ScrollableMessage& ScrollableMessage::operator =(const ScrollableMessage& c)
-{
-  scrollableMessageBody=c.scrollableMessageBody;
-  if(timeout)  delete timeout;
-  timeout= c.timeout ? new unsigned int(c.timeout[0]) : 0;
-  if(softButtons)  delete softButtons;
-  softButtons= c.softButtons ? new std::vector<NsSmartDeviceLinkRPCV2::SoftButton>(c.softButtons[0]) : 0;
-  appId=c.appId;
-  return *this;
-}
-
-
-ScrollableMessage::~ScrollableMessage(void)
-{
-  if(timeout)  delete timeout;
-  if(softButtons)  delete softButtons;
-}
-
-
-ScrollableMessage::ScrollableMessage(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SCROLLABLEMESSAGE),
-  timeout(0),
-  softButtons(0)
-{
-}
-
-
-ScrollableMessage::ScrollableMessage(const ScrollableMessage& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SCROLLABLEMESSAGE,c.getId())
-{
-  *this=c;
-}
-
-
-const std::string& ScrollableMessage::get_scrollableMessageBody(void)
-{
-  return scrollableMessageBody;
-}
-
-bool ScrollableMessage::set_scrollableMessageBody(const std::string& scrollableMessageBody_)
-{
-  scrollableMessageBody=scrollableMessageBody_;
-  return true;
-}
-
-const unsigned int* ScrollableMessage::get_timeout(void)
-{
-  return timeout;
-}
-
-bool ScrollableMessage::set_timeout(const unsigned int& timeout_)
-{
-  if(timeout)  delete timeout;
-  timeout=new unsigned int(timeout_);
-  return true;
-}
-
-void ScrollableMessage::reset_timeout(void)
-{
-  if(timeout)  delete timeout;
-  timeout=0;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>* ScrollableMessage::get_softButtons(void)
-{
-  return softButtons;
-}
-
-bool ScrollableMessage::set_softButtons(const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& softButtons_)
-{
-  if(softButtons)  delete softButtons;
-  softButtons=new std::vector< NsSmartDeviceLinkRPCV2::SoftButton>(softButtons_);
-  return true;
-}
-
-void ScrollableMessage::reset_softButtons(void)
-{
-  if(softButtons)  delete softButtons;
-  softButtons=0;
-}
-
-int ScrollableMessage::get_appId(void)
-{
-  return appId;
-}
-
-bool ScrollableMessage::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool ScrollableMessage::checkIntegrity(void)
-{
-  return ScrollableMessageMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageMarshaller.cpp
deleted file mode 100644
index b37f75f2f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageMarshaller.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ScrollableMessage.h"
-#include "../src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ScrollableMessageMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool ScrollableMessageMarshaller::checkIntegrity(ScrollableMessage& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ScrollableMessageMarshaller::fromString(const std::string& s,ScrollableMessage& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ScrollableMessageMarshaller::toString(const ScrollableMessage& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ScrollableMessageMarshaller::checkIntegrityConst(const ScrollableMessage& s)
-{
-  if(s.scrollableMessageBody.length()>500)  return false;
-
-  if(s.timeout && (s.timeout[0]>65535))  return false;
-
-  if(s.softButtons)
-  {
-    unsigned int i=s.softButtons[0].size();
-    if(i<0)  return false;
-    if(i>8)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value ScrollableMessageMarshaller::toJSON(const ScrollableMessage& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.ScrollableMessage");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["scrollableMessageBody"]=Json::Value(e.scrollableMessageBody);;
-  if(e.timeout)
-    json["params"]["timeout"]=Json::Value(e.timeout[0]);;
-  if(e.softButtons)
-  {
-    unsigned int i=e.softButtons[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::SoftButtonMarshaller::toJSON(e.softButtons[0][i]);
-
-    json["params"]["softButtons"]=j;
-  }
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool ScrollableMessageMarshaller::fromJSON(const Json::Value& json,ScrollableMessage& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.ScrollableMessage"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("scrollableMessageBody") || !js["scrollableMessageBody"].isString())  return false;
-    c.scrollableMessageBody=js["scrollableMessageBody"].asString();
-    if(c.scrollableMessageBody.length()>500)  return false;
-
-    if(c.timeout)  delete c.timeout;
-    c.timeout=0;
-    if(js.isMember("timeout"))
-    {
-      if(!js["timeout"].isInt())  return false;
-      c.timeout=new unsigned int();
-      c.timeout[0]=js["timeout"].asInt();
-      if(c.timeout[0]>65535)  return false;
-
-    }
-
-    if(c.softButtons)  delete c.softButtons;
-    c.softButtons=0;
-    if(js.isMember("softButtons"))
-    {
-      if(!js["softButtons"].isArray()) return false;
-      unsigned int i=js["softButtons"].size();
-      if(i<0)  return false;
-      if(i>8)  return false;
-
-      c.softButtons=new std::vector<NsSmartDeviceLinkRPCV2::SoftButton>();
-      c.softButtons->resize(js["softButtons"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::SoftButtonMarshaller::fromJSON(js["softButtons"][i],c.softButtons[0][i]))  return false;
-    }
-
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageMarshaller.h
deleted file mode 100644
index 9c5893b6a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SCROLLABLEMESSAGEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SCROLLABLEMESSAGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ScrollableMessage.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct ScrollableMessageMarshaller
-    {
-      static bool checkIntegrity(ScrollableMessage& e);
-      static bool checkIntegrityConst(const ScrollableMessage& e);
-    
-      static bool fromString(const std::string& s,ScrollableMessage& e);
-      static const std::string toString(const ScrollableMessage& e);
-    
-      static bool fromJSON(const Json::Value& s,ScrollableMessage& e);
-      static Json::Value toJSON(const ScrollableMessage& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageResponse.cpp
deleted file mode 100644
index f624f26c4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ScrollableMessageResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-ScrollableMessageResponse& ScrollableMessageResponse::operator =(const ScrollableMessageResponse& c)
-{
-  return *this;
-}
-
-
-ScrollableMessageResponse::~ScrollableMessageResponse(void)
-{
-}
-
-
-ScrollableMessageResponse::ScrollableMessageResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SCROLLABLEMESSAGERESPONSE)
-{
-}
-
-
-ScrollableMessageResponse::ScrollableMessageResponse(const ScrollableMessageResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SCROLLABLEMESSAGERESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool ScrollableMessageResponse::checkIntegrity(void)
-{
-  return ScrollableMessageResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageResponseMarshaller.cpp
deleted file mode 100644
index 805c766c5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ScrollableMessageResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ScrollableMessageResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool ScrollableMessageResponseMarshaller::checkIntegrity(ScrollableMessageResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ScrollableMessageResponseMarshaller::fromString(const std::string& s,ScrollableMessageResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ScrollableMessageResponseMarshaller::toString(const ScrollableMessageResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ScrollableMessageResponseMarshaller::checkIntegrityConst(const ScrollableMessageResponse& s)
-{
-  return true;
-}
-
-
-Json::Value ScrollableMessageResponseMarshaller::toJSON(const ScrollableMessageResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.ScrollableMessageResponse");
-
-  return json;
-}
-
-
-bool ScrollableMessageResponseMarshaller::fromJSON(const Json::Value& json,ScrollableMessageResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.ScrollableMessageResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageResponseMarshaller.h
deleted file mode 100644
index 8b24f7e9a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ScrollableMessageResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SCROLLABLEMESSAGERESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SCROLLABLEMESSAGERESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ScrollableMessageResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct ScrollableMessageResponseMarshaller
-    {
-      static bool checkIntegrity(ScrollableMessageResponse& e);
-      static bool checkIntegrityConst(const ScrollableMessageResponse& e);
-    
-      static bool fromString(const std::string& s,ScrollableMessageResponse& e);
-      static const std::string toString(const ScrollableMessageResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,ScrollableMessageResponse& e);
-      static Json::Value toJSON(const ScrollableMessageResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIcon.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIcon.cpp
deleted file mode 100644
index 980d22391..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIcon.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetAppIcon.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-SetAppIcon& SetAppIcon::operator =(const SetAppIcon& c)
-{
-  syncFileName=c.syncFileName;
-  appId=c.appId;
-  return *this;
-}
-
-
-SetAppIcon::~SetAppIcon(void)
-{
-}
-
-
-SetAppIcon::SetAppIcon(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETAPPICON)
-{
-}
-
-
-SetAppIcon::SetAppIcon(const SetAppIcon& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETAPPICON,c.getId())
-{
-  *this=c;
-}
-
-
-const std::string& SetAppIcon::get_syncFileName(void)
-{
-  return syncFileName;
-}
-
-bool SetAppIcon::set_syncFileName(const std::string& syncFileName_)
-{
-  syncFileName=syncFileName_;
-  return true;
-}
-
-int SetAppIcon::get_appId(void)
-{
-  return appId;
-}
-
-bool SetAppIcon::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool SetAppIcon::checkIntegrity(void)
-{
-  return SetAppIconMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconMarshaller.cpp
deleted file mode 100644
index 42d468572..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetAppIcon.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetAppIconMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool SetAppIconMarshaller::checkIntegrity(SetAppIcon& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetAppIconMarshaller::fromString(const std::string& s,SetAppIcon& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetAppIconMarshaller::toString(const SetAppIcon& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetAppIconMarshaller::checkIntegrityConst(const SetAppIcon& s)
-{
-  if(s.syncFileName.length()>500)  return false;
-
-  return true;
-}
-
-
-Json::Value SetAppIconMarshaller::toJSON(const SetAppIcon& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.SetAppIcon");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["syncFileName"]=Json::Value(e.syncFileName);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool SetAppIconMarshaller::fromJSON(const Json::Value& json,SetAppIcon& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.SetAppIcon"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("syncFileName") || !js["syncFileName"].isString())  return false;
-    c.syncFileName=js["syncFileName"].asString();
-    if(c.syncFileName.length()>500)  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconMarshaller.h
deleted file mode 100644
index 65f722b11..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETAPPICONMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETAPPICONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetAppIcon.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct SetAppIconMarshaller
-    {
-      static bool checkIntegrity(SetAppIcon& e);
-      static bool checkIntegrityConst(const SetAppIcon& e);
-    
-      static bool fromString(const std::string& s,SetAppIcon& e);
-      static const std::string toString(const SetAppIcon& e);
-    
-      static bool fromJSON(const Json::Value& s,SetAppIcon& e);
-      static Json::Value toJSON(const SetAppIcon& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconResponse.cpp
deleted file mode 100644
index b0c0297c3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetAppIconResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-SetAppIconResponse& SetAppIconResponse::operator =(const SetAppIconResponse& c)
-{
-  return *this;
-}
-
-
-SetAppIconResponse::~SetAppIconResponse(void)
-{
-}
-
-
-SetAppIconResponse::SetAppIconResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETAPPICONRESPONSE)
-{
-}
-
-
-SetAppIconResponse::SetAppIconResponse(const SetAppIconResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETAPPICONRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool SetAppIconResponse::checkIntegrity(void)
-{
-  return SetAppIconResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconResponseMarshaller.cpp
deleted file mode 100644
index fdb121213..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetAppIconResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetAppIconResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool SetAppIconResponseMarshaller::checkIntegrity(SetAppIconResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetAppIconResponseMarshaller::fromString(const std::string& s,SetAppIconResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetAppIconResponseMarshaller::toString(const SetAppIconResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetAppIconResponseMarshaller::checkIntegrityConst(const SetAppIconResponse& s)
-{
-  return true;
-}
-
-
-Json::Value SetAppIconResponseMarshaller::toJSON(const SetAppIconResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.SetAppIconResponse");
-
-  return json;
-}
-
-
-bool SetAppIconResponseMarshaller::fromJSON(const Json::Value& json,SetAppIconResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.SetAppIconResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconResponseMarshaller.h
deleted file mode 100644
index e749198f4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetAppIconResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETAPPICONRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETAPPICONRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetAppIconResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct SetAppIconResponseMarshaller
-    {
-      static bool checkIntegrity(SetAppIconResponse& e);
-      static bool checkIntegrityConst(const SetAppIconResponse& e);
-    
-      static bool fromString(const std::string& s,SetAppIconResponse& e);
-      static const std::string toString(const SetAppIconResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,SetAppIconResponse& e);
-      static Json::Value toJSON(const SetAppIconResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayout.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayout.cpp
deleted file mode 100644
index 898414601..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayout.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetDisplayLayout.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-SetDisplayLayout& SetDisplayLayout::operator =(const SetDisplayLayout& c)
-{
-  displayLayout=c.displayLayout;
-  appId=c.appId;
-  return *this;
-}
-
-
-SetDisplayLayout::~SetDisplayLayout(void)
-{
-}
-
-
-SetDisplayLayout::SetDisplayLayout(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETDISPLAYLAYOUT)
-{
-}
-
-
-SetDisplayLayout::SetDisplayLayout(const SetDisplayLayout& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETDISPLAYLAYOUT,c.getId())
-{
-  *this=c;
-}
-
-
-const std::string& SetDisplayLayout::get_displayLayout(void)
-{
-  return displayLayout;
-}
-
-bool SetDisplayLayout::set_displayLayout(const std::string& displayLayout_)
-{
-  displayLayout=displayLayout_;
-  return true;
-}
-
-int SetDisplayLayout::get_appId(void)
-{
-  return appId;
-}
-
-bool SetDisplayLayout::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool SetDisplayLayout::checkIntegrity(void)
-{
-  return SetDisplayLayoutMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutMarshaller.cpp
deleted file mode 100644
index 7a23e0e03..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutMarshaller.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetDisplayLayout.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetDisplayLayoutMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool SetDisplayLayoutMarshaller::checkIntegrity(SetDisplayLayout& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetDisplayLayoutMarshaller::fromString(const std::string& s,SetDisplayLayout& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetDisplayLayoutMarshaller::toString(const SetDisplayLayout& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetDisplayLayoutMarshaller::checkIntegrityConst(const SetDisplayLayout& s)
-{
-  return true;
-}
-
-
-Json::Value SetDisplayLayoutMarshaller::toJSON(const SetDisplayLayout& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.SetDisplayLayout");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["displayLayout"]=Json::Value(e.displayLayout);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool SetDisplayLayoutMarshaller::fromJSON(const Json::Value& json,SetDisplayLayout& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.SetDisplayLayout"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("displayLayout") || !js["displayLayout"].isString())  return false;
-    c.displayLayout=js["displayLayout"].asString();
-    
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutMarshaller.h
deleted file mode 100644
index 40d879096..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETDISPLAYLAYOUTMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETDISPLAYLAYOUTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetDisplayLayout.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct SetDisplayLayoutMarshaller
-    {
-      static bool checkIntegrity(SetDisplayLayout& e);
-      static bool checkIntegrityConst(const SetDisplayLayout& e);
-    
-      static bool fromString(const std::string& s,SetDisplayLayout& e);
-      static const std::string toString(const SetDisplayLayout& e);
-    
-      static bool fromJSON(const Json::Value& s,SetDisplayLayout& e);
-      static Json::Value toJSON(const SetDisplayLayout& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutResponse.cpp
deleted file mode 100644
index 79b35a1d2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetDisplayLayoutResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-SetDisplayLayoutResponse& SetDisplayLayoutResponse::operator =(const SetDisplayLayoutResponse& c)
-{
-  return *this;
-}
-
-
-SetDisplayLayoutResponse::~SetDisplayLayoutResponse(void)
-{
-}
-
-
-SetDisplayLayoutResponse::SetDisplayLayoutResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETDISPLAYLAYOUTRESPONSE)
-{
-}
-
-
-SetDisplayLayoutResponse::SetDisplayLayoutResponse(const SetDisplayLayoutResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETDISPLAYLAYOUTRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool SetDisplayLayoutResponse::checkIntegrity(void)
-{
-  return SetDisplayLayoutResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutResponseMarshaller.cpp
deleted file mode 100644
index dd52e08f7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetDisplayLayoutResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetDisplayLayoutResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool SetDisplayLayoutResponseMarshaller::checkIntegrity(SetDisplayLayoutResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetDisplayLayoutResponseMarshaller::fromString(const std::string& s,SetDisplayLayoutResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetDisplayLayoutResponseMarshaller::toString(const SetDisplayLayoutResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetDisplayLayoutResponseMarshaller::checkIntegrityConst(const SetDisplayLayoutResponse& s)
-{
-  return true;
-}
-
-
-Json::Value SetDisplayLayoutResponseMarshaller::toJSON(const SetDisplayLayoutResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.SetDisplayLayoutResponse");
-
-  return json;
-}
-
-
-bool SetDisplayLayoutResponseMarshaller::fromJSON(const Json::Value& json,SetDisplayLayoutResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.SetDisplayLayoutResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutResponseMarshaller.h
deleted file mode 100644
index 9e8e25a92..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetDisplayLayoutResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETDISPLAYLAYOUTRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETDISPLAYLAYOUTRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetDisplayLayoutResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct SetDisplayLayoutResponseMarshaller
-    {
-      static bool checkIntegrity(SetDisplayLayoutResponse& e);
-      static bool checkIntegrityConst(const SetDisplayLayoutResponse& e);
-    
-      static bool fromString(const std::string& s,SetDisplayLayoutResponse& e);
-      static const std::string toString(const SetDisplayLayoutResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,SetDisplayLayoutResponse& e);
-      static Json::Value toJSON(const SetDisplayLayoutResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalProperties.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalProperties.cpp
deleted file mode 100644
index ed014c13e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalProperties.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetGlobalProperties.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-SetGlobalProperties& SetGlobalProperties::operator =(const SetGlobalProperties& c)
-{
-  if(helpPrompt)  delete helpPrompt;
-  helpPrompt= c.helpPrompt ? new std::vector<NsSmartDeviceLinkRPCV2::TTSChunk>(c.helpPrompt[0]) : 0;
-  if(timeoutPrompt)  delete timeoutPrompt;
-  timeoutPrompt= c.timeoutPrompt ? new std::vector<NsSmartDeviceLinkRPCV2::TTSChunk>(c.timeoutPrompt[0]) : 0;
-  if(vrHelpTitle)  delete vrHelpTitle;
-  vrHelpTitle= c.vrHelpTitle ? new std::string(c.vrHelpTitle[0]) : 0;
-  if(vrHelp)  delete vrHelp;
-  vrHelp= c.vrHelp ? new std::vector<NsSmartDeviceLinkRPCV2::VrHelpItem>(c.vrHelp[0]) : 0;
-  appId=c.appId;
-  return *this;
-}
-
-
-SetGlobalProperties::~SetGlobalProperties(void)
-{
-  if(helpPrompt)  delete helpPrompt;
-  if(timeoutPrompt)  delete timeoutPrompt;
-  if(vrHelpTitle)  delete vrHelpTitle;
-  if(vrHelp)  delete vrHelp;
-}
-
-
-SetGlobalProperties::SetGlobalProperties(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETGLOBALPROPERTIES),
-  helpPrompt(0),
-  timeoutPrompt(0),
-  vrHelpTitle(0),
-  vrHelp(0)
-{
-}
-
-
-SetGlobalProperties::SetGlobalProperties(const SetGlobalProperties& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETGLOBALPROPERTIES,c.getId())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* SetGlobalProperties::get_helpPrompt(void)
-{
-  return helpPrompt;
-}
-
-bool SetGlobalProperties::set_helpPrompt(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& helpPrompt_)
-{
-  if(helpPrompt)  delete helpPrompt;
-  helpPrompt=new std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>(helpPrompt_);
-  return true;
-}
-
-void SetGlobalProperties::reset_helpPrompt(void)
-{
-  if(helpPrompt)  delete helpPrompt;
-  helpPrompt=0;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>* SetGlobalProperties::get_timeoutPrompt(void)
-{
-  return timeoutPrompt;
-}
-
-bool SetGlobalProperties::set_timeoutPrompt(const std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>& timeoutPrompt_)
-{
-  if(timeoutPrompt)  delete timeoutPrompt;
-  timeoutPrompt=new std::vector< NsSmartDeviceLinkRPCV2::TTSChunk>(timeoutPrompt_);
-  return true;
-}
-
-void SetGlobalProperties::reset_timeoutPrompt(void)
-{
-  if(timeoutPrompt)  delete timeoutPrompt;
-  timeoutPrompt=0;
-}
-
-const std::string* SetGlobalProperties::get_vrHelpTitle(void)
-{
-  return vrHelpTitle;
-}
-
-bool SetGlobalProperties::set_vrHelpTitle(const std::string& vrHelpTitle_)
-{
-  if(vrHelpTitle)  delete vrHelpTitle;
-  vrHelpTitle=new std::string(vrHelpTitle_);
-  return true;
-}
-
-void SetGlobalProperties::reset_vrHelpTitle(void)
-{
-  if(vrHelpTitle)  delete vrHelpTitle;
-  vrHelpTitle=0;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::VrHelpItem>* SetGlobalProperties::get_vrHelp(void)
-{
-  return vrHelp;
-}
-
-bool SetGlobalProperties::set_vrHelp(const std::vector< NsSmartDeviceLinkRPCV2::VrHelpItem>& vrHelp_)
-{
-  if(vrHelp)  delete vrHelp;
-  vrHelp=new std::vector< NsSmartDeviceLinkRPCV2::VrHelpItem>(vrHelp_);
-  return true;
-}
-
-void SetGlobalProperties::reset_vrHelp(void)
-{
-  if(vrHelp)  delete vrHelp;
-  vrHelp=0;
-}
-
-int SetGlobalProperties::get_appId(void)
-{
-  return appId;
-}
-
-bool SetGlobalProperties::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool SetGlobalProperties::checkIntegrity(void)
-{
-  return SetGlobalPropertiesMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesMarshaller.cpp
deleted file mode 100644
index 49e0df40a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesMarshaller.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetGlobalProperties.h"
-#include "../src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetGlobalPropertiesMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool SetGlobalPropertiesMarshaller::checkIntegrity(SetGlobalProperties& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetGlobalPropertiesMarshaller::fromString(const std::string& s,SetGlobalProperties& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetGlobalPropertiesMarshaller::toString(const SetGlobalProperties& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetGlobalPropertiesMarshaller::checkIntegrityConst(const SetGlobalProperties& s)
-{
-  if(s.helpPrompt)
-  {
-    unsigned int i=s.helpPrompt[0].size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  if(s.timeoutPrompt)
-  {
-    unsigned int i=s.timeoutPrompt[0].size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  if(s.vrHelpTitle && (s.vrHelpTitle[0].length()>500))  return false;
-
-  if(s.vrHelp)
-  {
-    unsigned int i=s.vrHelp[0].size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value SetGlobalPropertiesMarshaller::toJSON(const SetGlobalProperties& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.SetGlobalProperties");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  if(e.helpPrompt)
-  {
-    unsigned int i=e.helpPrompt[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::toJSON(e.helpPrompt[0][i]);
-
-    json["params"]["helpPrompt"]=j;
-  }
-  if(e.timeoutPrompt)
-  {
-    unsigned int i=e.timeoutPrompt[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::toJSON(e.timeoutPrompt[0][i]);
-
-    json["params"]["timeoutPrompt"]=j;
-  }
-  if(e.vrHelpTitle)
-    json["params"]["vrHelpTitle"]=Json::Value(e.vrHelpTitle[0]);;
-  if(e.vrHelp)
-  {
-    unsigned int i=e.vrHelp[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::VrHelpItemMarshaller::toJSON(e.vrHelp[0][i]);
-
-    json["params"]["vrHelp"]=j;
-  }
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool SetGlobalPropertiesMarshaller::fromJSON(const Json::Value& json,SetGlobalProperties& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.SetGlobalProperties"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(c.helpPrompt)  delete c.helpPrompt;
-    c.helpPrompt=0;
-    if(js.isMember("helpPrompt"))
-    {
-      if(!js["helpPrompt"].isArray()) return false;
-      unsigned int i=js["helpPrompt"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-
-      c.helpPrompt=new std::vector<NsSmartDeviceLinkRPCV2::TTSChunk>();
-      c.helpPrompt->resize(js["helpPrompt"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::fromJSON(js["helpPrompt"][i],c.helpPrompt[0][i]))  return false;
-    }
-
-
-    if(c.timeoutPrompt)  delete c.timeoutPrompt;
-    c.timeoutPrompt=0;
-    if(js.isMember("timeoutPrompt"))
-    {
-      if(!js["timeoutPrompt"].isArray()) return false;
-      unsigned int i=js["timeoutPrompt"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-
-      c.timeoutPrompt=new std::vector<NsSmartDeviceLinkRPCV2::TTSChunk>();
-      c.timeoutPrompt->resize(js["timeoutPrompt"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::TTSChunkMarshaller::fromJSON(js["timeoutPrompt"][i],c.timeoutPrompt[0][i]))  return false;
-    }
-
-
-    if(c.vrHelpTitle)  delete c.vrHelpTitle;
-    c.vrHelpTitle=0;
-    if(js.isMember("vrHelpTitle"))
-    {
-      if(!js["vrHelpTitle"].isString())  return false;
-      c.vrHelpTitle=new std::string();
-      c.vrHelpTitle[0]=js["vrHelpTitle"].asString();
-      if(c.vrHelpTitle[0].length()>500)  return false;
-
-    }
-
-    if(c.vrHelp)  delete c.vrHelp;
-    c.vrHelp=0;
-    if(js.isMember("vrHelp"))
-    {
-      if(!js["vrHelp"].isArray()) return false;
-      unsigned int i=js["vrHelp"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-
-      c.vrHelp=new std::vector<NsSmartDeviceLinkRPCV2::VrHelpItem>();
-      c.vrHelp->resize(js["vrHelp"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::VrHelpItemMarshaller::fromJSON(js["vrHelp"][i],c.vrHelp[0][i]))  return false;
-    }
-
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesMarshaller.h
deleted file mode 100644
index f61f004ad..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETGLOBALPROPERTIESMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETGLOBALPROPERTIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetGlobalProperties.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct SetGlobalPropertiesMarshaller
-    {
-      static bool checkIntegrity(SetGlobalProperties& e);
-      static bool checkIntegrityConst(const SetGlobalProperties& e);
-    
-      static bool fromString(const std::string& s,SetGlobalProperties& e);
-      static const std::string toString(const SetGlobalProperties& e);
-    
-      static bool fromJSON(const Json::Value& s,SetGlobalProperties& e);
-      static Json::Value toJSON(const SetGlobalProperties& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesResponse.cpp
deleted file mode 100644
index 302d7b667..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetGlobalPropertiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-SetGlobalPropertiesResponse& SetGlobalPropertiesResponse::operator =(const SetGlobalPropertiesResponse& c)
-{
-  return *this;
-}
-
-
-SetGlobalPropertiesResponse::~SetGlobalPropertiesResponse(void)
-{
-}
-
-
-SetGlobalPropertiesResponse::SetGlobalPropertiesResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETGLOBALPROPERTIESRESPONSE)
-{
-}
-
-
-SetGlobalPropertiesResponse::SetGlobalPropertiesResponse(const SetGlobalPropertiesResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETGLOBALPROPERTIESRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool SetGlobalPropertiesResponse::checkIntegrity(void)
-{
-  return SetGlobalPropertiesResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesResponseMarshaller.cpp
deleted file mode 100644
index 653429e20..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetGlobalPropertiesResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetGlobalPropertiesResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool SetGlobalPropertiesResponseMarshaller::checkIntegrity(SetGlobalPropertiesResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetGlobalPropertiesResponseMarshaller::fromString(const std::string& s,SetGlobalPropertiesResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetGlobalPropertiesResponseMarshaller::toString(const SetGlobalPropertiesResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetGlobalPropertiesResponseMarshaller::checkIntegrityConst(const SetGlobalPropertiesResponse& s)
-{
-  return true;
-}
-
-
-Json::Value SetGlobalPropertiesResponseMarshaller::toJSON(const SetGlobalPropertiesResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.SetGlobalPropertiesResponse");
-
-  return json;
-}
-
-
-bool SetGlobalPropertiesResponseMarshaller::fromJSON(const Json::Value& json,SetGlobalPropertiesResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.SetGlobalPropertiesResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesResponseMarshaller.h
deleted file mode 100644
index 5c0828dad..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetGlobalPropertiesResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETGLOBALPROPERTIESRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETGLOBALPROPERTIESRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetGlobalPropertiesResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct SetGlobalPropertiesResponseMarshaller
-    {
-      static bool checkIntegrity(SetGlobalPropertiesResponse& e);
-      static bool checkIntegrityConst(const SetGlobalPropertiesResponse& e);
-    
-      static bool fromString(const std::string& s,SetGlobalPropertiesResponse& e);
-      static const std::string toString(const SetGlobalPropertiesResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,SetGlobalPropertiesResponse& e);
-      static Json::Value toJSON(const SetGlobalPropertiesResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimer.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimer.cpp
deleted file mode 100644
index 4c51da9af..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimer.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetMediaClockTimer.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-SetMediaClockTimer& SetMediaClockTimer::operator =(const SetMediaClockTimer& c)
-{
-  if(startTime)  delete startTime;
-  startTime= c.startTime ? new NsSmartDeviceLinkRPCV2::StartTime(c.startTime[0]) : 0;
-  updateMode=c.updateMode;
-  appId=c.appId;
-  return *this;
-}
-
-
-SetMediaClockTimer::~SetMediaClockTimer(void)
-{
-  if(startTime)  delete startTime;
-}
-
-
-SetMediaClockTimer::SetMediaClockTimer(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETMEDIACLOCKTIMER),
-  startTime(0)
-{
-}
-
-
-SetMediaClockTimer::SetMediaClockTimer(const SetMediaClockTimer& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETMEDIACLOCKTIMER,c.getId())
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::StartTime* SetMediaClockTimer::get_startTime(void)
-{
-  return startTime;
-}
-
-bool SetMediaClockTimer::set_startTime(const NsSmartDeviceLinkRPCV2::StartTime& startTime_)
-{
-  if(startTime)  delete startTime;
-  startTime=new NsSmartDeviceLinkRPCV2::StartTime(startTime_);
-  return true;
-}
-
-void SetMediaClockTimer::reset_startTime(void)
-{
-  if(startTime)  delete startTime;
-  startTime=0;
-}
-
-const NsSmartDeviceLinkRPCV2::UpdateMode& SetMediaClockTimer::get_updateMode(void)
-{
-  return updateMode;
-}
-
-bool SetMediaClockTimer::set_updateMode(const NsSmartDeviceLinkRPCV2::UpdateMode& updateMode_)
-{
-  updateMode=updateMode_;
-  return true;
-}
-
-int SetMediaClockTimer::get_appId(void)
-{
-  return appId;
-}
-
-bool SetMediaClockTimer::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool SetMediaClockTimer::checkIntegrity(void)
-{
-  return SetMediaClockTimerMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerMarshaller.cpp
deleted file mode 100644
index 08c6b4c5d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerMarshaller.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetMediaClockTimer.h"
-#include "../src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetMediaClockTimerMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool SetMediaClockTimerMarshaller::checkIntegrity(SetMediaClockTimer& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetMediaClockTimerMarshaller::fromString(const std::string& s,SetMediaClockTimer& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetMediaClockTimerMarshaller::toString(const SetMediaClockTimer& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetMediaClockTimerMarshaller::checkIntegrityConst(const SetMediaClockTimer& s)
-{
-  if(s.startTime && (!NsSmartDeviceLinkRPCV2::StartTimeMarshaller::checkIntegrityConst(s.startTime[0])))  return false;
-
-  if(!NsSmartDeviceLinkRPCV2::UpdateModeMarshaller::checkIntegrityConst(s.updateMode))  return false;
-
-  return true;
-}
-
-
-Json::Value SetMediaClockTimerMarshaller::toJSON(const SetMediaClockTimer& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.SetMediaClockTimer");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  if(e.startTime)
-    json["params"]["startTime"]=NsSmartDeviceLinkRPCV2::StartTimeMarshaller::toJSON(e.startTime[0]);;
-  json["params"]["updateMode"]=NsSmartDeviceLinkRPCV2::UpdateModeMarshaller::toJSON(e.updateMode);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool SetMediaClockTimerMarshaller::fromJSON(const Json::Value& json,SetMediaClockTimer& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.SetMediaClockTimer"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(c.startTime)  delete c.startTime;
-    c.startTime=0;
-    if(js.isMember("startTime"))
-    {
-      c.startTime=new NsSmartDeviceLinkRPCV2::StartTime();
-      if(!NsSmartDeviceLinkRPCV2::StartTimeMarshaller::fromJSON(js["startTime"],c.startTime[0]))  return false;
-    }
-
-    if(!js.isMember("updateMode") || !NsSmartDeviceLinkRPCV2::UpdateModeMarshaller::fromJSON(js["updateMode"],c.updateMode))  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerMarshaller.h
deleted file mode 100644
index b6efc75da..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETMEDIACLOCKTIMERMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETMEDIACLOCKTIMERMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetMediaClockTimer.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct SetMediaClockTimerMarshaller
-    {
-      static bool checkIntegrity(SetMediaClockTimer& e);
-      static bool checkIntegrityConst(const SetMediaClockTimer& e);
-    
-      static bool fromString(const std::string& s,SetMediaClockTimer& e);
-      static const std::string toString(const SetMediaClockTimer& e);
-    
-      static bool fromJSON(const Json::Value& s,SetMediaClockTimer& e);
-      static Json::Value toJSON(const SetMediaClockTimer& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerResponse.cpp
deleted file mode 100644
index 7f3a4504b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetMediaClockTimerResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-SetMediaClockTimerResponse& SetMediaClockTimerResponse::operator =(const SetMediaClockTimerResponse& c)
-{
-  return *this;
-}
-
-
-SetMediaClockTimerResponse::~SetMediaClockTimerResponse(void)
-{
-}
-
-
-SetMediaClockTimerResponse::SetMediaClockTimerResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETMEDIACLOCKTIMERRESPONSE)
-{
-}
-
-
-SetMediaClockTimerResponse::SetMediaClockTimerResponse(const SetMediaClockTimerResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SETMEDIACLOCKTIMERRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool SetMediaClockTimerResponse::checkIntegrity(void)
-{
-  return SetMediaClockTimerResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerResponseMarshaller.cpp
deleted file mode 100644
index 9ab8aa7ea..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetMediaClockTimerResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SetMediaClockTimerResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool SetMediaClockTimerResponseMarshaller::checkIntegrity(SetMediaClockTimerResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetMediaClockTimerResponseMarshaller::fromString(const std::string& s,SetMediaClockTimerResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetMediaClockTimerResponseMarshaller::toString(const SetMediaClockTimerResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetMediaClockTimerResponseMarshaller::checkIntegrityConst(const SetMediaClockTimerResponse& s)
-{
-  return true;
-}
-
-
-Json::Value SetMediaClockTimerResponseMarshaller::toJSON(const SetMediaClockTimerResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.SetMediaClockTimerResponse");
-
-  return json;
-}
-
-
-bool SetMediaClockTimerResponseMarshaller::fromJSON(const Json::Value& json,SetMediaClockTimerResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.SetMediaClockTimerResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerResponseMarshaller.h
deleted file mode 100644
index 16a912e29..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SetMediaClockTimerResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SETMEDIACLOCKTIMERRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SETMEDIACLOCKTIMERRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SetMediaClockTimerResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct SetMediaClockTimerResponseMarshaller
-    {
-      static bool checkIntegrity(SetMediaClockTimerResponse& e);
-      static bool checkIntegrityConst(const SetMediaClockTimerResponse& e);
-    
-      static bool fromString(const std::string& s,SetMediaClockTimerResponse& e);
-      static const std::string toString(const SetMediaClockTimerResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,SetMediaClockTimerResponse& e);
-      static Json::Value toJSON(const SetMediaClockTimerResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/Show.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/Show.cpp
deleted file mode 100644
index d518a8af5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/Show.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Show.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-Show& Show::operator =(const Show& c)
-{
-  if(mainField1)  delete mainField1;
-  mainField1= c.mainField1 ? new std::string(c.mainField1[0]) : 0;
-  if(mainField2)  delete mainField2;
-  mainField2= c.mainField2 ? new std::string(c.mainField2[0]) : 0;
-  if(mainField3)  delete mainField3;
-  mainField3= c.mainField3 ? new std::string(c.mainField3[0]) : 0;
-  if(mainField4)  delete mainField4;
-  mainField4= c.mainField4 ? new std::string(c.mainField4[0]) : 0;
-  if(alignment)  delete alignment;
-  alignment= c.alignment ? new NsSmartDeviceLinkRPCV2::TextAlignment(c.alignment[0]) : 0;
-  if(statusBar)  delete statusBar;
-  statusBar= c.statusBar ? new std::string(c.statusBar[0]) : 0;
-  if(mediaClock)  delete mediaClock;
-  mediaClock= c.mediaClock ? new std::string(c.mediaClock[0]) : 0;
-  if(mediaTrack)  delete mediaTrack;
-  mediaTrack= c.mediaTrack ? new std::string(c.mediaTrack[0]) : 0;
-  if(graphic)  delete graphic;
-  graphic= c.graphic ? new NsSmartDeviceLinkRPCV2::Image(c.graphic[0]) : 0;
-  if(softButtons)  delete softButtons;
-  softButtons= c.softButtons ? new std::vector<NsSmartDeviceLinkRPCV2::SoftButton>(c.softButtons[0]) : 0;
-  if(customPresets)  delete customPresets;
-  customPresets= c.customPresets ? new std::vector<std::string>(c.customPresets[0]) : 0;
-  appId=c.appId;
-  return *this;
-}
-
-
-Show::~Show(void)
-{
-  if(mainField1)  delete mainField1;
-  if(mainField2)  delete mainField2;
-  if(mainField3)  delete mainField3;
-  if(mainField4)  delete mainField4;
-  if(alignment)  delete alignment;
-  if(statusBar)  delete statusBar;
-  if(mediaClock)  delete mediaClock;
-  if(mediaTrack)  delete mediaTrack;
-  if(graphic)  delete graphic;
-  if(softButtons)  delete softButtons;
-  if(customPresets)  delete customPresets;
-}
-
-
-Show::Show(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SHOW),
-  mainField1(0),
-  mainField2(0),
-  mainField3(0),
-  mainField4(0),
-  alignment(0),
-  statusBar(0),
-  mediaClock(0),
-  mediaTrack(0),
-  graphic(0),
-  softButtons(0),
-  customPresets(0)
-{
-}
-
-
-Show::Show(const Show& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SHOW,c.getId())
-{
-  *this=c;
-}
-
-
-const std::string* Show::get_mainField1(void)
-{
-  return mainField1;
-}
-
-bool Show::set_mainField1(const std::string& mainField1_)
-{
-  if(mainField1)  delete mainField1;
-  mainField1=new std::string(mainField1_);
-  return true;
-}
-
-void Show::reset_mainField1(void)
-{
-  if(mainField1)  delete mainField1;
-  mainField1=0;
-}
-
-const std::string* Show::get_mainField2(void)
-{
-  return mainField2;
-}
-
-bool Show::set_mainField2(const std::string& mainField2_)
-{
-  if(mainField2)  delete mainField2;
-  mainField2=new std::string(mainField2_);
-  return true;
-}
-
-void Show::reset_mainField2(void)
-{
-  if(mainField2)  delete mainField2;
-  mainField2=0;
-}
-
-const std::string* Show::get_mainField3(void)
-{
-  return mainField3;
-}
-
-bool Show::set_mainField3(const std::string& mainField3_)
-{
-  if(mainField3)  delete mainField3;
-  mainField3=new std::string(mainField3_);
-  return true;
-}
-
-void Show::reset_mainField3(void)
-{
-  if(mainField3)  delete mainField3;
-  mainField3=0;
-}
-
-const std::string* Show::get_mainField4(void)
-{
-  return mainField4;
-}
-
-bool Show::set_mainField4(const std::string& mainField4_)
-{
-  if(mainField4)  delete mainField4;
-  mainField4=new std::string(mainField4_);
-  return true;
-}
-
-void Show::reset_mainField4(void)
-{
-  if(mainField4)  delete mainField4;
-  mainField4=0;
-}
-
-const NsSmartDeviceLinkRPCV2::TextAlignment* Show::get_alignment(void)
-{
-  return alignment;
-}
-
-bool Show::set_alignment(const NsSmartDeviceLinkRPCV2::TextAlignment& alignment_)
-{
-  if(alignment)  delete alignment;
-  alignment=new NsSmartDeviceLinkRPCV2::TextAlignment(alignment_);
-  return true;
-}
-
-void Show::reset_alignment(void)
-{
-  if(alignment)  delete alignment;
-  alignment=0;
-}
-
-const std::string* Show::get_statusBar(void)
-{
-  return statusBar;
-}
-
-bool Show::set_statusBar(const std::string& statusBar_)
-{
-  if(statusBar)  delete statusBar;
-  statusBar=new std::string(statusBar_);
-  return true;
-}
-
-void Show::reset_statusBar(void)
-{
-  if(statusBar)  delete statusBar;
-  statusBar=0;
-}
-
-const std::string* Show::get_mediaClock(void)
-{
-  return mediaClock;
-}
-
-bool Show::set_mediaClock(const std::string& mediaClock_)
-{
-  if(mediaClock)  delete mediaClock;
-  mediaClock=new std::string(mediaClock_);
-  return true;
-}
-
-void Show::reset_mediaClock(void)
-{
-  if(mediaClock)  delete mediaClock;
-  mediaClock=0;
-}
-
-const std::string* Show::get_mediaTrack(void)
-{
-  return mediaTrack;
-}
-
-bool Show::set_mediaTrack(const std::string& mediaTrack_)
-{
-  if(mediaTrack)  delete mediaTrack;
-  mediaTrack=new std::string(mediaTrack_);
-  return true;
-}
-
-void Show::reset_mediaTrack(void)
-{
-  if(mediaTrack)  delete mediaTrack;
-  mediaTrack=0;
-}
-
-const NsSmartDeviceLinkRPCV2::Image* Show::get_graphic(void)
-{
-  return graphic;
-}
-
-bool Show::set_graphic(const NsSmartDeviceLinkRPCV2::Image& graphic_)
-{
-  if(graphic)  delete graphic;
-  graphic=new NsSmartDeviceLinkRPCV2::Image(graphic_);
-  return true;
-}
-
-void Show::reset_graphic(void)
-{
-  if(graphic)  delete graphic;
-  graphic=0;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>* Show::get_softButtons(void)
-{
-  return softButtons;
-}
-
-bool Show::set_softButtons(const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& softButtons_)
-{
-  if(softButtons)  delete softButtons;
-  softButtons=new std::vector< NsSmartDeviceLinkRPCV2::SoftButton>(softButtons_);
-  return true;
-}
-
-void Show::reset_softButtons(void)
-{
-  if(softButtons)  delete softButtons;
-  softButtons=0;
-}
-
-const std::vector< std::string>* Show::get_customPresets(void)
-{
-  return customPresets;
-}
-
-bool Show::set_customPresets(const std::vector< std::string>& customPresets_)
-{
-  if(customPresets)  delete customPresets;
-  customPresets=new std::vector< std::string>(customPresets_);
-  return true;
-}
-
-void Show::reset_customPresets(void)
-{
-  if(customPresets)  delete customPresets;
-  customPresets=0;
-}
-
-int Show::get_appId(void)
-{
-  return appId;
-}
-
-bool Show::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool Show::checkIntegrity(void)
-{
-  return ShowMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBT.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBT.cpp
deleted file mode 100644
index 255f1e16d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBT.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowConstantTBT.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-ShowConstantTBT& ShowConstantTBT::operator =(const ShowConstantTBT& c)
-{
-  if(navigationText1)  delete navigationText1;
-  navigationText1= c.navigationText1 ? new std::string(c.navigationText1[0]) : 0;
-  if(navigationText2)  delete navigationText2;
-  navigationText2= c.navigationText2 ? new std::string(c.navigationText2[0]) : 0;
-  if(eta)  delete eta;
-  eta= c.eta ? new std::string(c.eta[0]) : 0;
-  if(totalDistance)  delete totalDistance;
-  totalDistance= c.totalDistance ? new std::string(c.totalDistance[0]) : 0;
-  turnIcon=c.turnIcon;
-  distanceToManeuver=c.distanceToManeuver;
-  distanceToManeuverScale=c.distanceToManeuverScale;
-  if(maneuverComplete)  delete maneuverComplete;
-  maneuverComplete= c.maneuverComplete ? new bool(c.maneuverComplete[0]) : 0;
-  softButtons=c.softButtons;
-  appId=c.appId;
-  return *this;
-}
-
-
-ShowConstantTBT::~ShowConstantTBT(void)
-{
-  if(navigationText1)  delete navigationText1;
-  if(navigationText2)  delete navigationText2;
-  if(eta)  delete eta;
-  if(totalDistance)  delete totalDistance;
-  if(maneuverComplete)  delete maneuverComplete;
-}
-
-
-ShowConstantTBT::ShowConstantTBT(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SHOWCONSTANTTBT),
-  navigationText1(0),
-  navigationText2(0),
-  eta(0),
-  totalDistance(0),
-  maneuverComplete(0)
-{
-}
-
-
-ShowConstantTBT::ShowConstantTBT(const ShowConstantTBT& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SHOWCONSTANTTBT,c.getId())
-{
-  *this=c;
-}
-
-
-const std::string* ShowConstantTBT::get_navigationText1(void)
-{
-  return navigationText1;
-}
-
-bool ShowConstantTBT::set_navigationText1(const std::string& navigationText1_)
-{
-  if(navigationText1)  delete navigationText1;
-  navigationText1=new std::string(navigationText1_);
-  return true;
-}
-
-void ShowConstantTBT::reset_navigationText1(void)
-{
-  if(navigationText1)  delete navigationText1;
-  navigationText1=0;
-}
-
-const std::string* ShowConstantTBT::get_navigationText2(void)
-{
-  return navigationText2;
-}
-
-bool ShowConstantTBT::set_navigationText2(const std::string& navigationText2_)
-{
-  if(navigationText2)  delete navigationText2;
-  navigationText2=new std::string(navigationText2_);
-  return true;
-}
-
-void ShowConstantTBT::reset_navigationText2(void)
-{
-  if(navigationText2)  delete navigationText2;
-  navigationText2=0;
-}
-
-const std::string* ShowConstantTBT::get_eta(void)
-{
-  return eta;
-}
-
-bool ShowConstantTBT::set_eta(const std::string& eta_)
-{
-  if(eta)  delete eta;
-  eta=new std::string(eta_);
-  return true;
-}
-
-void ShowConstantTBT::reset_eta(void)
-{
-  if(eta)  delete eta;
-  eta=0;
-}
-
-const std::string* ShowConstantTBT::get_totalDistance(void)
-{
-  return totalDistance;
-}
-
-bool ShowConstantTBT::set_totalDistance(const std::string& totalDistance_)
-{
-  if(totalDistance)  delete totalDistance;
-  totalDistance=new std::string(totalDistance_);
-  return true;
-}
-
-void ShowConstantTBT::reset_totalDistance(void)
-{
-  if(totalDistance)  delete totalDistance;
-  totalDistance=0;
-}
-
-const NsSmartDeviceLinkRPCV2::Image& ShowConstantTBT::get_turnIcon(void)
-{
-  return turnIcon;
-}
-
-bool ShowConstantTBT::set_turnIcon(const NsSmartDeviceLinkRPCV2::Image& turnIcon_)
-{
-  turnIcon=turnIcon_;
-  return true;
-}
-
-float ShowConstantTBT::get_distanceToManeuver(void)
-{
-  return distanceToManeuver;
-}
-
-bool ShowConstantTBT::set_distanceToManeuver(float distanceToManeuver_)
-{
-  distanceToManeuver=distanceToManeuver_;
-  return true;
-}
-
-float ShowConstantTBT::get_distanceToManeuverScale(void)
-{
-  return distanceToManeuverScale;
-}
-
-bool ShowConstantTBT::set_distanceToManeuverScale(float distanceToManeuverScale_)
-{
-  distanceToManeuverScale=distanceToManeuverScale_;
-  return true;
-}
-
-const bool* ShowConstantTBT::get_maneuverComplete(void)
-{
-  return maneuverComplete;
-}
-
-bool ShowConstantTBT::set_maneuverComplete(const bool& maneuverComplete_)
-{
-  if(maneuverComplete)  delete maneuverComplete;
-  maneuverComplete=new bool(maneuverComplete_);
-  return true;
-}
-
-void ShowConstantTBT::reset_maneuverComplete(void)
-{
-  if(maneuverComplete)  delete maneuverComplete;
-  maneuverComplete=0;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& ShowConstantTBT::get_softButtons(void)
-{
-  return softButtons;
-}
-
-bool ShowConstantTBT::set_softButtons(const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& softButtons_)
-{
-  softButtons=softButtons_;
-  return true;
-}
-
-int ShowConstantTBT::get_appId(void)
-{
-  return appId;
-}
-
-bool ShowConstantTBT::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool ShowConstantTBT::checkIntegrity(void)
-{
-  return ShowConstantTBTMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTMarshaller.cpp
deleted file mode 100644
index f4e509c08..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTMarshaller.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowConstantTBT.h"
-#include "../src/SDLRPCObjectsImpl/V2/ImageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ShowConstantTBTMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool ShowConstantTBTMarshaller::checkIntegrity(ShowConstantTBT& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ShowConstantTBTMarshaller::fromString(const std::string& s,ShowConstantTBT& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ShowConstantTBTMarshaller::toString(const ShowConstantTBT& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ShowConstantTBTMarshaller::checkIntegrityConst(const ShowConstantTBT& s)
-{
-  if(s.navigationText1 && (s.navigationText1[0].length()>500))  return false;
-
-  if(s.navigationText2 && (s.navigationText2[0].length()>500))  return false;
-
-  if(s.eta && (s.eta[0].length()>500))  return false;
-
-  if(s.totalDistance && (s.totalDistance[0].length()>500))  return false;
-
-  if(!NsSmartDeviceLinkRPCV2::ImageMarshaller::checkIntegrityConst(s.turnIcon))  return false;
-
-  if(s.distanceToManeuver<0 || s.distanceToManeuver>1000000000)  return false;
-
-  if(s.distanceToManeuverScale<0 || s.distanceToManeuverScale>1000000000)  return false;
-
-  {
-    unsigned int i=s.softButtons.size();
-    if(i<0)  return false;
-    if(i>3)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value ShowConstantTBTMarshaller::toJSON(const ShowConstantTBT& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.ShowConstantTBT");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  if(e.navigationText1)
-    json["params"]["navigationText1"]=Json::Value(e.navigationText1[0]);;
-  if(e.navigationText2)
-    json["params"]["navigationText2"]=Json::Value(e.navigationText2[0]);;
-  if(e.eta)
-    json["params"]["eta"]=Json::Value(e.eta[0]);;
-  if(e.totalDistance)
-    json["params"]["totalDistance"]=Json::Value(e.totalDistance[0]);;
-  json["params"]["turnIcon"]=NsSmartDeviceLinkRPCV2::ImageMarshaller::toJSON(e.turnIcon);;
-  json["params"]["distanceToManeuver"]=Json::Value(e.distanceToManeuver);;
-  json["params"]["distanceToManeuverScale"]=Json::Value(e.distanceToManeuverScale);;
-  if(e.maneuverComplete)
-    json["params"]["maneuverComplete"]=Json::Value(e.maneuverComplete[0]);;
-  {
-    unsigned int i=e.softButtons.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::SoftButtonMarshaller::toJSON(e.softButtons[i]);
-
-    json["params"]["softButtons"]=j;
-  }
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool ShowConstantTBTMarshaller::fromJSON(const Json::Value& json,ShowConstantTBT& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.ShowConstantTBT"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(c.navigationText1)  delete c.navigationText1;
-    c.navigationText1=0;
-    if(js.isMember("navigationText1"))
-    {
-      if(!js["navigationText1"].isString())  return false;
-      c.navigationText1=new std::string();
-      c.navigationText1[0]=js["navigationText1"].asString();
-      if(c.navigationText1[0].length()>500)  return false;
-
-    }
-
-    if(c.navigationText2)  delete c.navigationText2;
-    c.navigationText2=0;
-    if(js.isMember("navigationText2"))
-    {
-      if(!js["navigationText2"].isString())  return false;
-      c.navigationText2=new std::string();
-      c.navigationText2[0]=js["navigationText2"].asString();
-      if(c.navigationText2[0].length()>500)  return false;
-
-    }
-
-    if(c.eta)  delete c.eta;
-    c.eta=0;
-    if(js.isMember("eta"))
-    {
-      if(!js["eta"].isString())  return false;
-      c.eta=new std::string();
-      c.eta[0]=js["eta"].asString();
-      if(c.eta[0].length()>500)  return false;
-
-    }
-
-    if(c.totalDistance)  delete c.totalDistance;
-    c.totalDistance=0;
-    if(js.isMember("totalDistance"))
-    {
-      if(!js["totalDistance"].isString())  return false;
-      c.totalDistance=new std::string();
-      c.totalDistance[0]=js["totalDistance"].asString();
-      if(c.totalDistance[0].length()>500)  return false;
-
-    }
-
-    if(!js.isMember("turnIcon") || !NsSmartDeviceLinkRPCV2::ImageMarshaller::fromJSON(js["turnIcon"],c.turnIcon))  return false;
-
-    if(!js.isMember("distanceToManeuver") || !js["distanceToManeuver"].isNumeric())  return false;
-    c.distanceToManeuver=js["distanceToManeuver"].asDouble();
-    if(c.distanceToManeuver<0 || c.distanceToManeuver>1000000000)  return false;
-
-    if(!js.isMember("distanceToManeuverScale") || !js["distanceToManeuverScale"].isNumeric())  return false;
-    c.distanceToManeuverScale=js["distanceToManeuverScale"].asDouble();
-    if(c.distanceToManeuverScale<0 || c.distanceToManeuverScale>1000000000)  return false;
-
-    if(c.maneuverComplete)  delete c.maneuverComplete;
-    c.maneuverComplete=0;
-    if(js.isMember("maneuverComplete"))
-    {
-      if(!js["maneuverComplete"].isBool())  return false;
-      c.maneuverComplete=new bool();
-      c.maneuverComplete[0]=js["maneuverComplete"].asBool();
-      
-    }
-
-    if(!js.isMember("softButtons") || !js["softButtons"].isArray())  return false;
-    {
-      unsigned int i=js["softButtons"].size();
-      if(i<0)  return false;
-      if(i>3)  return false;
-      c.softButtons.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::SoftButton t;
-        if(!NsSmartDeviceLinkRPCV2::SoftButtonMarshaller::fromJSON(js["softButtons"][i],t))
-          return false;
-         c.softButtons[i]=t;
-      }
-    }
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTMarshaller.h
deleted file mode 100644
index dfeef7eef..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SHOWCONSTANTTBTMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SHOWCONSTANTTBTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowConstantTBT.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct ShowConstantTBTMarshaller
-    {
-      static bool checkIntegrity(ShowConstantTBT& e);
-      static bool checkIntegrityConst(const ShowConstantTBT& e);
-    
-      static bool fromString(const std::string& s,ShowConstantTBT& e);
-      static const std::string toString(const ShowConstantTBT& e);
-    
-      static bool fromJSON(const Json::Value& s,ShowConstantTBT& e);
-      static Json::Value toJSON(const ShowConstantTBT& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTResponse.cpp
deleted file mode 100644
index 2db452e5d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowConstantTBTResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-ShowConstantTBTResponse& ShowConstantTBTResponse::operator =(const ShowConstantTBTResponse& c)
-{
-  return *this;
-}
-
-
-ShowConstantTBTResponse::~ShowConstantTBTResponse(void)
-{
-}
-
-
-ShowConstantTBTResponse::ShowConstantTBTResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SHOWCONSTANTTBTRESPONSE)
-{
-}
-
-
-ShowConstantTBTResponse::ShowConstantTBTResponse(const ShowConstantTBTResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SHOWCONSTANTTBTRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool ShowConstantTBTResponse::checkIntegrity(void)
-{
-  return ShowConstantTBTResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTResponseMarshaller.cpp
deleted file mode 100644
index e74ea5850..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowConstantTBTResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ShowConstantTBTResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool ShowConstantTBTResponseMarshaller::checkIntegrity(ShowConstantTBTResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ShowConstantTBTResponseMarshaller::fromString(const std::string& s,ShowConstantTBTResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ShowConstantTBTResponseMarshaller::toString(const ShowConstantTBTResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ShowConstantTBTResponseMarshaller::checkIntegrityConst(const ShowConstantTBTResponse& s)
-{
-  return true;
-}
-
-
-Json::Value ShowConstantTBTResponseMarshaller::toJSON(const ShowConstantTBTResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.ShowConstantTBTResponse");
-
-  return json;
-}
-
-
-bool ShowConstantTBTResponseMarshaller::fromJSON(const Json::Value& json,ShowConstantTBTResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.ShowConstantTBTResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTResponseMarshaller.h
deleted file mode 100644
index 9205828d6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowConstantTBTResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SHOWCONSTANTTBTRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SHOWCONSTANTTBTRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowConstantTBTResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct ShowConstantTBTResponseMarshaller
-    {
-      static bool checkIntegrity(ShowConstantTBTResponse& e);
-      static bool checkIntegrityConst(const ShowConstantTBTResponse& e);
-    
-      static bool fromString(const std::string& s,ShowConstantTBTResponse& e);
-      static const std::string toString(const ShowConstantTBTResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,ShowConstantTBTResponse& e);
-      static Json::Value toJSON(const ShowConstantTBTResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowMarshaller.cpp
deleted file mode 100644
index 6b273bcab..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowMarshaller.cpp
+++ /dev/null
@@ -1,332 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Show.h"
-#include "../src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ImageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ShowMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool ShowMarshaller::checkIntegrity(Show& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ShowMarshaller::fromString(const std::string& s,Show& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ShowMarshaller::toString(const Show& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ShowMarshaller::checkIntegrityConst(const Show& s)
-{
-  if(s.mainField1 && (s.mainField1[0].length()>500))  return false;
-
-  if(s.mainField2 && (s.mainField2[0].length()>500))  return false;
-
-  if(s.mainField3 && (s.mainField3[0].length()>500))  return false;
-
-  if(s.mainField4 && (s.mainField4[0].length()>500))  return false;
-
-  if(s.alignment && (!NsSmartDeviceLinkRPCV2::TextAlignmentMarshaller::checkIntegrityConst(s.alignment[0])))  return false;
-
-  if(s.statusBar && (s.statusBar[0].length()>500))  return false;
-
-  if(s.mediaClock && (s.mediaClock[0].length()>500))  return false;
-
-  if(s.mediaTrack && (s.mediaTrack[0].length()>500))  return false;
-
-  if(s.graphic && (!NsSmartDeviceLinkRPCV2::ImageMarshaller::checkIntegrityConst(s.graphic[0])))  return false;
-
-  if(s.softButtons)
-  {
-    unsigned int i=s.softButtons[0].size();
-    if(i<0)  return false;
-    if(i>8)  return false;
-  }
-
-  if(s.customPresets)
-  {
-    unsigned int i=s.customPresets[0].size();
-    if(i<0)  return false;
-    if(i>6)  return false;
-    while(i--)
-    {
-      if(s.customPresets[0][i].length()>500)  return false;
-    }
-  }
-
-  return true;
-}
-
-
-Json::Value ShowMarshaller::toJSON(const Show& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.Show");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  if(e.mainField1)
-    json["params"]["mainField1"]=Json::Value(e.mainField1[0]);;
-  if(e.mainField2)
-    json["params"]["mainField2"]=Json::Value(e.mainField2[0]);;
-  if(e.mainField3)
-    json["params"]["mainField3"]=Json::Value(e.mainField3[0]);;
-  if(e.mainField4)
-    json["params"]["mainField4"]=Json::Value(e.mainField4[0]);;
-  if(e.alignment)
-    json["params"]["alignment"]=NsSmartDeviceLinkRPCV2::TextAlignmentMarshaller::toJSON(e.alignment[0]);;
-  if(e.statusBar)
-    json["params"]["statusBar"]=Json::Value(e.statusBar[0]);;
-  if(e.mediaClock)
-    json["params"]["mediaClock"]=Json::Value(e.mediaClock[0]);;
-  if(e.mediaTrack)
-    json["params"]["mediaTrack"]=Json::Value(e.mediaTrack[0]);;
-  if(e.graphic)
-    json["params"]["graphic"]=NsSmartDeviceLinkRPCV2::ImageMarshaller::toJSON(e.graphic[0]);;
-  if(e.softButtons)
-  {
-    unsigned int i=e.softButtons[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::SoftButtonMarshaller::toJSON(e.softButtons[0][i]);
-
-    json["params"]["softButtons"]=j;
-  }
-  if(e.customPresets)
-  {
-    unsigned int i=e.customPresets[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=Json::Value(e.customPresets[0][i]);
-
-    json["params"]["customPresets"]=j;
-  }
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool ShowMarshaller::fromJSON(const Json::Value& json,Show& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.Show"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(c.mainField1)  delete c.mainField1;
-    c.mainField1=0;
-    if(js.isMember("mainField1"))
-    {
-      if(!js["mainField1"].isString())  return false;
-      c.mainField1=new std::string();
-      c.mainField1[0]=js["mainField1"].asString();
-      if(c.mainField1[0].length()>500)  return false;
-
-    }
-
-    if(c.mainField2)  delete c.mainField2;
-    c.mainField2=0;
-    if(js.isMember("mainField2"))
-    {
-      if(!js["mainField2"].isString())  return false;
-      c.mainField2=new std::string();
-      c.mainField2[0]=js["mainField2"].asString();
-      if(c.mainField2[0].length()>500)  return false;
-
-    }
-
-    if(c.mainField3)  delete c.mainField3;
-    c.mainField3=0;
-    if(js.isMember("mainField3"))
-    {
-      if(!js["mainField3"].isString())  return false;
-      c.mainField3=new std::string();
-      c.mainField3[0]=js["mainField3"].asString();
-      if(c.mainField3[0].length()>500)  return false;
-
-    }
-
-    if(c.mainField4)  delete c.mainField4;
-    c.mainField4=0;
-    if(js.isMember("mainField4"))
-    {
-      if(!js["mainField4"].isString())  return false;
-      c.mainField4=new std::string();
-      c.mainField4[0]=js["mainField4"].asString();
-      if(c.mainField4[0].length()>500)  return false;
-
-    }
-
-    if(c.alignment)  delete c.alignment;
-    c.alignment=0;
-    if(js.isMember("alignment"))
-    {
-      c.alignment=new NsSmartDeviceLinkRPCV2::TextAlignment();
-      if(!NsSmartDeviceLinkRPCV2::TextAlignmentMarshaller::fromJSON(js["alignment"],c.alignment[0]))  return false;
-    }
-
-    if(c.statusBar)  delete c.statusBar;
-    c.statusBar=0;
-    if(js.isMember("statusBar"))
-    {
-      if(!js["statusBar"].isString())  return false;
-      c.statusBar=new std::string();
-      c.statusBar[0]=js["statusBar"].asString();
-      if(c.statusBar[0].length()>500)  return false;
-
-    }
-
-    if(c.mediaClock)  delete c.mediaClock;
-    c.mediaClock=0;
-    if(js.isMember("mediaClock"))
-    {
-      if(!js["mediaClock"].isString())  return false;
-      c.mediaClock=new std::string();
-      c.mediaClock[0]=js["mediaClock"].asString();
-      if(c.mediaClock[0].length()>500)  return false;
-
-    }
-
-    if(c.mediaTrack)  delete c.mediaTrack;
-    c.mediaTrack=0;
-    if(js.isMember("mediaTrack"))
-    {
-      if(!js["mediaTrack"].isString())  return false;
-      c.mediaTrack=new std::string();
-      c.mediaTrack[0]=js["mediaTrack"].asString();
-      if(c.mediaTrack[0].length()>500)  return false;
-
-    }
-
-    if(c.graphic)  delete c.graphic;
-    c.graphic=0;
-    if(js.isMember("graphic"))
-    {
-      c.graphic=new NsSmartDeviceLinkRPCV2::Image();
-      if(!NsSmartDeviceLinkRPCV2::ImageMarshaller::fromJSON(js["graphic"],c.graphic[0]))  return false;
-    }
-
-    if(c.softButtons)  delete c.softButtons;
-    c.softButtons=0;
-    if(js.isMember("softButtons"))
-    {
-      if(!js["softButtons"].isArray()) return false;
-      unsigned int i=js["softButtons"].size();
-      if(i<0)  return false;
-      if(i>8)  return false;
-
-      c.softButtons=new std::vector<NsSmartDeviceLinkRPCV2::SoftButton>();
-      c.softButtons->resize(js["softButtons"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::SoftButtonMarshaller::fromJSON(js["softButtons"][i],c.softButtons[0][i]))  return false;
-    }
-
-
-    if(c.customPresets)  delete c.customPresets;
-    c.customPresets=0;
-    if(js.isMember("customPresets"))
-    {
-      if(!js["customPresets"].isArray()) return false;
-      unsigned int i=js["customPresets"].size();
-      if(i<0)  return false;
-      if(i>6)  return false;
-
-      c.customPresets=new std::vector<std::string>();
-      c.customPresets->resize(js["customPresets"].size());
-
-      while(i--)
-      {
-        if(!js["customPresets"][i].isString())
-          return false;
-
-        c.customPresets[0][i]=js["customPresets"][i].asString();
-        if(c.customPresets[0][i].length()>500)  return false;
-      }
-    }
-
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowMarshaller.h
deleted file mode 100644
index 1b41e6683..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SHOWMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SHOWMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Show.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct ShowMarshaller
-    {
-      static bool checkIntegrity(Show& e);
-      static bool checkIntegrityConst(const Show& e);
-    
-      static bool fromString(const std::string& s,Show& e);
-      static const std::string toString(const Show& e);
-    
-      static bool fromJSON(const Json::Value& s,Show& e);
-      static Json::Value toJSON(const Show& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowResponse.cpp
deleted file mode 100644
index c129bdc39..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-ShowResponse& ShowResponse::operator =(const ShowResponse& c)
-{
-  return *this;
-}
-
-
-ShowResponse::~ShowResponse(void)
-{
-}
-
-
-ShowResponse::ShowResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SHOWRESPONSE)
-{
-}
-
-
-ShowResponse::ShowResponse(const ShowResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SHOWRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool ShowResponse::checkIntegrity(void)
-{
-  return ShowResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowResponseMarshaller.cpp
deleted file mode 100644
index ebd723ca7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/ShowResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool ShowResponseMarshaller::checkIntegrity(ShowResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ShowResponseMarshaller::fromString(const std::string& s,ShowResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ShowResponseMarshaller::toString(const ShowResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ShowResponseMarshaller::checkIntegrityConst(const ShowResponse& s)
-{
-  return true;
-}
-
-
-Json::Value ShowResponseMarshaller::toJSON(const ShowResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.ShowResponse");
-
-  return json;
-}
-
-
-bool ShowResponseMarshaller::fromJSON(const Json::Value& json,ShowResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.ShowResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowResponseMarshaller.h
deleted file mode 100644
index aa5f288bd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/ShowResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SHOWRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SHOWRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/ShowResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct ShowResponseMarshaller
-    {
-      static bool checkIntegrity(ShowResponse& e);
-      static bool checkIntegrityConst(const ShowResponse& e);
-    
-      static bool fromString(const std::string& s,ShowResponse& e);
-      static const std::string toString(const ShowResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,ShowResponse& e);
-      static Json::Value toJSON(const ShowResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/Slider.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/Slider.cpp
deleted file mode 100644
index f50aed3c5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/Slider.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Slider.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-Slider& Slider::operator =(const Slider& c)
-{
-  numTicks=c.numTicks;
-  position=c.position;
-  sliderHeader=c.sliderHeader;
-  if(sliderFooter)  delete sliderFooter;
-  sliderFooter= c.sliderFooter ? new std::vector<std::string>(c.sliderFooter[0]) : 0;
-  timeout=c.timeout;
-  appId=c.appId;
-  return *this;
-}
-
-
-Slider::~Slider(void)
-{
-  if(sliderFooter)  delete sliderFooter;
-}
-
-
-Slider::Slider(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SLIDER),
-  sliderFooter(0)
-{
-}
-
-
-Slider::Slider(const Slider& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SLIDER,c.getId())
-{
-  *this=c;
-}
-
-
-unsigned int Slider::get_numTicks(void)
-{
-  return numTicks;
-}
-
-bool Slider::set_numTicks(unsigned int numTicks_)
-{
-  numTicks=numTicks_;
-  return true;
-}
-
-unsigned int Slider::get_position(void)
-{
-  return position;
-}
-
-bool Slider::set_position(unsigned int position_)
-{
-  position=position_;
-  return true;
-}
-
-const std::string& Slider::get_sliderHeader(void)
-{
-  return sliderHeader;
-}
-
-bool Slider::set_sliderHeader(const std::string& sliderHeader_)
-{
-  sliderHeader=sliderHeader_;
-  return true;
-}
-
-const std::vector< std::string>* Slider::get_sliderFooter(void)
-{
-  return sliderFooter;
-}
-
-bool Slider::set_sliderFooter(const std::vector< std::string>& sliderFooter_)
-{
-  if(sliderFooter)  delete sliderFooter;
-  sliderFooter=new std::vector< std::string>(sliderFooter_);
-  return true;
-}
-
-void Slider::reset_sliderFooter(void)
-{
-  if(sliderFooter)  delete sliderFooter;
-  sliderFooter=0;
-}
-
-unsigned int Slider::get_timeout(void)
-{
-  return timeout;
-}
-
-bool Slider::set_timeout(unsigned int timeout_)
-{
-  timeout=timeout_;
-  return true;
-}
-
-int Slider::get_appId(void)
-{
-  return appId;
-}
-
-bool Slider::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool Slider::checkIntegrity(void)
-{
-  return SliderMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderMarshaller.cpp
deleted file mode 100644
index 2bcbddfc9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderMarshaller.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Slider.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SliderMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool SliderMarshaller::checkIntegrity(Slider& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SliderMarshaller::fromString(const std::string& s,Slider& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SliderMarshaller::toString(const Slider& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SliderMarshaller::checkIntegrityConst(const Slider& s)
-{
-  if(s.numTicks<2 || s.numTicks>26)  return false;
-
-  if(s.position<1 || s.position>26)  return false;
-
-  if(s.sliderHeader.length()>500)  return false;
-
-  if(s.sliderFooter)
-  {
-    unsigned int i=s.sliderFooter[0].size();
-    if(i<1)  return false;
-    if(i>26)  return false;
-    while(i--)
-    {
-      if(s.sliderFooter[0][i].length()>500)  return false;
-    }
-  }
-
-  if(s.timeout>65535)  return false;
-
-  return true;
-}
-
-
-Json::Value SliderMarshaller::toJSON(const Slider& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.Slider");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["numTicks"]=Json::Value(e.numTicks);;
-  json["params"]["position"]=Json::Value(e.position);;
-  json["params"]["sliderHeader"]=Json::Value(e.sliderHeader);;
-  if(e.sliderFooter)
-  {
-    unsigned int i=e.sliderFooter[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=Json::Value(e.sliderFooter[0][i]);
-
-    json["params"]["sliderFooter"]=j;
-  }
-  json["params"]["timeout"]=Json::Value(e.timeout);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool SliderMarshaller::fromJSON(const Json::Value& json,Slider& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.Slider"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("numTicks") || !js["numTicks"].isInt())  return false;
-    c.numTicks=js["numTicks"].asInt();
-    if(c.numTicks<2 || c.numTicks>26)  return false;
-
-    if(!js.isMember("position") || !js["position"].isInt())  return false;
-    c.position=js["position"].asInt();
-    if(c.position<1 || c.position>16)  return false;
-
-    if(!js.isMember("sliderHeader") || !js["sliderHeader"].isString())  return false;
-    c.sliderHeader=js["sliderHeader"].asString();
-    if(c.sliderHeader.length()>500)  return false;
-
-    if(c.sliderFooter)  delete c.sliderFooter;
-    c.sliderFooter=0;
-    if(js.isMember("sliderFooter"))
-    {
-      if(!js["sliderFooter"].isArray()) return false;
-      unsigned int i=js["sliderFooter"].size();
-      if(i<1)  return false;
-      if(i>26)  return false;
-
-      c.sliderFooter=new std::vector<std::string>();
-      c.sliderFooter->resize(js["sliderFooter"].size());
-
-      while(i--)
-      {
-        if(!js["sliderFooter"][i].isString())
-          return false;
-
-        c.sliderFooter[0][i]=js["sliderFooter"][i].asString();
-        if(c.sliderFooter[0][i].length()>500)  return false;
-      }
-    }
-
-
-    if(!js.isMember("timeout") || !js["timeout"].isInt())  return false;
-    c.timeout=js["timeout"].asInt();
-    if(c.timeout>65535)  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderMarshaller.h
deleted file mode 100644
index 62087dad0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SLIDERMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SLIDERMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/Slider.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct SliderMarshaller
-    {
-      static bool checkIntegrity(Slider& e);
-      static bool checkIntegrityConst(const Slider& e);
-    
-      static bool fromString(const std::string& s,Slider& e);
-      static const std::string toString(const Slider& e);
-    
-      static bool fromJSON(const Json::Value& s,Slider& e);
-      static Json::Value toJSON(const Slider& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderResponse.cpp
deleted file mode 100644
index 3350ef5c1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderResponse.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SliderResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-SliderResponse& SliderResponse::operator =(const SliderResponse& c)
-{
-  sliderPosition=c.sliderPosition;
-  return *this;
-}
-
-
-SliderResponse::~SliderResponse(void)
-{
-}
-
-
-SliderResponse::SliderResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SLIDERRESPONSE)
-{
-}
-
-
-SliderResponse::SliderResponse(const SliderResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__SLIDERRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-unsigned int SliderResponse::get_sliderPosition(void)
-{
-  return sliderPosition;
-}
-
-bool SliderResponse::set_sliderPosition(unsigned int sliderPosition_)
-{
-  sliderPosition=sliderPosition_;
-  return true;
-}
-
-bool SliderResponse::checkIntegrity(void)
-{
-  return SliderResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderResponseMarshaller.cpp
deleted file mode 100644
index 2cac2cacb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderResponseMarshaller.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SliderResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/SliderResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool SliderResponseMarshaller::checkIntegrity(SliderResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SliderResponseMarshaller::fromString(const std::string& s,SliderResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SliderResponseMarshaller::toString(const SliderResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SliderResponseMarshaller::checkIntegrityConst(const SliderResponse& s)
-{
-  if(s.sliderPosition<1 || s.sliderPosition>26)  return false;
-
-  return true;
-}
-
-
-Json::Value SliderResponseMarshaller::toJSON(const SliderResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.SliderResponse");
-
-  json["result"]["sliderPosition"]=Json::Value(e.sliderPosition);;
-  return json;
-}
-
-
-bool SliderResponseMarshaller::fromJSON(const Json::Value& json,SliderResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.SliderResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("sliderPosition") || !js["sliderPosition"].isInt())  return false;
-    c.sliderPosition=js["sliderPosition"].asInt();
-    if(c.sliderPosition<1 || c.sliderPosition>26)  return false;
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderResponseMarshaller.h
deleted file mode 100644
index f162ec300..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/SliderResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_SLIDERRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_SLIDERRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/SliderResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct SliderResponseMarshaller
-    {
-      static bool checkIntegrity(SliderResponse& e);
-      static bool checkIntegrityConst(const SliderResponse& e);
-    
-      static bool fromString(const std::string& s,SliderResponse& e);
-      static const std::string toString(const SliderResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,SliderResponse& e);
-      static Json::Value toJSON(const SliderResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnList.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnList.cpp
deleted file mode 100644
index 9b4dbc25e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnList.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/UpdateTurnList.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-UpdateTurnList& UpdateTurnList::operator =(const UpdateTurnList& c)
-{
-  turnList=c.turnList;
-  softButtons=c.softButtons;
-  appId=c.appId;
-  return *this;
-}
-
-
-UpdateTurnList::~UpdateTurnList(void)
-{
-}
-
-
-UpdateTurnList::UpdateTurnList(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__UPDATETURNLIST)
-{
-}
-
-
-UpdateTurnList::UpdateTurnList(const UpdateTurnList& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__UPDATETURNLIST,c.getId())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::Turn>& UpdateTurnList::get_turnList(void)
-{
-  return turnList;
-}
-
-bool UpdateTurnList::set_turnList(const std::vector< NsSmartDeviceLinkRPCV2::Turn>& turnList_)
-{
-  turnList=turnList_;
-  return true;
-}
-
-const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& UpdateTurnList::get_softButtons(void)
-{
-  return softButtons;
-}
-
-bool UpdateTurnList::set_softButtons(const std::vector< NsSmartDeviceLinkRPCV2::SoftButton>& softButtons_)
-{
-  softButtons=softButtons_;
-  return true;
-}
-
-int UpdateTurnList::get_appId(void)
-{
-  return appId;
-}
-
-bool UpdateTurnList::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool UpdateTurnList::checkIntegrity(void)
-{
-  return UpdateTurnListMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListMarshaller.cpp
deleted file mode 100644
index 2ced1056f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListMarshaller.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/UpdateTurnList.h"
-#include "../src/SDLRPCObjectsImpl/V2/TurnMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/UpdateTurnListMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool UpdateTurnListMarshaller::checkIntegrity(UpdateTurnList& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UpdateTurnListMarshaller::fromString(const std::string& s,UpdateTurnList& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UpdateTurnListMarshaller::toString(const UpdateTurnList& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UpdateTurnListMarshaller::checkIntegrityConst(const UpdateTurnList& s)
-{
-  {
-    unsigned int i=s.turnList.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  {
-    unsigned int i=s.softButtons.size();
-    if(i<0)  return false;
-    if(i>1)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value UpdateTurnListMarshaller::toJSON(const UpdateTurnList& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("UI.UpdateTurnList");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  {
-    unsigned int i=e.turnList.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::TurnMarshaller::toJSON(e.turnList[i]);
-
-    json["params"]["turnList"]=j;
-  }
-  {
-    unsigned int i=e.softButtons.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::SoftButtonMarshaller::toJSON(e.softButtons[i]);
-
-    json["params"]["softButtons"]=j;
-  }
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool UpdateTurnListMarshaller::fromJSON(const Json::Value& json,UpdateTurnList& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("UI.UpdateTurnList"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("turnList") || !js["turnList"].isArray())  return false;
-    {
-      unsigned int i=js["turnList"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.turnList.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::Turn t;
-        if(!NsSmartDeviceLinkRPCV2::TurnMarshaller::fromJSON(js["turnList"][i],t))
-          return false;
-         c.turnList[i]=t;
-      }
-    }
-
-    if(!js.isMember("softButtons") || !js["softButtons"].isArray())  return false;
-    {
-      unsigned int i=js["softButtons"].size();
-      if(i<0)  return false;
-      if(i>1)  return false;
-      c.softButtons.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::SoftButton t;
-        if(!NsSmartDeviceLinkRPCV2::SoftButtonMarshaller::fromJSON(js["softButtons"][i],t))
-          return false;
-         c.softButtons[i]=t;
-      }
-    }
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListMarshaller.h
deleted file mode 100644
index 28e3dcbb7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_UPDATETURNLISTMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_UPDATETURNLISTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/UpdateTurnList.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct UpdateTurnListMarshaller
-    {
-      static bool checkIntegrity(UpdateTurnList& e);
-      static bool checkIntegrityConst(const UpdateTurnList& e);
-    
-      static bool fromString(const std::string& s,UpdateTurnList& e);
-      static const std::string toString(const UpdateTurnList& e);
-    
-      static bool fromJSON(const Json::Value& s,UpdateTurnList& e);
-      static Json::Value toJSON(const UpdateTurnList& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListResponse.cpp
deleted file mode 100644
index c54fe06de..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/UpdateTurnListResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-
-UpdateTurnListResponse& UpdateTurnListResponse::operator =(const UpdateTurnListResponse& c)
-{
-  return *this;
-}
-
-
-UpdateTurnListResponse::~UpdateTurnListResponse(void)
-{
-}
-
-
-UpdateTurnListResponse::UpdateTurnListResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__UPDATETURNLISTRESPONSE)
-{
-}
-
-
-UpdateTurnListResponse::UpdateTurnListResponse(const UpdateTurnListResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_UI__UPDATETURNLISTRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool UpdateTurnListResponse::checkIntegrity(void)
-{
-  return UpdateTurnListResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListResponseMarshaller.cpp
deleted file mode 100644
index 752f82916..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/UpdateTurnListResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/UI/UpdateTurnListResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::UI
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::UI;
-
-bool UpdateTurnListResponseMarshaller::checkIntegrity(UpdateTurnListResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UpdateTurnListResponseMarshaller::fromString(const std::string& s,UpdateTurnListResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UpdateTurnListResponseMarshaller::toString(const UpdateTurnListResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UpdateTurnListResponseMarshaller::checkIntegrityConst(const UpdateTurnListResponse& s)
-{
-  return true;
-}
-
-
-Json::Value UpdateTurnListResponseMarshaller::toJSON(const UpdateTurnListResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("UI.UpdateTurnListResponse");
-
-  return json;
-}
-
-
-bool UpdateTurnListResponseMarshaller::fromJSON(const Json::Value& json,UpdateTurnListResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("UI.UpdateTurnListResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListResponseMarshaller.h
deleted file mode 100644
index 00b514874..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/UI/UpdateTurnListResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_UI_UPDATETURNLISTRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_UI_UPDATETURNLISTRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/UI/UpdateTurnListResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace UI
-  {
-
-    struct UpdateTurnListResponseMarshaller
-    {
-      static bool checkIntegrity(UpdateTurnListResponse& e);
-      static bool checkIntegrityConst(const UpdateTurnListResponse& e);
-    
-      static bool fromString(const std::string& s,UpdateTurnListResponse& e);
-      static const std::string toString(const UpdateTurnListResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,UpdateTurnListResponse& e);
-      static Json::Value toJSON(const UpdateTurnListResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommand.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommand.cpp
deleted file mode 100644
index 654b41e3d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommand.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/AddCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-AddCommand& AddCommand::operator =(const AddCommand& c)
-{
-  cmdId=c.cmdId;
-  vrCommands=c.vrCommands;
-  appId=c.appId;
-  return *this;
-}
-
-
-AddCommand::~AddCommand(void)
-{
-}
-
-
-AddCommand::AddCommand(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__ADDCOMMAND)
-{
-}
-
-
-AddCommand::AddCommand(const AddCommand& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__ADDCOMMAND,c.getId())
-{
-  *this=c;
-}
-
-
-unsigned int AddCommand::get_cmdId(void)
-{
-  return cmdId;
-}
-
-bool AddCommand::set_cmdId(unsigned int cmdId_)
-{
-  cmdId=cmdId_;
-  return true;
-}
-
-const std::vector< std::string>& AddCommand::get_vrCommands(void)
-{
-  return vrCommands;
-}
-
-bool AddCommand::set_vrCommands(const std::vector< std::string>& vrCommands_)
-{
-  vrCommands=vrCommands_;
-  return true;
-}
-
-int AddCommand::get_appId(void)
-{
-  return appId;
-}
-
-bool AddCommand::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool AddCommand::checkIntegrity(void)
-{
-  return AddCommandMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandMarshaller.cpp
deleted file mode 100644
index 8732d1e64..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandMarshaller.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/AddCommand.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/AddCommandMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool AddCommandMarshaller::checkIntegrity(AddCommand& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddCommandMarshaller::fromString(const std::string& s,AddCommand& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddCommandMarshaller::toString(const AddCommand& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddCommandMarshaller::checkIntegrityConst(const AddCommand& s)
-{
-  if(s.cmdId>2000000000)  return false;
-
-  {
-    unsigned int i=s.vrCommands.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-    while(i--)
-    {
-      if(s.vrCommands[i].length()>99)  return false;
-    }
-  }
-
-  return true;
-}
-
-
-Json::Value AddCommandMarshaller::toJSON(const AddCommand& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VR.AddCommand");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["cmdId"]=Json::Value(e.cmdId);;
-  {
-    unsigned int i=e.vrCommands.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=Json::Value(e.vrCommands[i]);
-
-    json["params"]["vrCommands"]=j;
-  }
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool AddCommandMarshaller::fromJSON(const Json::Value& json,AddCommand& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VR.AddCommand"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("cmdId") || !js["cmdId"].isInt())  return false;
-    c.cmdId=js["cmdId"].asInt();
-    if(c.cmdId>2000000000)  return false;
-
-    if(!js.isMember("vrCommands") || !js["vrCommands"].isArray())
-      return false;
-    {
-      c.vrCommands.clear();
-      unsigned int i=js["vrCommands"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.vrCommands.resize(i);
-      while(i--)
-      {
-        if(!js["vrCommands"][i].isString())
-          return false;
-        c.vrCommands[i]=js["vrCommands"][i].asString();
-        if(c.vrCommands[i].length()>99)  return false;
-
-      }
-    }
-
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandMarshaller.h
deleted file mode 100644
index 7ba2de53a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_ADDCOMMANDMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_ADDCOMMANDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/AddCommand.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct AddCommandMarshaller
-    {
-      static bool checkIntegrity(AddCommand& e);
-      static bool checkIntegrityConst(const AddCommand& e);
-    
-      static bool fromString(const std::string& s,AddCommand& e);
-      static const std::string toString(const AddCommand& e);
-    
-      static bool fromJSON(const Json::Value& s,AddCommand& e);
-      static Json::Value toJSON(const AddCommand& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandResponse.cpp
deleted file mode 100644
index 96bcf628e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/AddCommandResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-AddCommandResponse& AddCommandResponse::operator =(const AddCommandResponse& c)
-{
-  return *this;
-}
-
-
-AddCommandResponse::~AddCommandResponse(void)
-{
-}
-
-
-AddCommandResponse::AddCommandResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__ADDCOMMANDRESPONSE)
-{
-}
-
-
-AddCommandResponse::AddCommandResponse(const AddCommandResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__ADDCOMMANDRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool AddCommandResponse::checkIntegrity(void)
-{
-  return AddCommandResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandResponseMarshaller.cpp
deleted file mode 100644
index a640a3139..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/AddCommandResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/AddCommandResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool AddCommandResponseMarshaller::checkIntegrity(AddCommandResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddCommandResponseMarshaller::fromString(const std::string& s,AddCommandResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddCommandResponseMarshaller::toString(const AddCommandResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddCommandResponseMarshaller::checkIntegrityConst(const AddCommandResponse& s)
-{
-  return true;
-}
-
-
-Json::Value AddCommandResponseMarshaller::toJSON(const AddCommandResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("VR.AddCommandResponse");
-
-  return json;
-}
-
-
-bool AddCommandResponseMarshaller::fromJSON(const Json::Value& json,AddCommandResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("VR.AddCommandResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandResponseMarshaller.h
deleted file mode 100644
index caae5f540..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/AddCommandResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_ADDCOMMANDRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_ADDCOMMANDRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/AddCommandResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct AddCommandResponseMarshaller
-    {
-      static bool checkIntegrity(AddCommandResponse& e);
-      static bool checkIntegrityConst(const AddCommandResponse& e);
-    
-      static bool fromString(const std::string& s,AddCommandResponse& e);
-      static const std::string toString(const AddCommandResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,AddCommandResponse& e);
-      static Json::Value toJSON(const AddCommandResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistration.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistration.cpp
deleted file mode 100644
index c07053b9b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistration.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/ChangeRegistration.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-ChangeRegistration& ChangeRegistration::operator =(const ChangeRegistration& c)
-{
-  language=c.language;
-  appId=c.appId;
-  return *this;
-}
-
-
-ChangeRegistration::~ChangeRegistration(void)
-{
-}
-
-
-ChangeRegistration::ChangeRegistration(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__CHANGEREGISTRATION)
-{
-}
-
-
-ChangeRegistration::ChangeRegistration(const ChangeRegistration& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__CHANGEREGISTRATION,c.getId())
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::Language& ChangeRegistration::get_language(void)
-{
-  return language;
-}
-
-bool ChangeRegistration::set_language(const NsSmartDeviceLinkRPCV2::Language& language_)
-{
-  language=language_;
-  return true;
-}
-
-int ChangeRegistration::get_appId(void)
-{
-  return appId;
-}
-
-bool ChangeRegistration::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool ChangeRegistration::checkIntegrity(void)
-{
-  return ChangeRegistrationMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationMarshaller.cpp
deleted file mode 100644
index 57c3f2dd0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationMarshaller.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/ChangeRegistration.h"
-#include "../src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/ChangeRegistrationMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool ChangeRegistrationMarshaller::checkIntegrity(ChangeRegistration& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ChangeRegistrationMarshaller::fromString(const std::string& s,ChangeRegistration& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ChangeRegistrationMarshaller::toString(const ChangeRegistration& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChangeRegistrationMarshaller::checkIntegrityConst(const ChangeRegistration& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::LanguageMarshaller::checkIntegrityConst(s.language))  return false;
-
-  return true;
-}
-
-
-Json::Value ChangeRegistrationMarshaller::toJSON(const ChangeRegistration& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VR.ChangeRegistration");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["language"]=NsSmartDeviceLinkRPCV2::LanguageMarshaller::toJSON(e.language);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool ChangeRegistrationMarshaller::fromJSON(const Json::Value& json,ChangeRegistration& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VR.ChangeRegistration"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("language") || !NsSmartDeviceLinkRPCV2::LanguageMarshaller::fromJSON(js["language"],c.language))  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationMarshaller.h
deleted file mode 100644
index faa5a8d8a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_CHANGEREGISTRATIONMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_CHANGEREGISTRATIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/ChangeRegistration.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct ChangeRegistrationMarshaller
-    {
-      static bool checkIntegrity(ChangeRegistration& e);
-      static bool checkIntegrityConst(const ChangeRegistration& e);
-    
-      static bool fromString(const std::string& s,ChangeRegistration& e);
-      static const std::string toString(const ChangeRegistration& e);
-    
-      static bool fromJSON(const Json::Value& s,ChangeRegistration& e);
-      static Json::Value toJSON(const ChangeRegistration& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationResponse.cpp
deleted file mode 100644
index ac09f306f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/ChangeRegistrationResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-ChangeRegistrationResponse& ChangeRegistrationResponse::operator =(const ChangeRegistrationResponse& c)
-{
-  return *this;
-}
-
-
-ChangeRegistrationResponse::~ChangeRegistrationResponse(void)
-{
-}
-
-
-ChangeRegistrationResponse::ChangeRegistrationResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__CHANGEREGISTRATIONRESPONSE)
-{
-}
-
-
-ChangeRegistrationResponse::ChangeRegistrationResponse(const ChangeRegistrationResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__CHANGEREGISTRATIONRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool ChangeRegistrationResponse::checkIntegrity(void)
-{
-  return ChangeRegistrationResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationResponseMarshaller.cpp
deleted file mode 100644
index 6e724f0d8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/ChangeRegistrationResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/ChangeRegistrationResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool ChangeRegistrationResponseMarshaller::checkIntegrity(ChangeRegistrationResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ChangeRegistrationResponseMarshaller::fromString(const std::string& s,ChangeRegistrationResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ChangeRegistrationResponseMarshaller::toString(const ChangeRegistrationResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChangeRegistrationResponseMarshaller::checkIntegrityConst(const ChangeRegistrationResponse& s)
-{
-  return true;
-}
-
-
-Json::Value ChangeRegistrationResponseMarshaller::toJSON(const ChangeRegistrationResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("VR.ChangeRegistrationResponse");
-
-  return json;
-}
-
-
-bool ChangeRegistrationResponseMarshaller::fromJSON(const Json::Value& json,ChangeRegistrationResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("VR.ChangeRegistrationResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationResponseMarshaller.h
deleted file mode 100644
index 631a4636d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/ChangeRegistrationResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_CHANGEREGISTRATIONRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_CHANGEREGISTRATIONRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/ChangeRegistrationResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct ChangeRegistrationResponseMarshaller
-    {
-      static bool checkIntegrity(ChangeRegistrationResponse& e);
-      static bool checkIntegrityConst(const ChangeRegistrationResponse& e);
-    
-      static bool fromString(const std::string& s,ChangeRegistrationResponse& e);
-      static const std::string toString(const ChangeRegistrationResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,ChangeRegistrationResponse& e);
-      static Json::Value toJSON(const ChangeRegistrationResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommand.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommand.cpp
deleted file mode 100644
index c7a1eb60f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommand.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/DeleteCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-DeleteCommand& DeleteCommand::operator =(const DeleteCommand& c)
-{
-  cmdId=c.cmdId;
-  appId=c.appId;
-  return *this;
-}
-
-
-DeleteCommand::~DeleteCommand(void)
-{
-}
-
-
-DeleteCommand::DeleteCommand(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__DELETECOMMAND)
-{
-}
-
-
-DeleteCommand::DeleteCommand(const DeleteCommand& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__DELETECOMMAND,c.getId())
-{
-  *this=c;
-}
-
-
-unsigned int DeleteCommand::get_cmdId(void)
-{
-  return cmdId;
-}
-
-bool DeleteCommand::set_cmdId(unsigned int cmdId_)
-{
-  cmdId=cmdId_;
-  return true;
-}
-
-int DeleteCommand::get_appId(void)
-{
-  return appId;
-}
-
-bool DeleteCommand::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool DeleteCommand::checkIntegrity(void)
-{
-  return DeleteCommandMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandMarshaller.cpp
deleted file mode 100644
index f640777cb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/DeleteCommand.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/DeleteCommandMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool DeleteCommandMarshaller::checkIntegrity(DeleteCommand& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteCommandMarshaller::fromString(const std::string& s,DeleteCommand& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteCommandMarshaller::toString(const DeleteCommand& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteCommandMarshaller::checkIntegrityConst(const DeleteCommand& s)
-{
-  if(s.cmdId>2000000000)  return false;
-
-  return true;
-}
-
-
-Json::Value DeleteCommandMarshaller::toJSON(const DeleteCommand& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VR.DeleteCommand");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["cmdId"]=Json::Value(e.cmdId);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool DeleteCommandMarshaller::fromJSON(const Json::Value& json,DeleteCommand& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VR.DeleteCommand"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("cmdId") || !js["cmdId"].isInt())  return false;
-    c.cmdId=js["cmdId"].asInt();
-    if(c.cmdId>2000000000)  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandMarshaller.h
deleted file mode 100644
index e3d2e9394..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_DELETECOMMANDMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_DELETECOMMANDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/DeleteCommand.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct DeleteCommandMarshaller
-    {
-      static bool checkIntegrity(DeleteCommand& e);
-      static bool checkIntegrityConst(const DeleteCommand& e);
-    
-      static bool fromString(const std::string& s,DeleteCommand& e);
-      static const std::string toString(const DeleteCommand& e);
-    
-      static bool fromJSON(const Json::Value& s,DeleteCommand& e);
-      static Json::Value toJSON(const DeleteCommand& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandResponse.cpp
deleted file mode 100644
index 58ec913c3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandResponse.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/DeleteCommandResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-DeleteCommandResponse& DeleteCommandResponse::operator =(const DeleteCommandResponse& c)
-{
-  return *this;
-}
-
-
-DeleteCommandResponse::~DeleteCommandResponse(void)
-{
-}
-
-
-DeleteCommandResponse::DeleteCommandResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__DELETECOMMANDRESPONSE)
-{
-}
-
-
-DeleteCommandResponse::DeleteCommandResponse(const DeleteCommandResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__DELETECOMMANDRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-bool DeleteCommandResponse::checkIntegrity(void)
-{
-  return DeleteCommandResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandResponseMarshaller.cpp
deleted file mode 100644
index 9cc603e86..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandResponseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/DeleteCommandResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/DeleteCommandResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool DeleteCommandResponseMarshaller::checkIntegrity(DeleteCommandResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteCommandResponseMarshaller::fromString(const std::string& s,DeleteCommandResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteCommandResponseMarshaller::toString(const DeleteCommandResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteCommandResponseMarshaller::checkIntegrityConst(const DeleteCommandResponse& s)
-{
-  return true;
-}
-
-
-Json::Value DeleteCommandResponseMarshaller::toJSON(const DeleteCommandResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("VR.DeleteCommandResponse");
-
-  return json;
-}
-
-
-bool DeleteCommandResponseMarshaller::fromJSON(const Json::Value& json,DeleteCommandResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("VR.DeleteCommandResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandResponseMarshaller.h
deleted file mode 100644
index 1cd11b9b0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/DeleteCommandResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_DELETECOMMANDRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_DELETECOMMANDRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/DeleteCommandResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct DeleteCommandResponseMarshaller
-    {
-      static bool checkIntegrity(DeleteCommandResponse& e);
-      static bool checkIntegrityConst(const DeleteCommandResponse& e);
-    
-      static bool fromString(const std::string& s,DeleteCommandResponse& e);
-      static const std::string toString(const DeleteCommandResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,DeleteCommandResponse& e);
-      static Json::Value toJSON(const DeleteCommandResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilities.cpp
deleted file mode 100644
index 94737ac60..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilities.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetCapabilities.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-GetCapabilities& GetCapabilities::operator =(const GetCapabilities& c)
-{
-  return *this;
-}
-
-
-GetCapabilities::~GetCapabilities(void)
-{
-}
-
-
-GetCapabilities::GetCapabilities(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__GETCAPABILITIES)
-{
-}
-
-
-GetCapabilities::GetCapabilities(const GetCapabilities& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__GETCAPABILITIES,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetCapabilities::checkIntegrity(void)
-{
-  return GetCapabilitiesMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesMarshaller.cpp
deleted file mode 100644
index b22296f50..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetCapabilities.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/GetCapabilitiesMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool GetCapabilitiesMarshaller::checkIntegrity(GetCapabilities& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetCapabilitiesMarshaller::fromString(const std::string& s,GetCapabilities& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetCapabilitiesMarshaller::toString(const GetCapabilities& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetCapabilitiesMarshaller::checkIntegrityConst(const GetCapabilities& s)
-{
-  return true;
-}
-
-
-Json::Value GetCapabilitiesMarshaller::toJSON(const GetCapabilities& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VR.GetCapabilities");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetCapabilitiesMarshaller::fromJSON(const Json::Value& json,GetCapabilities& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VR.GetCapabilities"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesMarshaller.h
deleted file mode 100644
index 1136747da..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_GETCAPABILITIESMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_GETCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetCapabilities.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct GetCapabilitiesMarshaller
-    {
-      static bool checkIntegrity(GetCapabilities& e);
-      static bool checkIntegrityConst(const GetCapabilities& e);
-    
-      static bool fromString(const std::string& s,GetCapabilities& e);
-      static const std::string toString(const GetCapabilities& e);
-    
-      static bool fromJSON(const Json::Value& s,GetCapabilities& e);
-      static Json::Value toJSON(const GetCapabilities& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesResponse.cpp
deleted file mode 100644
index 2fdc952ae..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesResponse.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetCapabilitiesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-GetCapabilitiesResponse& GetCapabilitiesResponse::operator =(const GetCapabilitiesResponse& c)
-{
-  capabilities=c.capabilities;
-  return *this;
-}
-
-
-GetCapabilitiesResponse::~GetCapabilitiesResponse(void)
-{
-}
-
-
-GetCapabilitiesResponse::GetCapabilitiesResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__GETCAPABILITIESRESPONSE)
-{
-}
-
-
-GetCapabilitiesResponse::GetCapabilitiesResponse(const GetCapabilitiesResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__GETCAPABILITIESRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::VrCapabilities>& GetCapabilitiesResponse::get_capabilities(void)
-{
-  return capabilities;
-}
-
-bool GetCapabilitiesResponse::set_capabilities(const std::vector< NsSmartDeviceLinkRPCV2::VrCapabilities>& capabilities_)
-{
-  capabilities=capabilities_;
-  return true;
-}
-
-bool GetCapabilitiesResponse::checkIntegrity(void)
-{
-  return GetCapabilitiesResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesResponseMarshaller.cpp
deleted file mode 100644
index b8aeace1f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesResponseMarshaller.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetCapabilitiesResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/GetCapabilitiesResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool GetCapabilitiesResponseMarshaller::checkIntegrity(GetCapabilitiesResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetCapabilitiesResponseMarshaller::fromString(const std::string& s,GetCapabilitiesResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetCapabilitiesResponseMarshaller::toString(const GetCapabilitiesResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetCapabilitiesResponseMarshaller::checkIntegrityConst(const GetCapabilitiesResponse& s)
-{
-  {
-    unsigned int i=s.capabilities.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value GetCapabilitiesResponseMarshaller::toJSON(const GetCapabilitiesResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("VR.GetCapabilitiesResponse");
-
-  {
-    unsigned int i=e.capabilities.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::VrCapabilitiesMarshaller::toJSON(e.capabilities[i]);
-
-    json["result"]["capabilities"]=j;
-  }
-  return json;
-}
-
-
-bool GetCapabilitiesResponseMarshaller::fromJSON(const Json::Value& json,GetCapabilitiesResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("VR.GetCapabilitiesResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("capabilities") || !js["capabilities"].isArray())  return false;
-    {
-      unsigned int i=js["capabilities"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.capabilities.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::VrCapabilities t;
-        if(!NsSmartDeviceLinkRPCV2::VrCapabilitiesMarshaller::fromJSON(js["capabilities"][i],t))
-          return false;
-         c.capabilities[i]=t;
-      }
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesResponseMarshaller.h
deleted file mode 100644
index 243c1c48b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetCapabilitiesResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_GETCAPABILITIESRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_GETCAPABILITIESRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetCapabilitiesResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct GetCapabilitiesResponseMarshaller
-    {
-      static bool checkIntegrity(GetCapabilitiesResponse& e);
-      static bool checkIntegrityConst(const GetCapabilitiesResponse& e);
-    
-      static bool fromString(const std::string& s,GetCapabilitiesResponse& e);
-      static const std::string toString(const GetCapabilitiesResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetCapabilitiesResponse& e);
-      static Json::Value toJSON(const GetCapabilitiesResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguage.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguage.cpp
deleted file mode 100644
index c7282c494..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguage.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetLanguage.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-GetLanguage& GetLanguage::operator =(const GetLanguage& c)
-{
-  return *this;
-}
-
-
-GetLanguage::~GetLanguage(void)
-{
-}
-
-
-GetLanguage::GetLanguage(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__GETLANGUAGE)
-{
-}
-
-
-GetLanguage::GetLanguage(const GetLanguage& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__GETLANGUAGE,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetLanguage::checkIntegrity(void)
-{
-  return GetLanguageMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageMarshaller.cpp
deleted file mode 100644
index cf84bb503..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetLanguage.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/GetLanguageMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool GetLanguageMarshaller::checkIntegrity(GetLanguage& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetLanguageMarshaller::fromString(const std::string& s,GetLanguage& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetLanguageMarshaller::toString(const GetLanguage& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetLanguageMarshaller::checkIntegrityConst(const GetLanguage& s)
-{
-  return true;
-}
-
-
-Json::Value GetLanguageMarshaller::toJSON(const GetLanguage& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VR.GetLanguage");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetLanguageMarshaller::fromJSON(const Json::Value& json,GetLanguage& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VR.GetLanguage"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageMarshaller.h
deleted file mode 100644
index 58456a6bc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_GETLANGUAGEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_GETLANGUAGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetLanguage.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct GetLanguageMarshaller
-    {
-      static bool checkIntegrity(GetLanguage& e);
-      static bool checkIntegrityConst(const GetLanguage& e);
-    
-      static bool fromString(const std::string& s,GetLanguage& e);
-      static const std::string toString(const GetLanguage& e);
-    
-      static bool fromJSON(const Json::Value& s,GetLanguage& e);
-      static Json::Value toJSON(const GetLanguage& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageResponse.cpp
deleted file mode 100644
index 09542f5e8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageResponse.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetLanguageResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-GetLanguageResponse& GetLanguageResponse::operator =(const GetLanguageResponse& c)
-{
-  language=c.language;
-  return *this;
-}
-
-
-GetLanguageResponse::~GetLanguageResponse(void)
-{
-}
-
-
-GetLanguageResponse::GetLanguageResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__GETLANGUAGERESPONSE)
-{
-}
-
-
-GetLanguageResponse::GetLanguageResponse(const GetLanguageResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__GETLANGUAGERESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::Language& GetLanguageResponse::get_language(void)
-{
-  return language;
-}
-
-bool GetLanguageResponse::set_language(const NsSmartDeviceLinkRPCV2::Language& language_)
-{
-  language=language_;
-  return true;
-}
-
-bool GetLanguageResponse::checkIntegrity(void)
-{
-  return GetLanguageResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageResponseMarshaller.cpp
deleted file mode 100644
index 6ccd0ac06..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageResponseMarshaller.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetLanguageResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/GetLanguageResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool GetLanguageResponseMarshaller::checkIntegrity(GetLanguageResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetLanguageResponseMarshaller::fromString(const std::string& s,GetLanguageResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetLanguageResponseMarshaller::toString(const GetLanguageResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetLanguageResponseMarshaller::checkIntegrityConst(const GetLanguageResponse& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::LanguageMarshaller::checkIntegrityConst(s.language))  return false;
-
-  return true;
-}
-
-
-Json::Value GetLanguageResponseMarshaller::toJSON(const GetLanguageResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("VR.GetLanguageResponse");
-
-  json["result"]["language"]=NsSmartDeviceLinkRPCV2::LanguageMarshaller::toJSON(e.language);;
-  return json;
-}
-
-
-bool GetLanguageResponseMarshaller::fromJSON(const Json::Value& json,GetLanguageResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("VR.GetLanguageResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("language") || !NsSmartDeviceLinkRPCV2::LanguageMarshaller::fromJSON(js["language"],c.language))  return false;
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageResponseMarshaller.h
deleted file mode 100644
index 50f3610b1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetLanguageResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_GETLANGUAGERESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_GETLANGUAGERESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetLanguageResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct GetLanguageResponseMarshaller
-    {
-      static bool checkIntegrity(GetLanguageResponse& e);
-      static bool checkIntegrityConst(const GetLanguageResponse& e);
-    
-      static bool fromString(const std::string& s,GetLanguageResponse& e);
-      static const std::string toString(const GetLanguageResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetLanguageResponse& e);
-      static Json::Value toJSON(const GetLanguageResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguages.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguages.cpp
deleted file mode 100644
index bd9c31219..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguages.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetSupportedLanguages.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-GetSupportedLanguages& GetSupportedLanguages::operator =(const GetSupportedLanguages& c)
-{
-  return *this;
-}
-
-
-GetSupportedLanguages::~GetSupportedLanguages(void)
-{
-}
-
-
-GetSupportedLanguages::GetSupportedLanguages(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__GETSUPPORTEDLANGUAGES)
-{
-}
-
-
-GetSupportedLanguages::GetSupportedLanguages(const GetSupportedLanguages& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__GETSUPPORTEDLANGUAGES,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetSupportedLanguages::checkIntegrity(void)
-{
-  return GetSupportedLanguagesMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesMarshaller.cpp
deleted file mode 100644
index 7d7862d78..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetSupportedLanguages.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/GetSupportedLanguagesMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool GetSupportedLanguagesMarshaller::checkIntegrity(GetSupportedLanguages& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetSupportedLanguagesMarshaller::fromString(const std::string& s,GetSupportedLanguages& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetSupportedLanguagesMarshaller::toString(const GetSupportedLanguages& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetSupportedLanguagesMarshaller::checkIntegrityConst(const GetSupportedLanguages& s)
-{
-  return true;
-}
-
-
-Json::Value GetSupportedLanguagesMarshaller::toJSON(const GetSupportedLanguages& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VR.GetSupportedLanguages");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetSupportedLanguagesMarshaller::fromJSON(const Json::Value& json,GetSupportedLanguages& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VR.GetSupportedLanguages"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesMarshaller.h
deleted file mode 100644
index a18a11f5a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_GETSUPPORTEDLANGUAGESMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_GETSUPPORTEDLANGUAGESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetSupportedLanguages.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct GetSupportedLanguagesMarshaller
-    {
-      static bool checkIntegrity(GetSupportedLanguages& e);
-      static bool checkIntegrityConst(const GetSupportedLanguages& e);
-    
-      static bool fromString(const std::string& s,GetSupportedLanguages& e);
-      static const std::string toString(const GetSupportedLanguages& e);
-    
-      static bool fromJSON(const Json::Value& s,GetSupportedLanguages& e);
-      static Json::Value toJSON(const GetSupportedLanguages& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesResponse.cpp
deleted file mode 100644
index fb9aea6ec..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesResponse.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetSupportedLanguagesResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-GetSupportedLanguagesResponse& GetSupportedLanguagesResponse::operator =(const GetSupportedLanguagesResponse& c)
-{
-  languages=c.languages;
-  return *this;
-}
-
-
-GetSupportedLanguagesResponse::~GetSupportedLanguagesResponse(void)
-{
-}
-
-
-GetSupportedLanguagesResponse::GetSupportedLanguagesResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__GETSUPPORTEDLANGUAGESRESPONSE)
-{
-}
-
-
-GetSupportedLanguagesResponse::GetSupportedLanguagesResponse(const GetSupportedLanguagesResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__GETSUPPORTEDLANGUAGESRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::Language>& GetSupportedLanguagesResponse::get_languages(void)
-{
-  return languages;
-}
-
-bool GetSupportedLanguagesResponse::set_languages(const std::vector< NsSmartDeviceLinkRPCV2::Language>& languages_)
-{
-  languages=languages_;
-  return true;
-}
-
-bool GetSupportedLanguagesResponse::checkIntegrity(void)
-{
-  return GetSupportedLanguagesResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesResponseMarshaller.cpp
deleted file mode 100644
index 4c43853e3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesResponseMarshaller.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetSupportedLanguagesResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/GetSupportedLanguagesResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool GetSupportedLanguagesResponseMarshaller::checkIntegrity(GetSupportedLanguagesResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetSupportedLanguagesResponseMarshaller::fromString(const std::string& s,GetSupportedLanguagesResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetSupportedLanguagesResponseMarshaller::toString(const GetSupportedLanguagesResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetSupportedLanguagesResponseMarshaller::checkIntegrityConst(const GetSupportedLanguagesResponse& s)
-{
-  {
-    unsigned int i=s.languages.size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value GetSupportedLanguagesResponseMarshaller::toJSON(const GetSupportedLanguagesResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("VR.GetSupportedLanguagesResponse");
-
-  {
-    unsigned int i=e.languages.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::LanguageMarshaller::toJSON(e.languages[i]);
-
-    json["result"]["languages"]=j;
-  }
-  return json;
-}
-
-
-bool GetSupportedLanguagesResponseMarshaller::fromJSON(const Json::Value& json,GetSupportedLanguagesResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("VR.GetSupportedLanguagesResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("languages") || !js["languages"].isArray())  return false;
-    {
-      unsigned int i=js["languages"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-      c.languages.resize(i);
-      while(i--)
-      {
-        NsSmartDeviceLinkRPCV2::Language t;
-        if(!NsSmartDeviceLinkRPCV2::LanguageMarshaller::fromJSON(js["languages"][i],t))
-          return false;
-         c.languages[i]=t;
-      }
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesResponseMarshaller.h
deleted file mode 100644
index 998a5c093..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/GetSupportedLanguagesResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_GETSUPPORTEDLANGUAGESRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_GETSUPPORTEDLANGUAGESRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/GetSupportedLanguagesResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct GetSupportedLanguagesResponseMarshaller
-    {
-      static bool checkIntegrity(GetSupportedLanguagesResponse& e);
-      static bool checkIntegrityConst(const GetSupportedLanguagesResponse& e);
-    
-      static bool fromString(const std::string& s,GetSupportedLanguagesResponse& e);
-      static const std::string toString(const GetSupportedLanguagesResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetSupportedLanguagesResponse& e);
-      static Json::Value toJSON(const GetSupportedLanguagesResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnCommand.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnCommand.cpp
deleted file mode 100644
index b40b2b0ac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnCommand.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/OnCommand.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-OnCommand& OnCommand::operator =(const OnCommand& c)
-{
-  cmdID=c.cmdID;
-  appId=c.appId;
-  return *this;
-}
-
-
-OnCommand::~OnCommand(void)
-{
-}
-
-
-OnCommand::OnCommand(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__ONCOMMAND)
-{
-}
-
-
-OnCommand::OnCommand(const OnCommand& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__ONCOMMAND)
-{
-  *this=c;
-}
-
-
-unsigned int OnCommand::get_cmdID(void)
-{
-  return cmdID;
-}
-
-bool OnCommand::set_cmdID(unsigned int cmdID_)
-{
-  cmdID=cmdID_;
-  return true;
-}
-
-int OnCommand::get_appId(void)
-{
-  return appId;
-}
-
-bool OnCommand::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool OnCommand::checkIntegrity(void)
-{
-  return OnCommandMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnCommandMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnCommandMarshaller.cpp
deleted file mode 100644
index dac3df5aa..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnCommandMarshaller.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/OnCommand.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/OnCommandMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool OnCommandMarshaller::checkIntegrity(OnCommand& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnCommandMarshaller::fromString(const std::string& s,OnCommand& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnCommandMarshaller::toString(const OnCommand& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnCommandMarshaller::checkIntegrityConst(const OnCommand& s)
-{
-  if(s.cmdID>2000000000)  return false;
-
-  return true;
-}
-
-
-Json::Value OnCommandMarshaller::toJSON(const OnCommand& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VR.OnCommand");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["cmdID"]=Json::Value(e.cmdID);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool OnCommandMarshaller::fromJSON(const Json::Value& json,OnCommand& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VR.OnCommand"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("cmdID") || !js["cmdID"].isInt())  return false;
-    c.cmdID=js["cmdID"].asInt();
-    if(c.cmdID>2000000000)  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnCommandMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnCommandMarshaller.h
deleted file mode 100644
index 0e523d280..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnCommandMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_ONCOMMANDMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_ONCOMMANDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/OnCommand.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct OnCommandMarshaller
-    {
-      static bool checkIntegrity(OnCommand& e);
-      static bool checkIntegrityConst(const OnCommand& e);
-    
-      static bool fromString(const std::string& s,OnCommand& e);
-      static const std::string toString(const OnCommand& e);
-    
-      static bool fromJSON(const Json::Value& s,OnCommand& e);
-      static Json::Value toJSON(const OnCommand& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnLanguageChange.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnLanguageChange.cpp
deleted file mode 100644
index 4f7b7605d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnLanguageChange.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/OnLanguageChange.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-
-OnLanguageChange& OnLanguageChange::operator =(const OnLanguageChange& c)
-{
-  language=c.language;
-  return *this;
-}
-
-
-OnLanguageChange::~OnLanguageChange(void)
-{
-}
-
-
-OnLanguageChange::OnLanguageChange(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__ONLANGUAGECHANGE)
-{
-}
-
-
-OnLanguageChange::OnLanguageChange(const OnLanguageChange& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_VR__ONLANGUAGECHANGE)
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::Language& OnLanguageChange::get_language(void)
-{
-  return language;
-}
-
-bool OnLanguageChange::set_language(const NsSmartDeviceLinkRPCV2::Language& language_)
-{
-  language=language_;
-  return true;
-}
-
-bool OnLanguageChange::checkIntegrity(void)
-{
-  return OnLanguageChangeMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnLanguageChangeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnLanguageChangeMarshaller.cpp
deleted file mode 100644
index 34d9ab363..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnLanguageChangeMarshaller.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/OnLanguageChange.h"
-#include "../src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VR/OnLanguageChangeMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VR
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VR;
-
-bool OnLanguageChangeMarshaller::checkIntegrity(OnLanguageChange& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnLanguageChangeMarshaller::fromString(const std::string& s,OnLanguageChange& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnLanguageChangeMarshaller::toString(const OnLanguageChange& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnLanguageChangeMarshaller::checkIntegrityConst(const OnLanguageChange& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::LanguageMarshaller::checkIntegrityConst(s.language))  return false;
-
-  return true;
-}
-
-
-Json::Value OnLanguageChangeMarshaller::toJSON(const OnLanguageChange& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VR.OnLanguageChange");
-  json["params"]=Json::Value(Json::objectValue);
-
-  json["params"]["language"]=NsSmartDeviceLinkRPCV2::LanguageMarshaller::toJSON(e.language);;
-  return json;
-}
-
-
-bool OnLanguageChangeMarshaller::fromJSON(const Json::Value& json,OnLanguageChange& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VR.OnLanguageChange"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("language") || !NsSmartDeviceLinkRPCV2::LanguageMarshaller::fromJSON(js["language"],c.language))  return false;
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnLanguageChangeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnLanguageChangeMarshaller.h
deleted file mode 100644
index b80d7b952..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VR/OnLanguageChangeMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VR_ONLANGUAGECHANGEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VR_ONLANGUAGECHANGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VR/OnLanguageChange.h"
-
-namespace NsRPC2Communication
-{
-  namespace VR
-  {
-
-    struct OnLanguageChangeMarshaller
-    {
-      static bool checkIntegrity(OnLanguageChange& e);
-      static bool checkIntegrityConst(const OnLanguageChange& e);
-    
-      static bool fromString(const std::string& s,OnLanguageChange& e);
-      static const std::string toString(const OnLanguageChange& e);
-    
-      static bool fromJSON(const Json::Value& s,OnLanguageChange& e);
-      static Json::Value toJSON(const OnLanguageChange& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCs.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCs.cpp
deleted file mode 100644
index a3c87aca2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCs.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetDTCs.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-
-GetDTCs& GetDTCs::operator =(const GetDTCs& c)
-{
-  ecuName=c.ecuName;
-  if(encrypted)  delete encrypted;
-  encrypted= c.encrypted ? new bool(c.encrypted[0]) : 0;
-  appId=c.appId;
-  return *this;
-}
-
-
-GetDTCs::~GetDTCs(void)
-{
-  if(encrypted)  delete encrypted;
-}
-
-
-GetDTCs::GetDTCs(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETDTCS),
-  encrypted(0)
-{
-}
-
-
-GetDTCs::GetDTCs(const GetDTCs& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETDTCS,c.getId())
-{
-  *this=c;
-}
-
-
-unsigned int GetDTCs::get_ecuName(void)
-{
-  return ecuName;
-}
-
-bool GetDTCs::set_ecuName(unsigned int ecuName_)
-{
-  ecuName=ecuName_;
-  return true;
-}
-
-const bool* GetDTCs::get_encrypted(void)
-{
-  return encrypted;
-}
-
-bool GetDTCs::set_encrypted(const bool& encrypted_)
-{
-  if(encrypted)  delete encrypted;
-  encrypted=new bool(encrypted_);
-  return true;
-}
-
-void GetDTCs::reset_encrypted(void)
-{
-  if(encrypted)  delete encrypted;
-  encrypted=0;
-}
-
-int GetDTCs::get_appId(void)
-{
-  return appId;
-}
-
-bool GetDTCs::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool GetDTCs::checkIntegrity(void)
-{
-  return GetDTCsMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsMarshaller.cpp
deleted file mode 100644
index f02c40215..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsMarshaller.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetDTCs.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/GetDTCsMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-bool GetDTCsMarshaller::checkIntegrity(GetDTCs& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetDTCsMarshaller::fromString(const std::string& s,GetDTCs& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetDTCsMarshaller::toString(const GetDTCs& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetDTCsMarshaller::checkIntegrityConst(const GetDTCs& s)
-{
-  if(s.ecuName>65535)  return false;
-
-  return true;
-}
-
-
-Json::Value GetDTCsMarshaller::toJSON(const GetDTCs& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VehicleInfo.GetDTCs");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["ecuName"]=Json::Value(e.ecuName);;
-  if(e.encrypted)
-    json["params"]["encrypted"]=Json::Value(e.encrypted[0]);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool GetDTCsMarshaller::fromJSON(const Json::Value& json,GetDTCs& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VehicleInfo.GetDTCs"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("ecuName") || !js["ecuName"].isInt())  return false;
-    c.ecuName=js["ecuName"].asInt();
-    if(c.ecuName>65535)  return false;
-
-    if(c.encrypted)  delete c.encrypted;
-    c.encrypted=0;
-    if(js.isMember("encrypted"))
-    {
-      if(!js["encrypted"].isBool())  return false;
-      c.encrypted=new bool();
-      c.encrypted[0]=js["encrypted"].asBool();
-      
-    }
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsMarshaller.h
deleted file mode 100644
index aae1bde8d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_GETDTCSMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_GETDTCSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetDTCs.h"
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    struct GetDTCsMarshaller
-    {
-      static bool checkIntegrity(GetDTCs& e);
-      static bool checkIntegrityConst(const GetDTCs& e);
-    
-      static bool fromString(const std::string& s,GetDTCs& e);
-      static const std::string toString(const GetDTCs& e);
-    
-      static bool fromJSON(const Json::Value& s,GetDTCs& e);
-      static Json::Value toJSON(const GetDTCs& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsResponse.cpp
deleted file mode 100644
index 04d170d97..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsResponse.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetDTCsResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-
-GetDTCsResponse& GetDTCsResponse::operator =(const GetDTCsResponse& c)
-{
-  if(dtcList)  delete dtcList;
-  dtcList= c.dtcList ? new std::vector<NsSmartDeviceLinkRPCV2::DTC>(c.dtcList[0]) : 0;
-  return *this;
-}
-
-
-GetDTCsResponse::~GetDTCsResponse(void)
-{
-  if(dtcList)  delete dtcList;
-}
-
-
-GetDTCsResponse::GetDTCsResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETDTCSRESPONSE),
-  dtcList(0)
-{
-}
-
-
-GetDTCsResponse::GetDTCsResponse(const GetDTCsResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETDTCSRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::DTC>* GetDTCsResponse::get_dtcList(void)
-{
-  return dtcList;
-}
-
-bool GetDTCsResponse::set_dtcList(const std::vector< NsSmartDeviceLinkRPCV2::DTC>& dtcList_)
-{
-  if(dtcList)  delete dtcList;
-  dtcList=new std::vector< NsSmartDeviceLinkRPCV2::DTC>(dtcList_);
-  return true;
-}
-
-void GetDTCsResponse::reset_dtcList(void)
-{
-  if(dtcList)  delete dtcList;
-  dtcList=0;
-}
-
-bool GetDTCsResponse::checkIntegrity(void)
-{
-  return GetDTCsResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsResponseMarshaller.cpp
deleted file mode 100644
index c2cd4ec6c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsResponseMarshaller.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetDTCsResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/DTCMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/GetDTCsResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-bool GetDTCsResponseMarshaller::checkIntegrity(GetDTCsResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetDTCsResponseMarshaller::fromString(const std::string& s,GetDTCsResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetDTCsResponseMarshaller::toString(const GetDTCsResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetDTCsResponseMarshaller::checkIntegrityConst(const GetDTCsResponse& s)
-{
-  if(s.dtcList)
-  {
-    unsigned int i=s.dtcList[0].size();
-    if(i<1)  return false;
-    if(i>100)  return false;
-  }
-
-  return true;
-}
-
-
-Json::Value GetDTCsResponseMarshaller::toJSON(const GetDTCsResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("VehicleInfo.GetDTCsResponse");
-
-  if(e.dtcList)
-  {
-    unsigned int i=e.dtcList[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::DTCMarshaller::toJSON(e.dtcList[0][i]);
-
-    json["result"]["dtcList"]=j;
-  }
-  return json;
-}
-
-
-bool GetDTCsResponseMarshaller::fromJSON(const Json::Value& json,GetDTCsResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("VehicleInfo.GetDTCsResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(c.dtcList)  delete c.dtcList;
-    c.dtcList=0;
-    if(js.isMember("dtcList"))
-    {
-      if(!js["dtcList"].isArray()) return false;
-      unsigned int i=js["dtcList"].size();
-      if(i<1)  return false;
-      if(i>100)  return false;
-
-      c.dtcList=new std::vector<NsSmartDeviceLinkRPCV2::DTC>();
-      c.dtcList->resize(js["dtcList"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::DTCMarshaller::fromJSON(js["dtcList"][i],c.dtcList[0][i]))  return false;
-    }
-
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsResponseMarshaller.h
deleted file mode 100644
index 9737b7f96..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetDTCsResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_GETDTCSRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_GETDTCSRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetDTCsResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    struct GetDTCsResponseMarshaller
-    {
-      static bool checkIntegrity(GetDTCsResponse& e);
-      static bool checkIntegrityConst(const GetDTCsResponse& e);
-    
-      static bool fromString(const std::string& s,GetDTCsResponse& e);
-      static const std::string toString(const GetDTCsResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetDTCsResponse& e);
-      static Json::Value toJSON(const GetDTCsResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleData.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleData.cpp
deleted file mode 100644
index 89ea015b3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleData.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleData.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-
-GetVehicleData& GetVehicleData::operator =(const GetVehicleData& c)
-{
-  dataType=c.dataType;
-  appId=c.appId;
-  return *this;
-}
-
-
-GetVehicleData::~GetVehicleData(void)
-{
-}
-
-
-GetVehicleData::GetVehicleData(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLEDATA)
-{
-}
-
-
-GetVehicleData::GetVehicleData(const GetVehicleData& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLEDATA,c.getId())
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::VehicleDataType& GetVehicleData::get_dataType(void)
-{
-  return dataType;
-}
-
-bool GetVehicleData::set_dataType(const NsSmartDeviceLinkRPCV2::VehicleDataType& dataType_)
-{
-  dataType=dataType_;
-  return true;
-}
-
-int GetVehicleData::get_appId(void)
-{
-  return appId;
-}
-
-bool GetVehicleData::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool GetVehicleData::checkIntegrity(void)
-{
-  return GetVehicleDataMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataMarshaller.cpp
deleted file mode 100644
index 338a3852c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataMarshaller.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleData.h"
-#include "../src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/GetVehicleDataMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-bool GetVehicleDataMarshaller::checkIntegrity(GetVehicleData& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetVehicleDataMarshaller::fromString(const std::string& s,GetVehicleData& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetVehicleDataMarshaller::toString(const GetVehicleData& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetVehicleDataMarshaller::checkIntegrityConst(const GetVehicleData& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::VehicleDataTypeMarshaller::checkIntegrityConst(s.dataType))  return false;
-
-  return true;
-}
-
-
-Json::Value GetVehicleDataMarshaller::toJSON(const GetVehicleData& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VehicleInfo.GetVehicleData");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["dataType"]=NsSmartDeviceLinkRPCV2::VehicleDataTypeMarshaller::toJSON(e.dataType);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool GetVehicleDataMarshaller::fromJSON(const Json::Value& json,GetVehicleData& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VehicleInfo.GetVehicleData"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("dataType") || !NsSmartDeviceLinkRPCV2::VehicleDataTypeMarshaller::fromJSON(js["dataType"],c.dataType))  return false;
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataMarshaller.h
deleted file mode 100644
index d5137291a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLEDATAMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLEDATAMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleData.h"
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    struct GetVehicleDataMarshaller
-    {
-      static bool checkIntegrity(GetVehicleData& e);
-      static bool checkIntegrityConst(const GetVehicleData& e);
-    
-      static bool fromString(const std::string& s,GetVehicleData& e);
-      static const std::string toString(const GetVehicleData& e);
-    
-      static bool fromJSON(const Json::Value& s,GetVehicleData& e);
-      static Json::Value toJSON(const GetVehicleData& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataResponse.cpp
deleted file mode 100644
index 0f26b8428..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataResponse.cpp
+++ /dev/null
@@ -1,447 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleDataResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-
-GetVehicleDataResponse& GetVehicleDataResponse::operator =(const GetVehicleDataResponse& c)
-{
-  if(gps)  delete gps;
-  gps= c.gps ? new NsSmartDeviceLinkRPCV2::GPSData(c.gps[0]) : 0;
-  if(speed)  delete speed;
-  speed= c.speed ? new float(c.speed[0]) : 0;
-  if(rpm)  delete rpm;
-  rpm= c.rpm ? new unsigned int(c.rpm[0]) : 0;
-  if(fuelLevel)  delete fuelLevel;
-  fuelLevel= c.fuelLevel ? new float(c.fuelLevel[0]) : 0;
-  if(avgFuelEconomy)  delete avgFuelEconomy;
-  avgFuelEconomy= c.avgFuelEconomy ? new float(c.avgFuelEconomy[0]) : 0;
-  if(batteryVoltage)  delete batteryVoltage;
-  batteryVoltage= c.batteryVoltage ? new float(c.batteryVoltage[0]) : 0;
-  if(externalTemperature)  delete externalTemperature;
-  externalTemperature= c.externalTemperature ? new float(c.externalTemperature[0]) : 0;
-  if(vin)  delete vin;
-  vin= c.vin ? new std::string(c.vin[0]) : 0;
-  if(prndl)  delete prndl;
-  prndl= c.prndl ? new NsSmartDeviceLinkRPCV2::PRNDL(c.prndl[0]) : 0;
-  if(tirePressure)  delete tirePressure;
-  tirePressure= c.tirePressure ? new NsSmartDeviceLinkRPCV2::TireStatus(c.tirePressure[0]) : 0;
-  if(batteryPackVoltage)  delete batteryPackVoltage;
-  batteryPackVoltage= c.batteryPackVoltage ? new float(c.batteryPackVoltage[0]) : 0;
-  if(batteryPackCurrent)  delete batteryPackCurrent;
-  batteryPackCurrent= c.batteryPackCurrent ? new float(c.batteryPackCurrent[0]) : 0;
-  if(batteryPackTemperature)  delete batteryPackTemperature;
-  batteryPackTemperature= c.batteryPackTemperature ? new int(c.batteryPackTemperature[0]) : 0;
-  if(engineTorque)  delete engineTorque;
-  engineTorque= c.engineTorque ? new int(c.engineTorque[0]) : 0;
-  if(odometer)  delete odometer;
-  odometer= c.odometer ? new unsigned int(c.odometer[0]) : 0;
-  if(tripOdometer)  delete tripOdometer;
-  tripOdometer= c.tripOdometer ? new unsigned int(c.tripOdometer[0]) : 0;
-  if(satRadioESN)  delete satRadioESN;
-  satRadioESN= c.satRadioESN ? new std::string(c.satRadioESN[0]) : 0;
-  return *this;
-}
-
-
-GetVehicleDataResponse::~GetVehicleDataResponse(void)
-{
-  if(gps)  delete gps;
-  if(speed)  delete speed;
-  if(rpm)  delete rpm;
-  if(fuelLevel)  delete fuelLevel;
-  if(avgFuelEconomy)  delete avgFuelEconomy;
-  if(batteryVoltage)  delete batteryVoltage;
-  if(externalTemperature)  delete externalTemperature;
-  if(vin)  delete vin;
-  if(prndl)  delete prndl;
-  if(tirePressure)  delete tirePressure;
-  if(batteryPackVoltage)  delete batteryPackVoltage;
-  if(batteryPackCurrent)  delete batteryPackCurrent;
-  if(batteryPackTemperature)  delete batteryPackTemperature;
-  if(engineTorque)  delete engineTorque;
-  if(odometer)  delete odometer;
-  if(tripOdometer)  delete tripOdometer;
-  if(satRadioESN)  delete satRadioESN;
-}
-
-
-GetVehicleDataResponse::GetVehicleDataResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLEDATARESPONSE),
-  gps(0),
-  speed(0),
-  rpm(0),
-  fuelLevel(0),
-  avgFuelEconomy(0),
-  batteryVoltage(0),
-  externalTemperature(0),
-  vin(0),
-  prndl(0),
-  tirePressure(0),
-  batteryPackVoltage(0),
-  batteryPackCurrent(0),
-  batteryPackTemperature(0),
-  engineTorque(0),
-  odometer(0),
-  tripOdometer(0),
-  satRadioESN(0)
-{
-}
-
-
-GetVehicleDataResponse::GetVehicleDataResponse(const GetVehicleDataResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLEDATARESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::GPSData* GetVehicleDataResponse::get_gps(void)
-{
-  return gps;
-}
-
-bool GetVehicleDataResponse::set_gps(const NsSmartDeviceLinkRPCV2::GPSData& gps_)
-{
-  if(gps)  delete gps;
-  gps=new NsSmartDeviceLinkRPCV2::GPSData(gps_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_gps(void)
-{
-  if(gps)  delete gps;
-  gps=0;
-}
-
-const float* GetVehicleDataResponse::get_speed(void)
-{
-  return speed;
-}
-
-bool GetVehicleDataResponse::set_speed(const float& speed_)
-{
-  if(speed)  delete speed;
-  speed=new float(speed_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_speed(void)
-{
-  if(speed)  delete speed;
-  speed=0;
-}
-
-const unsigned int* GetVehicleDataResponse::get_rpm(void)
-{
-  return rpm;
-}
-
-bool GetVehicleDataResponse::set_rpm(const unsigned int& rpm_)
-{
-  if(rpm)  delete rpm;
-  rpm=new unsigned int(rpm_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_rpm(void)
-{
-  if(rpm)  delete rpm;
-  rpm=0;
-}
-
-const float* GetVehicleDataResponse::get_fuelLevel(void)
-{
-  return fuelLevel;
-}
-
-bool GetVehicleDataResponse::set_fuelLevel(const float& fuelLevel_)
-{
-  if(fuelLevel)  delete fuelLevel;
-  fuelLevel=new float(fuelLevel_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_fuelLevel(void)
-{
-  if(fuelLevel)  delete fuelLevel;
-  fuelLevel=0;
-}
-
-const float* GetVehicleDataResponse::get_avgFuelEconomy(void)
-{
-  return avgFuelEconomy;
-}
-
-bool GetVehicleDataResponse::set_avgFuelEconomy(const float& avgFuelEconomy_)
-{
-  if(avgFuelEconomy)  delete avgFuelEconomy;
-  avgFuelEconomy=new float(avgFuelEconomy_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_avgFuelEconomy(void)
-{
-  if(avgFuelEconomy)  delete avgFuelEconomy;
-  avgFuelEconomy=0;
-}
-
-const float* GetVehicleDataResponse::get_batteryVoltage(void)
-{
-  return batteryVoltage;
-}
-
-bool GetVehicleDataResponse::set_batteryVoltage(const float& batteryVoltage_)
-{
-  if(batteryVoltage)  delete batteryVoltage;
-  batteryVoltage=new float(batteryVoltage_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_batteryVoltage(void)
-{
-  if(batteryVoltage)  delete batteryVoltage;
-  batteryVoltage=0;
-}
-
-const float* GetVehicleDataResponse::get_externalTemperature(void)
-{
-  return externalTemperature;
-}
-
-bool GetVehicleDataResponse::set_externalTemperature(const float& externalTemperature_)
-{
-  if(externalTemperature)  delete externalTemperature;
-  externalTemperature=new float(externalTemperature_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_externalTemperature(void)
-{
-  if(externalTemperature)  delete externalTemperature;
-  externalTemperature=0;
-}
-
-const std::string* GetVehicleDataResponse::get_vin(void)
-{
-  return vin;
-}
-
-bool GetVehicleDataResponse::set_vin(const std::string& vin_)
-{
-  if(vin)  delete vin;
-  vin=new std::string(vin_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_vin(void)
-{
-  if(vin)  delete vin;
-  vin=0;
-}
-
-const NsSmartDeviceLinkRPCV2::PRNDL* GetVehicleDataResponse::get_prndl(void)
-{
-  return prndl;
-}
-
-bool GetVehicleDataResponse::set_prndl(const NsSmartDeviceLinkRPCV2::PRNDL& prndl_)
-{
-  if(prndl)  delete prndl;
-  prndl=new NsSmartDeviceLinkRPCV2::PRNDL(prndl_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_prndl(void)
-{
-  if(prndl)  delete prndl;
-  prndl=0;
-}
-
-const NsSmartDeviceLinkRPCV2::TireStatus* GetVehicleDataResponse::get_tirePressure(void)
-{
-  return tirePressure;
-}
-
-bool GetVehicleDataResponse::set_tirePressure(const NsSmartDeviceLinkRPCV2::TireStatus& tirePressure_)
-{
-  if(tirePressure)  delete tirePressure;
-  tirePressure=new NsSmartDeviceLinkRPCV2::TireStatus(tirePressure_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_tirePressure(void)
-{
-  if(tirePressure)  delete tirePressure;
-  tirePressure=0;
-}
-
-const float* GetVehicleDataResponse::get_batteryPackVoltage(void)
-{
-  return batteryPackVoltage;
-}
-
-bool GetVehicleDataResponse::set_batteryPackVoltage(const float& batteryPackVoltage_)
-{
-  if(batteryPackVoltage)  delete batteryPackVoltage;
-  batteryPackVoltage=new float(batteryPackVoltage_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_batteryPackVoltage(void)
-{
-  if(batteryPackVoltage)  delete batteryPackVoltage;
-  batteryPackVoltage=0;
-}
-
-const float* GetVehicleDataResponse::get_batteryPackCurrent(void)
-{
-  return batteryPackCurrent;
-}
-
-bool GetVehicleDataResponse::set_batteryPackCurrent(const float& batteryPackCurrent_)
-{
-  if(batteryPackCurrent)  delete batteryPackCurrent;
-  batteryPackCurrent=new float(batteryPackCurrent_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_batteryPackCurrent(void)
-{
-  if(batteryPackCurrent)  delete batteryPackCurrent;
-  batteryPackCurrent=0;
-}
-
-const int* GetVehicleDataResponse::get_batteryPackTemperature(void)
-{
-  return batteryPackTemperature;
-}
-
-bool GetVehicleDataResponse::set_batteryPackTemperature(const int& batteryPackTemperature_)
-{
-  if(batteryPackTemperature)  delete batteryPackTemperature;
-  batteryPackTemperature=new int(batteryPackTemperature_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_batteryPackTemperature(void)
-{
-  if(batteryPackTemperature)  delete batteryPackTemperature;
-  batteryPackTemperature=0;
-}
-
-const int* GetVehicleDataResponse::get_engineTorque(void)
-{
-  return engineTorque;
-}
-
-bool GetVehicleDataResponse::set_engineTorque(const int& engineTorque_)
-{
-  if(engineTorque)  delete engineTorque;
-  engineTorque=new int(engineTorque_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_engineTorque(void)
-{
-  if(engineTorque)  delete engineTorque;
-  engineTorque=0;
-}
-
-const unsigned int* GetVehicleDataResponse::get_odometer(void)
-{
-  return odometer;
-}
-
-bool GetVehicleDataResponse::set_odometer(const unsigned int& odometer_)
-{
-  if(odometer)  delete odometer;
-  odometer=new unsigned int(odometer_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_odometer(void)
-{
-  if(odometer)  delete odometer;
-  odometer=0;
-}
-
-const unsigned int* GetVehicleDataResponse::get_tripOdometer(void)
-{
-  return tripOdometer;
-}
-
-bool GetVehicleDataResponse::set_tripOdometer(const unsigned int& tripOdometer_)
-{
-  if(tripOdometer)  delete tripOdometer;
-  tripOdometer=new unsigned int(tripOdometer_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_tripOdometer(void)
-{
-  if(tripOdometer)  delete tripOdometer;
-  tripOdometer=0;
-}
-
-const std::string* GetVehicleDataResponse::get_satRadioESN(void)
-{
-  return satRadioESN;
-}
-
-bool GetVehicleDataResponse::set_satRadioESN(const std::string& satRadioESN_)
-{
-  if(satRadioESN)  delete satRadioESN;
-  satRadioESN=new std::string(satRadioESN_);
-  return true;
-}
-
-void GetVehicleDataResponse::reset_satRadioESN(void)
-{
-  if(satRadioESN)  delete satRadioESN;
-  satRadioESN=0;
-}
-
-bool GetVehicleDataResponse::checkIntegrity(void)
-{
-  return GetVehicleDataResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataResponseMarshaller.cpp
deleted file mode 100644
index b6179c15f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataResponseMarshaller.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleDataResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/GetVehicleDataResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-bool GetVehicleDataResponseMarshaller::checkIntegrity(GetVehicleDataResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetVehicleDataResponseMarshaller::fromString(const std::string& s,GetVehicleDataResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetVehicleDataResponseMarshaller::toString(const GetVehicleDataResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetVehicleDataResponseMarshaller::checkIntegrityConst(const GetVehicleDataResponse& s)
-{
-  if(s.gps && (!NsSmartDeviceLinkRPCV2::GPSDataMarshaller::checkIntegrityConst(s.gps[0])))  return false;
-
-  if(s.speed && (s.speed[0]<-100 || s.speed[0]>500))  return false;
-
-  if(s.rpm && (s.rpm[0]>20000))  return false;
-
-  if(s.fuelLevel && (s.fuelLevel[0]<0 || s.fuelLevel[0]>100))  return false;
-
-  if(s.avgFuelEconomy && (s.avgFuelEconomy[0]<0 || s.avgFuelEconomy[0]>7000))  return false;
-
-  if(s.batteryVoltage && (s.batteryVoltage[0]<0 || s.batteryVoltage[0]>26))  return false;
-
-  if(s.externalTemperature && (s.externalTemperature[0]<-40 || s.externalTemperature[0]>100))  return false;
-
-  if(s.vin && (s.vin[0].length()>17))  return false;
-
-  if(s.prndl && (!NsSmartDeviceLinkRPCV2::PRNDLMarshaller::checkIntegrityConst(s.prndl[0])))  return false;
-
-  if(s.tirePressure && (!NsSmartDeviceLinkRPCV2::TireStatusMarshaller::checkIntegrityConst(s.tirePressure[0])))  return false;
-
-  if(s.batteryPackVoltage && (s.batteryPackVoltage[0]<-1000 || s.batteryPackVoltage[0]>1000))  return false;
-
-  if(s.batteryPackCurrent && (s.batteryPackCurrent[0]<-1000 || s.batteryPackCurrent[0]>1000))  return false;
-
-  if(s.batteryPackTemperature && (s.batteryPackTemperature[0]<-50 || s.batteryPackTemperature[0]>250))  return false;
-
-  if(s.engineTorque && (s.engineTorque[0]<-10000 || s.engineTorque[0]>55000))  return false;
-
-  if(s.odometer && (s.odometer[0]>2000000))  return false;
-
-  if(s.tripOdometer && (s.tripOdometer[0]>2000000))  return false;
-
-  if(s.satRadioESN && (s.satRadioESN[0].length()>500))  return false;
-
-  return true;
-}
-
-
-Json::Value GetVehicleDataResponseMarshaller::toJSON(const GetVehicleDataResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("VehicleInfo.GetVehicleDataResponse");
-
-  if(e.gps)
-    json["result"]["gps"]=NsSmartDeviceLinkRPCV2::GPSDataMarshaller::toJSON(e.gps[0]);;
-  if(e.speed)
-    json["result"]["speed"]=Json::Value(e.speed[0]);;
-  if(e.rpm)
-    json["result"]["rpm"]=Json::Value(e.rpm[0]);;
-  if(e.fuelLevel)
-    json["result"]["fuelLevel"]=Json::Value(e.fuelLevel[0]);;
-  if(e.avgFuelEconomy)
-    json["result"]["avgFuelEconomy"]=Json::Value(e.avgFuelEconomy[0]);;
-  if(e.batteryVoltage)
-    json["result"]["batteryVoltage"]=Json::Value(e.batteryVoltage[0]);;
-  if(e.externalTemperature)
-    json["result"]["externalTemperature"]=Json::Value(e.externalTemperature[0]);;
-  if(e.vin)
-    json["result"]["vin"]=Json::Value(e.vin[0]);;
-  if(e.prndl)
-    json["result"]["prndl"]=NsSmartDeviceLinkRPCV2::PRNDLMarshaller::toJSON(e.prndl[0]);;
-  if(e.tirePressure)
-    json["result"]["tirePressure"]=NsSmartDeviceLinkRPCV2::TireStatusMarshaller::toJSON(e.tirePressure[0]);;
-  if(e.batteryPackVoltage)
-    json["result"]["batteryPackVoltage"]=Json::Value(e.batteryPackVoltage[0]);;
-  if(e.batteryPackCurrent)
-    json["result"]["batteryPackCurrent"]=Json::Value(e.batteryPackCurrent[0]);;
-  if(e.batteryPackTemperature)
-    json["result"]["batteryPackTemperature"]=Json::Value(e.batteryPackTemperature[0]);;
-  if(e.engineTorque)
-    json["result"]["engineTorque"]=Json::Value(e.engineTorque[0]);;
-  if(e.odometer)
-    json["result"]["odometer"]=Json::Value(e.odometer[0]);;
-  if(e.tripOdometer)
-    json["result"]["tripOdometer"]=Json::Value(e.tripOdometer[0]);;
-  if(e.satRadioESN)
-    json["result"]["satRadioESN"]=Json::Value(e.satRadioESN[0]);;
-  return json;
-}
-
-
-bool GetVehicleDataResponseMarshaller::fromJSON(const Json::Value& json,GetVehicleDataResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("VehicleInfo.GetVehicleDataResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(c.gps)  delete c.gps;
-    c.gps=0;
-    if(js.isMember("gps"))
-    {
-      c.gps=new NsSmartDeviceLinkRPCV2::GPSData();
-      if(!NsSmartDeviceLinkRPCV2::GPSDataMarshaller::fromJSON(js["gps"],c.gps[0]))  return false;
-    }
-
-    if(c.speed)  delete c.speed;
-    c.speed=0;
-    if(js.isMember("speed"))
-    {
-      if(!js["speed"].isNumeric())  return false;
-      c.speed=new float();
-      c.speed[0]=js["speed"].asDouble();
-      if(c.speed[0]<-100 || c.speed[0]>500)  return false;
-
-    }
-
-    if(c.rpm)  delete c.rpm;
-    c.rpm=0;
-    if(js.isMember("rpm"))
-    {
-      if(!js["rpm"].isInt())  return false;
-      c.rpm=new unsigned int();
-      c.rpm[0]=js["rpm"].asInt();
-      if(c.rpm[0]>20000)  return false;
-
-    }
-
-    if(c.fuelLevel)  delete c.fuelLevel;
-    c.fuelLevel=0;
-    if(js.isMember("fuelLevel"))
-    {
-      if(!js["fuelLevel"].isNumeric())  return false;
-      c.fuelLevel=new float();
-      c.fuelLevel[0]=js["fuelLevel"].asDouble();
-      if(c.fuelLevel[0]<0 || c.fuelLevel[0]>100)  return false;
-
-    }
-
-    if(c.avgFuelEconomy)  delete c.avgFuelEconomy;
-    c.avgFuelEconomy=0;
-    if(js.isMember("avgFuelEconomy"))
-    {
-      if(!js["avgFuelEconomy"].isNumeric())  return false;
-      c.avgFuelEconomy=new float();
-      c.avgFuelEconomy[0]=js["avgFuelEconomy"].asDouble();
-      if(c.avgFuelEconomy[0]<0 || c.avgFuelEconomy[0]>7000)  return false;
-
-    }
-
-    if(c.batteryVoltage)  delete c.batteryVoltage;
-    c.batteryVoltage=0;
-    if(js.isMember("batteryVoltage"))
-    {
-      if(!js["batteryVoltage"].isNumeric())  return false;
-      c.batteryVoltage=new float();
-      c.batteryVoltage[0]=js["batteryVoltage"].asDouble();
-      if(c.batteryVoltage[0]<0 || c.batteryVoltage[0]>26)  return false;
-
-    }
-
-    if(c.externalTemperature)  delete c.externalTemperature;
-    c.externalTemperature=0;
-    if(js.isMember("externalTemperature"))
-    {
-      if(!js["externalTemperature"].isNumeric())  return false;
-      c.externalTemperature=new float();
-      c.externalTemperature[0]=js["externalTemperature"].asDouble();
-      if(c.externalTemperature[0]<-40 || c.externalTemperature[0]>100)  return false;
-
-    }
-
-    if(c.vin)  delete c.vin;
-    c.vin=0;
-    if(js.isMember("vin"))
-    {
-      if(!js["vin"].isString())  return false;
-      c.vin=new std::string();
-      c.vin[0]=js["vin"].asString();
-      if(c.vin[0].length()>17)  return false;
-
-    }
-
-    if(c.prndl)  delete c.prndl;
-    c.prndl=0;
-    if(js.isMember("prndl"))
-    {
-      c.prndl=new NsSmartDeviceLinkRPCV2::PRNDL();
-      if(!NsSmartDeviceLinkRPCV2::PRNDLMarshaller::fromJSON(js["prndl"],c.prndl[0]))  return false;
-    }
-
-    if(c.tirePressure)  delete c.tirePressure;
-    c.tirePressure=0;
-    if(js.isMember("tirePressure"))
-    {
-      c.tirePressure=new NsSmartDeviceLinkRPCV2::TireStatus();
-      if(!NsSmartDeviceLinkRPCV2::TireStatusMarshaller::fromJSON(js["tirePressure"],c.tirePressure[0]))  return false;
-    }
-
-    if(c.batteryPackVoltage)  delete c.batteryPackVoltage;
-    c.batteryPackVoltage=0;
-    if(js.isMember("batteryPackVoltage"))
-    {
-      if(!js["batteryPackVoltage"].isNumeric())  return false;
-      c.batteryPackVoltage=new float();
-      c.batteryPackVoltage[0]=js["batteryPackVoltage"].asDouble();
-      if(c.batteryPackVoltage[0]<-1000 || c.batteryPackVoltage[0]>1000)  return false;
-
-    }
-
-    if(c.batteryPackCurrent)  delete c.batteryPackCurrent;
-    c.batteryPackCurrent=0;
-    if(js.isMember("batteryPackCurrent"))
-    {
-      if(!js["batteryPackCurrent"].isNumeric())  return false;
-      c.batteryPackCurrent=new float();
-      c.batteryPackCurrent[0]=js["batteryPackCurrent"].asDouble();
-      if(c.batteryPackCurrent[0]<-1000 || c.batteryPackCurrent[0]>1000)  return false;
-
-    }
-
-    if(c.batteryPackTemperature)  delete c.batteryPackTemperature;
-    c.batteryPackTemperature=0;
-    if(js.isMember("batteryPackTemperature"))
-    {
-      if(!js["batteryPackTemperature"].isInt())  return false;
-      c.batteryPackTemperature=new int();
-      c.batteryPackTemperature[0]=js["batteryPackTemperature"].asInt();
-      if(c.batteryPackTemperature[0]<-50 || c.batteryPackTemperature[0]>250)  return false;
-
-    }
-
-    if(c.engineTorque)  delete c.engineTorque;
-    c.engineTorque=0;
-    if(js.isMember("engineTorque"))
-    {
-      if(!js["engineTorque"].isInt())  return false;
-      c.engineTorque=new int();
-      c.engineTorque[0]=js["engineTorque"].asInt();
-      if(c.engineTorque[0]<-10000 || c.engineTorque[0]>55000)  return false;
-
-    }
-
-    if(c.odometer)  delete c.odometer;
-    c.odometer=0;
-    if(js.isMember("odometer"))
-    {
-      if(!js["odometer"].isInt())  return false;
-      c.odometer=new unsigned int();
-      c.odometer[0]=js["odometer"].asInt();
-      if(c.odometer[0]>2000000)  return false;
-
-    }
-
-    if(c.tripOdometer)  delete c.tripOdometer;
-    c.tripOdometer=0;
-    if(js.isMember("tripOdometer"))
-    {
-      if(!js["tripOdometer"].isInt())  return false;
-      c.tripOdometer=new unsigned int();
-      c.tripOdometer[0]=js["tripOdometer"].asInt();
-      if(c.tripOdometer[0]>2000000)  return false;
-
-    }
-
-    if(c.satRadioESN)  delete c.satRadioESN;
-    c.satRadioESN=0;
-    if(js.isMember("satRadioESN"))
-    {
-      if(!js["satRadioESN"].isString())  return false;
-      c.satRadioESN=new std::string();
-      c.satRadioESN[0]=js["satRadioESN"].asString();
-      if(c.satRadioESN[0].length()>500)  return false;
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataResponseMarshaller.h
deleted file mode 100644
index becf1489a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleDataResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLEDATARESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLEDATARESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleDataResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    struct GetVehicleDataResponseMarshaller
-    {
-      static bool checkIntegrity(GetVehicleDataResponse& e);
-      static bool checkIntegrityConst(const GetVehicleDataResponse& e);
-    
-      static bool fromString(const std::string& s,GetVehicleDataResponse& e);
-      static const std::string toString(const GetVehicleDataResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetVehicleDataResponse& e);
-      static Json::Value toJSON(const GetVehicleDataResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleType.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleType.cpp
deleted file mode 100644
index 0530d3d7e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleType.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleType.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-
-GetVehicleType& GetVehicleType::operator =(const GetVehicleType& c)
-{
-  return *this;
-}
-
-
-GetVehicleType::~GetVehicleType(void)
-{
-}
-
-
-GetVehicleType::GetVehicleType(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLETYPE)
-{
-}
-
-
-GetVehicleType::GetVehicleType(const GetVehicleType& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLETYPE,c.getId())
-{
-  *this=c;
-}
-
-
-bool GetVehicleType::checkIntegrity(void)
-{
-  return GetVehicleTypeMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeMarshaller.cpp
deleted file mode 100644
index 86ed85b95..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleType.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/GetVehicleTypeMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-bool GetVehicleTypeMarshaller::checkIntegrity(GetVehicleType& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetVehicleTypeMarshaller::fromString(const std::string& s,GetVehicleType& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetVehicleTypeMarshaller::toString(const GetVehicleType& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetVehicleTypeMarshaller::checkIntegrityConst(const GetVehicleType& s)
-{
-  return true;
-}
-
-
-Json::Value GetVehicleTypeMarshaller::toJSON(const GetVehicleType& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VehicleInfo.GetVehicleType");
-
-  json["id"]=Json::Value(e.getId());
-  return json;
-}
-
-
-bool GetVehicleTypeMarshaller::fromJSON(const Json::Value& json,GetVehicleType& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VehicleInfo.GetVehicleType"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeMarshaller.h
deleted file mode 100644
index f70919c4b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLETYPEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLETYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleType.h"
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    struct GetVehicleTypeMarshaller
-    {
-      static bool checkIntegrity(GetVehicleType& e);
-      static bool checkIntegrityConst(const GetVehicleType& e);
-    
-      static bool fromString(const std::string& s,GetVehicleType& e);
-      static const std::string toString(const GetVehicleType& e);
-    
-      static bool fromJSON(const Json::Value& s,GetVehicleType& e);
-      static Json::Value toJSON(const GetVehicleType& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponse.cpp
deleted file mode 100644
index edd196ab1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponse.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-
-GetVehicleTypeResponse& GetVehicleTypeResponse::operator =(const GetVehicleTypeResponse& c)
-{
-  vehicleType=c.vehicleType;
-  return *this;
-}
-
-
-GetVehicleTypeResponse::~GetVehicleTypeResponse(void)
-{
-}
-
-
-GetVehicleTypeResponse::GetVehicleTypeResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLETYPERESPONSE)
-{
-}
-
-
-GetVehicleTypeResponse::GetVehicleTypeResponse(const GetVehicleTypeResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__GETVEHICLETYPERESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::VehicleType& GetVehicleTypeResponse::get_vehicleType(void)
-{
-  return vehicleType;
-}
-
-bool GetVehicleTypeResponse::set_vehicleType(const NsSmartDeviceLinkRPCV2::VehicleType& vehicleType_)
-{
-  vehicleType=vehicleType_;
-  return true;
-}
-
-bool GetVehicleTypeResponse::checkIntegrity(void)
-{
-  return GetVehicleTypeResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponseMarshaller.cpp
deleted file mode 100644
index aca11b6b4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponseMarshaller.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/GetVehicleTypeResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-bool GetVehicleTypeResponseMarshaller::checkIntegrity(GetVehicleTypeResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetVehicleTypeResponseMarshaller::fromString(const std::string& s,GetVehicleTypeResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetVehicleTypeResponseMarshaller::toString(const GetVehicleTypeResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetVehicleTypeResponseMarshaller::checkIntegrityConst(const GetVehicleTypeResponse& s)
-{
-  if(!NsSmartDeviceLinkRPCV2::VehicleTypeMarshaller::checkIntegrityConst(s.vehicleType))  return false;
-
-  return true;
-}
-
-
-Json::Value GetVehicleTypeResponseMarshaller::toJSON(const GetVehicleTypeResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("VehicleInfo.GetVehicleTypeResponse");
-
-  json["result"]["vehicleType"]=NsSmartDeviceLinkRPCV2::VehicleTypeMarshaller::toJSON(e.vehicleType);;
-  return json;
-}
-
-
-bool GetVehicleTypeResponseMarshaller::fromJSON(const Json::Value& json,GetVehicleTypeResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("VehicleInfo.GetVehicleTypeResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(!js.isMember("vehicleType") || !NsSmartDeviceLinkRPCV2::VehicleTypeMarshaller::fromJSON(js["vehicleType"],c.vehicleType))  return false;
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponseMarshaller.h
deleted file mode 100644
index 5bf7d997e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLETYPERESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_GETVEHICLETYPERESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/GetVehicleTypeResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    struct GetVehicleTypeResponseMarshaller
-    {
-      static bool checkIntegrity(GetVehicleTypeResponse& e);
-      static bool checkIntegrityConst(const GetVehicleTypeResponse& e);
-    
-      static bool fromString(const std::string& s,GetVehicleTypeResponse& e);
-      static const std::string toString(const GetVehicleTypeResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,GetVehicleTypeResponse& e);
-      static Json::Value toJSON(const GetVehicleTypeResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/OnVehicleData.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/OnVehicleData.cpp
deleted file mode 100644
index 966f64c20..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/OnVehicleData.cpp
+++ /dev/null
@@ -1,447 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/OnVehicleData.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-
-OnVehicleData& OnVehicleData::operator =(const OnVehicleData& c)
-{
-  if(gps)  delete gps;
-  gps= c.gps ? new NsSmartDeviceLinkRPCV2::GPSData(c.gps[0]) : 0;
-  if(speed)  delete speed;
-  speed= c.speed ? new float(c.speed[0]) : 0;
-  if(rpm)  delete rpm;
-  rpm= c.rpm ? new unsigned int(c.rpm[0]) : 0;
-  if(fuelLevel)  delete fuelLevel;
-  fuelLevel= c.fuelLevel ? new float(c.fuelLevel[0]) : 0;
-  if(avgFuelEconomy)  delete avgFuelEconomy;
-  avgFuelEconomy= c.avgFuelEconomy ? new float(c.avgFuelEconomy[0]) : 0;
-  if(batteryVoltage)  delete batteryVoltage;
-  batteryVoltage= c.batteryVoltage ? new float(c.batteryVoltage[0]) : 0;
-  if(externalTemperature)  delete externalTemperature;
-  externalTemperature= c.externalTemperature ? new float(c.externalTemperature[0]) : 0;
-  if(vin)  delete vin;
-  vin= c.vin ? new std::string(c.vin[0]) : 0;
-  if(prndl)  delete prndl;
-  prndl= c.prndl ? new NsSmartDeviceLinkRPCV2::PRNDL(c.prndl[0]) : 0;
-  if(tirePressure)  delete tirePressure;
-  tirePressure= c.tirePressure ? new NsSmartDeviceLinkRPCV2::TireStatus(c.tirePressure[0]) : 0;
-  if(batteryPackVoltage)  delete batteryPackVoltage;
-  batteryPackVoltage= c.batteryPackVoltage ? new float(c.batteryPackVoltage[0]) : 0;
-  if(batteryPackCurrent)  delete batteryPackCurrent;
-  batteryPackCurrent= c.batteryPackCurrent ? new float(c.batteryPackCurrent[0]) : 0;
-  if(batteryPackTemperature)  delete batteryPackTemperature;
-  batteryPackTemperature= c.batteryPackTemperature ? new int(c.batteryPackTemperature[0]) : 0;
-  if(engineTorque)  delete engineTorque;
-  engineTorque= c.engineTorque ? new int(c.engineTorque[0]) : 0;
-  if(odometer)  delete odometer;
-  odometer= c.odometer ? new unsigned int(c.odometer[0]) : 0;
-  if(tripOdometer)  delete tripOdometer;
-  tripOdometer= c.tripOdometer ? new unsigned int(c.tripOdometer[0]) : 0;
-  if(genericbinary)  delete genericbinary;
-  genericbinary= c.genericbinary ? new std::string(c.genericbinary[0]) : 0;
-  return *this;
-}
-
-
-OnVehicleData::~OnVehicleData(void)
-{
-  if(gps)  delete gps;
-  if(speed)  delete speed;
-  if(rpm)  delete rpm;
-  if(fuelLevel)  delete fuelLevel;
-  if(avgFuelEconomy)  delete avgFuelEconomy;
-  if(batteryVoltage)  delete batteryVoltage;
-  if(externalTemperature)  delete externalTemperature;
-  if(vin)  delete vin;
-  if(prndl)  delete prndl;
-  if(tirePressure)  delete tirePressure;
-  if(batteryPackVoltage)  delete batteryPackVoltage;
-  if(batteryPackCurrent)  delete batteryPackCurrent;
-  if(batteryPackTemperature)  delete batteryPackTemperature;
-  if(engineTorque)  delete engineTorque;
-  if(odometer)  delete odometer;
-  if(tripOdometer)  delete tripOdometer;
-  if(genericbinary)  delete genericbinary;
-}
-
-
-OnVehicleData::OnVehicleData(void) : 
-  RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__ONVEHICLEDATA),
-  gps(0),
-  speed(0),
-  rpm(0),
-  fuelLevel(0),
-  avgFuelEconomy(0),
-  batteryVoltage(0),
-  externalTemperature(0),
-  vin(0),
-  prndl(0),
-  tirePressure(0),
-  batteryPackVoltage(0),
-  batteryPackCurrent(0),
-  batteryPackTemperature(0),
-  engineTorque(0),
-  odometer(0),
-  tripOdometer(0),
-  genericbinary(0)
-{
-}
-
-
-OnVehicleData::OnVehicleData(const OnVehicleData& c) : RPC2Notification(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__ONVEHICLEDATA)
-{
-  *this=c;
-}
-
-
-const NsSmartDeviceLinkRPCV2::GPSData* OnVehicleData::get_gps(void)
-{
-  return gps;
-}
-
-bool OnVehicleData::set_gps(const NsSmartDeviceLinkRPCV2::GPSData& gps_)
-{
-  if(gps)  delete gps;
-  gps=new NsSmartDeviceLinkRPCV2::GPSData(gps_);
-  return true;
-}
-
-void OnVehicleData::reset_gps(void)
-{
-  if(gps)  delete gps;
-  gps=0;
-}
-
-const float* OnVehicleData::get_speed(void)
-{
-  return speed;
-}
-
-bool OnVehicleData::set_speed(const float& speed_)
-{
-  if(speed)  delete speed;
-  speed=new float(speed_);
-  return true;
-}
-
-void OnVehicleData::reset_speed(void)
-{
-  if(speed)  delete speed;
-  speed=0;
-}
-
-const unsigned int* OnVehicleData::get_rpm(void)
-{
-  return rpm;
-}
-
-bool OnVehicleData::set_rpm(const unsigned int& rpm_)
-{
-  if(rpm)  delete rpm;
-  rpm=new unsigned int(rpm_);
-  return true;
-}
-
-void OnVehicleData::reset_rpm(void)
-{
-  if(rpm)  delete rpm;
-  rpm=0;
-}
-
-const float* OnVehicleData::get_fuelLevel(void)
-{
-  return fuelLevel;
-}
-
-bool OnVehicleData::set_fuelLevel(const float& fuelLevel_)
-{
-  if(fuelLevel)  delete fuelLevel;
-  fuelLevel=new float(fuelLevel_);
-  return true;
-}
-
-void OnVehicleData::reset_fuelLevel(void)
-{
-  if(fuelLevel)  delete fuelLevel;
-  fuelLevel=0;
-}
-
-const float* OnVehicleData::get_avgFuelEconomy(void)
-{
-  return avgFuelEconomy;
-}
-
-bool OnVehicleData::set_avgFuelEconomy(const float& avgFuelEconomy_)
-{
-  if(avgFuelEconomy)  delete avgFuelEconomy;
-  avgFuelEconomy=new float(avgFuelEconomy_);
-  return true;
-}
-
-void OnVehicleData::reset_avgFuelEconomy(void)
-{
-  if(avgFuelEconomy)  delete avgFuelEconomy;
-  avgFuelEconomy=0;
-}
-
-const float* OnVehicleData::get_batteryVoltage(void)
-{
-  return batteryVoltage;
-}
-
-bool OnVehicleData::set_batteryVoltage(const float& batteryVoltage_)
-{
-  if(batteryVoltage)  delete batteryVoltage;
-  batteryVoltage=new float(batteryVoltage_);
-  return true;
-}
-
-void OnVehicleData::reset_batteryVoltage(void)
-{
-  if(batteryVoltage)  delete batteryVoltage;
-  batteryVoltage=0;
-}
-
-const float* OnVehicleData::get_externalTemperature(void)
-{
-  return externalTemperature;
-}
-
-bool OnVehicleData::set_externalTemperature(const float& externalTemperature_)
-{
-  if(externalTemperature)  delete externalTemperature;
-  externalTemperature=new float(externalTemperature_);
-  return true;
-}
-
-void OnVehicleData::reset_externalTemperature(void)
-{
-  if(externalTemperature)  delete externalTemperature;
-  externalTemperature=0;
-}
-
-const std::string* OnVehicleData::get_vin(void)
-{
-  return vin;
-}
-
-bool OnVehicleData::set_vin(const std::string& vin_)
-{
-  if(vin)  delete vin;
-  vin=new std::string(vin_);
-  return true;
-}
-
-void OnVehicleData::reset_vin(void)
-{
-  if(vin)  delete vin;
-  vin=0;
-}
-
-const NsSmartDeviceLinkRPCV2::PRNDL* OnVehicleData::get_prndl(void)
-{
-  return prndl;
-}
-
-bool OnVehicleData::set_prndl(const NsSmartDeviceLinkRPCV2::PRNDL& prndl_)
-{
-  if(prndl)  delete prndl;
-  prndl=new NsSmartDeviceLinkRPCV2::PRNDL(prndl_);
-  return true;
-}
-
-void OnVehicleData::reset_prndl(void)
-{
-  if(prndl)  delete prndl;
-  prndl=0;
-}
-
-const NsSmartDeviceLinkRPCV2::TireStatus* OnVehicleData::get_tirePressure(void)
-{
-  return tirePressure;
-}
-
-bool OnVehicleData::set_tirePressure(const NsSmartDeviceLinkRPCV2::TireStatus& tirePressure_)
-{
-  if(tirePressure)  delete tirePressure;
-  tirePressure=new NsSmartDeviceLinkRPCV2::TireStatus(tirePressure_);
-  return true;
-}
-
-void OnVehicleData::reset_tirePressure(void)
-{
-  if(tirePressure)  delete tirePressure;
-  tirePressure=0;
-}
-
-const float* OnVehicleData::get_batteryPackVoltage(void)
-{
-  return batteryPackVoltage;
-}
-
-bool OnVehicleData::set_batteryPackVoltage(const float& batteryPackVoltage_)
-{
-  if(batteryPackVoltage)  delete batteryPackVoltage;
-  batteryPackVoltage=new float(batteryPackVoltage_);
-  return true;
-}
-
-void OnVehicleData::reset_batteryPackVoltage(void)
-{
-  if(batteryPackVoltage)  delete batteryPackVoltage;
-  batteryPackVoltage=0;
-}
-
-const float* OnVehicleData::get_batteryPackCurrent(void)
-{
-  return batteryPackCurrent;
-}
-
-bool OnVehicleData::set_batteryPackCurrent(const float& batteryPackCurrent_)
-{
-  if(batteryPackCurrent)  delete batteryPackCurrent;
-  batteryPackCurrent=new float(batteryPackCurrent_);
-  return true;
-}
-
-void OnVehicleData::reset_batteryPackCurrent(void)
-{
-  if(batteryPackCurrent)  delete batteryPackCurrent;
-  batteryPackCurrent=0;
-}
-
-const int* OnVehicleData::get_batteryPackTemperature(void)
-{
-  return batteryPackTemperature;
-}
-
-bool OnVehicleData::set_batteryPackTemperature(const int& batteryPackTemperature_)
-{
-  if(batteryPackTemperature)  delete batteryPackTemperature;
-  batteryPackTemperature=new int(batteryPackTemperature_);
-  return true;
-}
-
-void OnVehicleData::reset_batteryPackTemperature(void)
-{
-  if(batteryPackTemperature)  delete batteryPackTemperature;
-  batteryPackTemperature=0;
-}
-
-const int* OnVehicleData::get_engineTorque(void)
-{
-  return engineTorque;
-}
-
-bool OnVehicleData::set_engineTorque(const int& engineTorque_)
-{
-  if(engineTorque)  delete engineTorque;
-  engineTorque=new int(engineTorque_);
-  return true;
-}
-
-void OnVehicleData::reset_engineTorque(void)
-{
-  if(engineTorque)  delete engineTorque;
-  engineTorque=0;
-}
-
-const unsigned int* OnVehicleData::get_odometer(void)
-{
-  return odometer;
-}
-
-bool OnVehicleData::set_odometer(const unsigned int& odometer_)
-{
-  if(odometer)  delete odometer;
-  odometer=new unsigned int(odometer_);
-  return true;
-}
-
-void OnVehicleData::reset_odometer(void)
-{
-  if(odometer)  delete odometer;
-  odometer=0;
-}
-
-const unsigned int* OnVehicleData::get_tripOdometer(void)
-{
-  return tripOdometer;
-}
-
-bool OnVehicleData::set_tripOdometer(const unsigned int& tripOdometer_)
-{
-  if(tripOdometer)  delete tripOdometer;
-  tripOdometer=new unsigned int(tripOdometer_);
-  return true;
-}
-
-void OnVehicleData::reset_tripOdometer(void)
-{
-  if(tripOdometer)  delete tripOdometer;
-  tripOdometer=0;
-}
-
-const std::string* OnVehicleData::get_genericbinary(void)
-{
-  return genericbinary;
-}
-
-bool OnVehicleData::set_genericbinary(const std::string& genericbinary_)
-{
-  if(genericbinary)  delete genericbinary;
-  genericbinary=new std::string(genericbinary_);
-  return true;
-}
-
-void OnVehicleData::reset_genericbinary(void)
-{
-  if(genericbinary)  delete genericbinary;
-  genericbinary=0;
-}
-
-bool OnVehicleData::checkIntegrity(void)
-{
-  return OnVehicleDataMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/OnVehicleDataMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/OnVehicleDataMarshaller.cpp
deleted file mode 100644
index cf8a85b3a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/OnVehicleDataMarshaller.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/OnVehicleData.h"
-#include "../src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/OnVehicleDataMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-bool OnVehicleDataMarshaller::checkIntegrity(OnVehicleData& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnVehicleDataMarshaller::fromString(const std::string& s,OnVehicleData& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnVehicleDataMarshaller::toString(const OnVehicleData& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnVehicleDataMarshaller::checkIntegrityConst(const OnVehicleData& s)
-{
-  if(s.gps && (!NsSmartDeviceLinkRPCV2::GPSDataMarshaller::checkIntegrityConst(s.gps[0])))  return false;
-
-  if(s.speed && (s.speed[0]<-100 || s.speed[0]>500))  return false;
-
-  if(s.rpm && (s.rpm[0]>20000))  return false;
-
-  if(s.fuelLevel && (s.fuelLevel[0]<0 || s.fuelLevel[0]>100))  return false;
-
-  if(s.avgFuelEconomy && (s.avgFuelEconomy[0]<0 || s.avgFuelEconomy[0]>7000))  return false;
-
-  if(s.batteryVoltage && (s.batteryVoltage[0]<0 || s.batteryVoltage[0]>26))  return false;
-
-  if(s.externalTemperature && (s.externalTemperature[0]<-40 || s.externalTemperature[0]>100))  return false;
-
-  if(s.vin && (s.vin[0].length()>17))  return false;
-
-  if(s.prndl && (!NsSmartDeviceLinkRPCV2::PRNDLMarshaller::checkIntegrityConst(s.prndl[0])))  return false;
-
-  if(s.tirePressure && (!NsSmartDeviceLinkRPCV2::TireStatusMarshaller::checkIntegrityConst(s.tirePressure[0])))  return false;
-
-  if(s.batteryPackVoltage && (s.batteryPackVoltage[0]<-1000 || s.batteryPackVoltage[0]>1000))  return false;
-
-  if(s.batteryPackCurrent && (s.batteryPackCurrent[0]<-1000 || s.batteryPackCurrent[0]>1000))  return false;
-
-  if(s.batteryPackTemperature && (s.batteryPackTemperature[0]<-50 || s.batteryPackTemperature[0]>250))  return false;
-
-  if(s.engineTorque && (s.engineTorque[0]<-10000 || s.engineTorque[0]>55000))  return false;
-
-  if(s.odometer && (s.odometer[0]>2000000))  return false;
-
-  if(s.tripOdometer && (s.tripOdometer[0]>2000000))  return false;
-
-  if(s.genericbinary && (s.genericbinary[0].length()>500))  return false;
-
-  return true;
-}
-
-
-Json::Value OnVehicleDataMarshaller::toJSON(const OnVehicleData& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VehicleInfo.OnVehicleData");
-  json["params"]=Json::Value(Json::objectValue);
-
-  if(e.gps)
-    json["params"]["gps"]=NsSmartDeviceLinkRPCV2::GPSDataMarshaller::toJSON(e.gps[0]);;
-  if(e.speed)
-    json["params"]["speed"]=Json::Value(e.speed[0]);;
-  if(e.rpm)
-    json["params"]["rpm"]=Json::Value(e.rpm[0]);;
-  if(e.fuelLevel)
-    json["params"]["fuelLevel"]=Json::Value(e.fuelLevel[0]);;
-  if(e.avgFuelEconomy)
-    json["params"]["avgFuelEconomy"]=Json::Value(e.avgFuelEconomy[0]);;
-  if(e.batteryVoltage)
-    json["params"]["batteryVoltage"]=Json::Value(e.batteryVoltage[0]);;
-  if(e.externalTemperature)
-    json["params"]["externalTemperature"]=Json::Value(e.externalTemperature[0]);;
-  if(e.vin)
-    json["params"]["vin"]=Json::Value(e.vin[0]);;
-  if(e.prndl)
-    json["params"]["prndl"]=NsSmartDeviceLinkRPCV2::PRNDLMarshaller::toJSON(e.prndl[0]);;
-  if(e.tirePressure)
-    json["params"]["tirePressure"]=NsSmartDeviceLinkRPCV2::TireStatusMarshaller::toJSON(e.tirePressure[0]);;
-  if(e.batteryPackVoltage)
-    json["params"]["batteryPackVoltage"]=Json::Value(e.batteryPackVoltage[0]);;
-  if(e.batteryPackCurrent)
-    json["params"]["batteryPackCurrent"]=Json::Value(e.batteryPackCurrent[0]);;
-  if(e.batteryPackTemperature)
-    json["params"]["batteryPackTemperature"]=Json::Value(e.batteryPackTemperature[0]);;
-  if(e.engineTorque)
-    json["params"]["engineTorque"]=Json::Value(e.engineTorque[0]);;
-  if(e.odometer)
-    json["params"]["odometer"]=Json::Value(e.odometer[0]);;
-  if(e.tripOdometer)
-    json["params"]["tripOdometer"]=Json::Value(e.tripOdometer[0]);;
-  if(e.genericbinary)
-    json["params"]["genericbinary"]=Json::Value(e.genericbinary[0]);;
-  return json;
-}
-
-
-bool OnVehicleDataMarshaller::fromJSON(const Json::Value& json,OnVehicleData& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VehicleInfo.OnVehicleData"))  return false;
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-
-    if(c.gps)  delete c.gps;
-    c.gps=0;
-    if(js.isMember("gps"))
-    {
-      c.gps=new NsSmartDeviceLinkRPCV2::GPSData();
-      if(!NsSmartDeviceLinkRPCV2::GPSDataMarshaller::fromJSON(js["gps"],c.gps[0]))  return false;
-    }
-
-    if(c.speed)  delete c.speed;
-    c.speed=0;
-    if(js.isMember("speed"))
-    {
-      if(!js["speed"].isNumeric())  return false;
-      c.speed=new float();
-      c.speed[0]=js["speed"].asDouble();
-      if(c.speed[0]<-100 || c.speed[0]>500)  return false;
-
-    }
-
-    if(c.rpm)  delete c.rpm;
-    c.rpm=0;
-    if(js.isMember("rpm"))
-    {
-      if(!js["rpm"].isInt())  return false;
-      c.rpm=new unsigned int();
-      c.rpm[0]=js["rpm"].asInt();
-      if(c.rpm[0]>20000)  return false;
-
-    }
-
-    if(c.fuelLevel)  delete c.fuelLevel;
-    c.fuelLevel=0;
-    if(js.isMember("fuelLevel"))
-    {
-      if(!js["fuelLevel"].isNumeric())  return false;
-      c.fuelLevel=new float();
-      c.fuelLevel[0]=js["fuelLevel"].asDouble();
-      if(c.fuelLevel[0]<0 || c.fuelLevel[0]>100)  return false;
-
-    }
-
-    if(c.avgFuelEconomy)  delete c.avgFuelEconomy;
-    c.avgFuelEconomy=0;
-    if(js.isMember("avgFuelEconomy"))
-    {
-      if(!js["avgFuelEconomy"].isNumeric())  return false;
-      c.avgFuelEconomy=new float();
-      c.avgFuelEconomy[0]=js["avgFuelEconomy"].asDouble();
-      if(c.avgFuelEconomy[0]<0 || c.avgFuelEconomy[0]>7000)  return false;
-
-    }
-
-    if(c.batteryVoltage)  delete c.batteryVoltage;
-    c.batteryVoltage=0;
-    if(js.isMember("batteryVoltage"))
-    {
-      if(!js["batteryVoltage"].isNumeric())  return false;
-      c.batteryVoltage=new float();
-      c.batteryVoltage[0]=js["batteryVoltage"].asDouble();
-      if(c.batteryVoltage[0]<0 || c.batteryVoltage[0]>26)  return false;
-
-    }
-
-    if(c.externalTemperature)  delete c.externalTemperature;
-    c.externalTemperature=0;
-    if(js.isMember("externalTemperature"))
-    {
-      if(!js["externalTemperature"].isNumeric())  return false;
-      c.externalTemperature=new float();
-      c.externalTemperature[0]=js["externalTemperature"].asDouble();
-      if(c.externalTemperature[0]<-40 || c.externalTemperature[0]>100)  return false;
-
-    }
-
-    if(c.vin)  delete c.vin;
-    c.vin=0;
-    if(js.isMember("vin"))
-    {
-      if(!js["vin"].isString())  return false;
-      c.vin=new std::string();
-      c.vin[0]=js["vin"].asString();
-      if(c.vin[0].length()>17)  return false;
-
-    }
-
-    if(c.prndl)  delete c.prndl;
-    c.prndl=0;
-    if(js.isMember("prndl"))
-    {
-      c.prndl=new NsSmartDeviceLinkRPCV2::PRNDL();
-      if(!NsSmartDeviceLinkRPCV2::PRNDLMarshaller::fromJSON(js["prndl"],c.prndl[0]))  return false;
-    }
-
-    if(c.tirePressure)  delete c.tirePressure;
-    c.tirePressure=0;
-    if(js.isMember("tirePressure"))
-    {
-      c.tirePressure=new NsSmartDeviceLinkRPCV2::TireStatus();
-      if(!NsSmartDeviceLinkRPCV2::TireStatusMarshaller::fromJSON(js["tirePressure"],c.tirePressure[0]))  return false;
-    }
-
-    if(c.batteryPackVoltage)  delete c.batteryPackVoltage;
-    c.batteryPackVoltage=0;
-    if(js.isMember("batteryPackVoltage"))
-    {
-      if(!js["batteryPackVoltage"].isNumeric())  return false;
-      c.batteryPackVoltage=new float();
-      c.batteryPackVoltage[0]=js["batteryPackVoltage"].asDouble();
-      if(c.batteryPackVoltage[0]<-1000 || c.batteryPackVoltage[0]>1000)  return false;
-
-    }
-
-    if(c.batteryPackCurrent)  delete c.batteryPackCurrent;
-    c.batteryPackCurrent=0;
-    if(js.isMember("batteryPackCurrent"))
-    {
-      if(!js["batteryPackCurrent"].isNumeric())  return false;
-      c.batteryPackCurrent=new float();
-      c.batteryPackCurrent[0]=js["batteryPackCurrent"].asDouble();
-      if(c.batteryPackCurrent[0]<-1000 || c.batteryPackCurrent[0]>1000)  return false;
-
-    }
-
-    if(c.batteryPackTemperature)  delete c.batteryPackTemperature;
-    c.batteryPackTemperature=0;
-    if(js.isMember("batteryPackTemperature"))
-    {
-      if(!js["batteryPackTemperature"].isInt())  return false;
-      c.batteryPackTemperature=new int();
-      c.batteryPackTemperature[0]=js["batteryPackTemperature"].asInt();
-      if(c.batteryPackTemperature[0]<-50 || c.batteryPackTemperature[0]>250)  return false;
-
-    }
-
-    if(c.engineTorque)  delete c.engineTorque;
-    c.engineTorque=0;
-    if(js.isMember("engineTorque"))
-    {
-      if(!js["engineTorque"].isInt())  return false;
-      c.engineTorque=new int();
-      c.engineTorque[0]=js["engineTorque"].asInt();
-      if(c.engineTorque[0]<-10000 || c.engineTorque[0]>55000)  return false;
-
-    }
-
-    if(c.odometer)  delete c.odometer;
-    c.odometer=0;
-    if(js.isMember("odometer"))
-    {
-      if(!js["odometer"].isInt())  return false;
-      c.odometer=new unsigned int();
-      c.odometer[0]=js["odometer"].asInt();
-      if(c.odometer[0]>2000000)  return false;
-
-    }
-
-    if(c.tripOdometer)  delete c.tripOdometer;
-    c.tripOdometer=0;
-    if(js.isMember("tripOdometer"))
-    {
-      if(!js["tripOdometer"].isInt())  return false;
-      c.tripOdometer=new unsigned int();
-      c.tripOdometer[0]=js["tripOdometer"].asInt();
-      if(c.tripOdometer[0]>2000000)  return false;
-
-    }
-
-    if(c.genericbinary)  delete c.genericbinary;
-    c.genericbinary=0;
-    if(js.isMember("genericbinary"))
-    {
-      if(!js["genericbinary"].isString())  return false;
-      c.genericbinary=new std::string();
-      c.genericbinary[0]=js["genericbinary"].asString();
-      if(c.genericbinary[0].length()>500)  return false;
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/OnVehicleDataMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/OnVehicleDataMarshaller.h
deleted file mode 100644
index 912f4c6a4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/OnVehicleDataMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_ONVEHICLEDATAMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_ONVEHICLEDATAMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/OnVehicleData.h"
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    struct OnVehicleDataMarshaller
-    {
-      static bool checkIntegrity(OnVehicleData& e);
-      static bool checkIntegrityConst(const OnVehicleData& e);
-    
-      static bool fromString(const std::string& s,OnVehicleData& e);
-      static const std::string toString(const OnVehicleData& e);
-    
-      static bool fromJSON(const Json::Value& s,OnVehicleData& e);
-      static Json::Value toJSON(const OnVehicleData& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDID.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDID.cpp
deleted file mode 100644
index a860aa8b9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDID.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/ReadDID.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-
-ReadDID& ReadDID::operator =(const ReadDID& c)
-{
-  ecuName=c.ecuName;
-  didLocation=c.didLocation;
-  if(encrypted)  delete encrypted;
-  encrypted= c.encrypted ? new bool(c.encrypted[0]) : 0;
-  appId=c.appId;
-  return *this;
-}
-
-
-ReadDID::~ReadDID(void)
-{
-  if(encrypted)  delete encrypted;
-}
-
-
-ReadDID::ReadDID(void) : 
-  RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__READDID),
-  encrypted(0)
-{
-}
-
-
-ReadDID::ReadDID(const ReadDID& c) : RPC2Request(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__READDID,c.getId())
-{
-  *this=c;
-}
-
-
-unsigned int ReadDID::get_ecuName(void)
-{
-  return ecuName;
-}
-
-bool ReadDID::set_ecuName(unsigned int ecuName_)
-{
-  ecuName=ecuName_;
-  return true;
-}
-
-const std::vector< unsigned int>& ReadDID::get_didLocation(void)
-{
-  return didLocation;
-}
-
-bool ReadDID::set_didLocation(const std::vector< unsigned int>& didLocation_)
-{
-  didLocation=didLocation_;
-  return true;
-}
-
-const bool* ReadDID::get_encrypted(void)
-{
-  return encrypted;
-}
-
-bool ReadDID::set_encrypted(const bool& encrypted_)
-{
-  if(encrypted)  delete encrypted;
-  encrypted=new bool(encrypted_);
-  return true;
-}
-
-void ReadDID::reset_encrypted(void)
-{
-  if(encrypted)  delete encrypted;
-  encrypted=0;
-}
-
-int ReadDID::get_appId(void)
-{
-  return appId;
-}
-
-bool ReadDID::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool ReadDID::checkIntegrity(void)
-{
-  return ReadDIDMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDMarshaller.cpp
deleted file mode 100644
index 3d0eb43eb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDMarshaller.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/ReadDID.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/ReadDIDMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-bool ReadDIDMarshaller::checkIntegrity(ReadDID& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ReadDIDMarshaller::fromString(const std::string& s,ReadDID& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ReadDIDMarshaller::toString(const ReadDID& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ReadDIDMarshaller::checkIntegrityConst(const ReadDID& s)
-{
-  if(s.ecuName>65535)  return false;
-
-  {
-    unsigned int i=s.didLocation.size();
-    if(i<0)  return false;
-    if(i>1000)  return false;
-    while(i--)
-    {
-      if(s.didLocation[i]>65535)  return false;
-    }
-  }
-
-  return true;
-}
-
-
-Json::Value ReadDIDMarshaller::toJSON(const ReadDID& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["method"]=Json::Value("VehicleInfo.ReadDID");
-
-  json["id"]=Json::Value(e.getId());
-  json["params"]=Json::Value(Json::objectValue);
-  json["params"]["ecuName"]=Json::Value(e.ecuName);;
-  {
-    unsigned int i=e.didLocation.size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=Json::Value(e.didLocation[i]);
-
-    json["params"]["didLocation"]=j;
-  }
-  if(e.encrypted)
-    json["params"]["encrypted"]=Json::Value(e.encrypted[0]);;
-  json["params"]["appId"]=Json::Value(e.appId);;
-  return json;
-}
-
-
-bool ReadDIDMarshaller::fromJSON(const Json::Value& json,ReadDID& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("method") || !json["method"].isString() || json["method"].asString().compare("VehicleInfo.ReadDID"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("params")) return false;
-
-    Json::Value js=json["params"];
-    if(!js.isObject())  return false;
-    if(!js.isMember("ecuName") || !js["ecuName"].isInt())  return false;
-    c.ecuName=js["ecuName"].asInt();
-    if(c.ecuName>65535)  return false;
-
-    if(!js.isMember("didLocation") || !js["didLocation"].isArray())
-      return false;
-    {
-      c.didLocation.clear();
-      unsigned int i=js["didLocation"].size();
-      if(i<0)  return false;
-      if(i>1000)  return false;
-      c.didLocation.resize(i);
-      while(i--)
-      {
-        if(!js["didLocation"][i].isInt())
-          return false;
-        c.didLocation[i]=js["didLocation"][i].asInt();
-        if(c.didLocation[i]>65535)  return false;
-
-      }
-    }
-
-
-    if(c.encrypted)  delete c.encrypted;
-    c.encrypted=0;
-    if(js.isMember("encrypted"))
-    {
-      if(!js["encrypted"].isBool())  return false;
-      c.encrypted=new bool();
-      c.encrypted[0]=js["encrypted"].asBool();
-      
-    }
-
-    if(!js.isMember("appId") || !js["appId"].isInt())  return false;
-    c.appId=js["appId"].asInt();
-    
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDMarshaller.h
deleted file mode 100644
index 3d5b431ff..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_READDIDMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_READDIDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/ReadDID.h"
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    struct ReadDIDMarshaller
-    {
-      static bool checkIntegrity(ReadDID& e);
-      static bool checkIntegrityConst(const ReadDID& e);
-    
-      static bool fromString(const std::string& s,ReadDID& e);
-      static const std::string toString(const ReadDID& e);
-    
-      static bool fromJSON(const Json::Value& s,ReadDID& e);
-      static Json::Value toJSON(const ReadDID& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDResponse.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDResponse.cpp
deleted file mode 100644
index 010903695..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDResponse.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/ReadDIDResponse.h"
-#include "../src/../include/JSONHandler/RPC2Objects/Marshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-
-ReadDIDResponse& ReadDIDResponse::operator =(const ReadDIDResponse& c)
-{
-  if(dataResult)  delete dataResult;
-  dataResult= c.dataResult ? new std::vector<NsSmartDeviceLinkRPCV2::VehicleDataResultCode>(c.dataResult[0]) : 0;
-  if(data)  delete data;
-  data= c.data ? new std::vector<std::string>(c.data[0]) : 0;
-  return *this;
-}
-
-
-ReadDIDResponse::~ReadDIDResponse(void)
-{
-  if(dataResult)  delete dataResult;
-  if(data)  delete data;
-}
-
-
-ReadDIDResponse::ReadDIDResponse(void) : 
-  RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__READDIDRESPONSE),
-  dataResult(0),
-  data(0)
-{
-}
-
-
-ReadDIDResponse::ReadDIDResponse(const ReadDIDResponse& c) : RPC2Response(Marshaller::METHOD_NSRPC2COMMUNICATION_VEHICLEINFO__READDIDRESPONSE,c.getId(),c.getResult())
-{
-  *this=c;
-}
-
-
-const std::vector< NsSmartDeviceLinkRPCV2::VehicleDataResultCode>* ReadDIDResponse::get_dataResult(void)
-{
-  return dataResult;
-}
-
-bool ReadDIDResponse::set_dataResult(const std::vector< NsSmartDeviceLinkRPCV2::VehicleDataResultCode>& dataResult_)
-{
-  if(dataResult)  delete dataResult;
-  dataResult=new std::vector< NsSmartDeviceLinkRPCV2::VehicleDataResultCode>(dataResult_);
-  return true;
-}
-
-void ReadDIDResponse::reset_dataResult(void)
-{
-  if(dataResult)  delete dataResult;
-  dataResult=0;
-}
-
-const std::vector< std::string>* ReadDIDResponse::get_data(void)
-{
-  return data;
-}
-
-bool ReadDIDResponse::set_data(const std::vector< std::string>& data_)
-{
-  if(data)  delete data;
-  data=new std::vector< std::string>(data_);
-  return true;
-}
-
-void ReadDIDResponse::reset_data(void)
-{
-  if(data)  delete data;
-  data=0;
-}
-
-bool ReadDIDResponse::checkIntegrity(void)
-{
-  return ReadDIDResponseMarshaller::checkIntegrity(*this);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDResponseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDResponseMarshaller.cpp
deleted file mode 100644
index 618c98f11..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDResponseMarshaller.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/ReadDIDResponse.h"
-#include "../src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResultMarshaller.h"
-#include "../src/../src/RPC2ObjectsImpl//NsRPC2Communication/VehicleInfo/ReadDIDResponseMarshaller.h"
-
-/*
-  interface	NsRPC2Communication::VehicleInfo
-  version	1.2
-  generated at	Thu Jan 24 06:41:15 2013
-  source stamp	Wed Jan 23 13:56:28 2013
-  author	RC
-*/
-
-using namespace NsRPC2Communication::VehicleInfo;
-
-bool ReadDIDResponseMarshaller::checkIntegrity(ReadDIDResponse& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ReadDIDResponseMarshaller::fromString(const std::string& s,ReadDIDResponse& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ReadDIDResponseMarshaller::toString(const ReadDIDResponse& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ReadDIDResponseMarshaller::checkIntegrityConst(const ReadDIDResponse& s)
-{
-  if(s.dataResult)
-  {
-    unsigned int i=s.dataResult[0].size();
-    if(i<0)  return false;
-    if(i>1000)  return false;
-  }
-
-  if(s.data)
-  {
-    unsigned int i=s.data[0].size();
-    if(i<0)  return false;
-    if(i>1000)  return false;
-    while(i--)
-    {
-      if(s.data[0][i].length()>5000)  return false;
-    }
-  }
-
-  return true;
-}
-
-
-Json::Value ReadDIDResponseMarshaller::toJSON(const ReadDIDResponse& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["jsonrpc"]=Json::Value("2.0");
-  json["id"]=Json::Value(e.getId());
-  json["result"]=Json::Value(Json::objectValue);
-  NsSmartDeviceLinkRPCV2::Result r(static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(e.getResult()));
-  json["result"]["resultCode"]=NsSmartDeviceLinkRPCV2::ResultMarshaller::toJSON(r);
-  json["result"]["method"]=Json::Value("VehicleInfo.ReadDIDResponse");
-
-  if(e.dataResult)
-  {
-    unsigned int i=e.dataResult[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=NsSmartDeviceLinkRPCV2::VehicleDataResultCodeMarshaller::toJSON(e.dataResult[0][i]);
-
-    json["result"]["dataResult"]=j;
-  }
-  if(e.data)
-  {
-    unsigned int i=e.data[0].size();
-    Json::Value j=Json::Value(Json::arrayValue);
-    j.resize(i);
-    while(i--)
-      j[i]=Json::Value(e.data[0][i]);
-
-    json["result"]["data"]=j;
-  }
-  return json;
-}
-
-
-bool ReadDIDResponseMarshaller::fromJSON(const Json::Value& json,ReadDIDResponse& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-    if(!json.isMember("jsonrpc") || !json["jsonrpc"].isString() || json["jsonrpc"].asString().compare("2.0"))  return false;
-    if(!json.isMember("id") || !json["id"].isInt()) return false;
-    c.setId(json["id"].asInt());
-
-    if(!json.isMember("result")) return false;
-
-    Json::Value js=json["result"];
-    if(!js.isObject())  return false;
-
-    NsSmartDeviceLinkRPCV2::Result r;
-    if(!js.isMember("resultCode") || !js["resultCode"].isString())  return false;
-    if(!js.isMember("method") || !js["method"].isString())  return false;
-    if(js["method"].asString().compare("VehicleInfo.ReadDIDResponse")) return false;
-
-    if(!NsSmartDeviceLinkRPCV2::ResultMarshaller::fromJSON(js["resultCode"],r))  return false;
-    c.setResult(r.get());
-    if(c.dataResult)  delete c.dataResult;
-    c.dataResult=0;
-    if(js.isMember("dataResult"))
-    {
-      if(!js["dataResult"].isArray()) return false;
-      unsigned int i=js["dataResult"].size();
-      if(i<0)  return false;
-      if(i>1000)  return false;
-
-      c.dataResult=new std::vector<NsSmartDeviceLinkRPCV2::VehicleDataResultCode>();
-      c.dataResult->resize(js["dataResult"].size());
-
-      while(i--)
-        if(!NsSmartDeviceLinkRPCV2::VehicleDataResultCodeMarshaller::fromJSON(js["dataResult"][i],c.dataResult[0][i]))  return false;
-    }
-
-
-    if(c.data)  delete c.data;
-    c.data=0;
-    if(js.isMember("data"))
-    {
-      if(!js["data"].isArray()) return false;
-      unsigned int i=js["data"].size();
-      if(i<0)  return false;
-      if(i>1000)  return false;
-
-      c.data=new std::vector<std::string>();
-      c.data->resize(js["data"].size());
-
-      while(i--)
-      {
-        if(!js["data"][i].isString())
-          return false;
-
-        c.data[0][i]=js["data"][i].asString();
-        if(c.data[0][i].length()>5000)  return false;
-      }
-    }
-
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDResponseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDResponseMarshaller.h
deleted file mode 100644
index 597656970..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2ObjectsImpl/NsRPC2Communication/VehicleInfo/ReadDIDResponseMarshaller.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSRPC2COMMUNICATION_VEHICLEINFO_READDIDRESPONSEMARSHALLER_INCLUDE
-#define NSRPC2COMMUNICATION_VEHICLEINFO_READDIDRESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../src/../include/JSONHandler/RPC2Objects/NsRPC2Communication/VehicleInfo/ReadDIDResponse.h"
-
-namespace NsRPC2Communication
-{
-  namespace VehicleInfo
-  {
-
-    struct ReadDIDResponseMarshaller
-    {
-      static bool checkIntegrity(ReadDIDResponse& e);
-      static bool checkIntegrityConst(const ReadDIDResponse& e);
-    
-      static bool fromString(const std::string& s,ReadDIDResponse& e);
-      static const std::string toString(const ReadDIDResponse& e);
-    
-      static bool fromJSON(const Json::Value& s,ReadDIDResponse& e);
-      static Json::Value toJSON(const ReadDIDResponse& e);
-    };
-  }
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2Request.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2Request.cpp
deleted file mode 100644
index 66ace9032..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2Request.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
-* \file RPC2Request.cpp
-* \brief RPC2Request class source file.
-* Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "JSONHandler/RPC2Request.h"
-
-using namespace NsRPC2Communication;
-
-
-RPC2Request::RPC2Request() :
-RPC2Command(REQUEST)
-, mId(0) 
-{
-}
-
-RPC2Request::RPC2Request(int method) :
-RPC2Command(REQUEST, method)
-, mId(0) 
-{
-}
-
-RPC2Request::RPC2Request(int method,unsigned int id) :
-RPC2Command(REQUEST, method)
-, mId(id) 
-{
-}
-
-RPC2Request::~RPC2Request()
-{
-}
-
-void RPC2Request::setId(unsigned int id)
-{
-  mId=id;
-}
-
-unsigned int RPC2Request::getId() const
-{
-  return mId;
-}
-
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/RPC2Response.cpp b/SDL_Core/src/components/JSONHandler/src/RPC2Response.cpp
deleted file mode 100644
index 1b343ebf0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/RPC2Response.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
-* \file RPC2Response.cpp
-* \brief RPC2Response class source file.
-* Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "JSONHandler/RPC2Response.h"
-
-using namespace NsRPC2Communication;
-
-
-RPC2Response::RPC2Response() :
-RPC2Command(RESPONSE)
-, mId(0)
-, mResultCode(-1)
-{
-}
-
-RPC2Response::RPC2Response(int method) :
-RPC2Command(RESPONSE, method)
-, mId(0)
-, mResultCode(-1)
-{
-}
-
-
-RPC2Response::RPC2Response(int method,unsigned int id) :
-RPC2Command(RESPONSE, method)
-, mId(id)
-, mResultCode(-1)
-{
-}
-
-
-RPC2Response::RPC2Response(int method,unsigned int id,int res) :
-RPC2Command(RESPONSE, method)
-, mId(id)
-, mResultCode(res)
-{
-}
-
-
-RPC2Response::~RPC2Response()
-{
-}
-
-void RPC2Response::setId(unsigned int id)
-{
-  mId=id;
-}
-
-unsigned int RPC2Response::getId() const
-{
-  return mId;
-}
-
-
-int RPC2Response::getResult() const
-{
-  return mResultCode;
-}
-
-void RPC2Response::setResult(int r)
-{
-  mResultCode=r;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCMessage.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCMessage.cpp
deleted file mode 100644
index accb6325f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCMessage.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
-* \file SDLRPCMessage.cpp
-* \brief SDLRPCMessage class source file.
-* Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-using namespace NsSmartDeviceLinkRPC;
-
-SDLRPCMessage::SDLRPCMessage( unsigned int protocolVersion, MessageType messageType )
-:mProtocolVersion( protocolVersion)
-,mMessageType( messageType )
-,mMethodId(1)
-,mBinaryData( 0 )
-,mCorrelationID( 0 )
-{
-}
-
-SDLRPCMessage::SDLRPCMessage( unsigned int protocolVersion, MessageType messageType, int  methodId )
-:mProtocolVersion( protocolVersion )
-,mMessageType( messageType )
-,mMethodId( methodId )
-,mBinaryData( 0 )
-,mCorrelationID( 0 )
-{}
-
-SDLRPCMessage::~SDLRPCMessage()
-{
-    if ( mBinaryData )
-    {
-        delete mBinaryData;
-        mBinaryData = 0;
-    }
-}
-
-unsigned int SDLRPCMessage::getProtocolVersion() const
-{
-    return mProtocolVersion;
-}
-
-SDLRPCMessage::MessageType SDLRPCMessage::getMessageType() const
-{
-    return mMessageType;
-}
-
-int SDLRPCMessage::getMethodId() const
-{
-    return mMethodId;
-}
-
-void SDLRPCMessage::setProtocolVersion( unsigned int protocolVersion )
-{
-    mProtocolVersion = protocolVersion;
-}
-
-void SDLRPCMessage::setMessageType( SDLRPCMessage::MessageType messageType )
-{
-    mMessageType = messageType;
-}
-
-void SDLRPCMessage::setMethodId( int methodId )
-{
-    mMethodId = methodId;
-}
-
-void SDLRPCMessage::setBinaryData( const std::vector<unsigned char> & binaryData )
-{
-    if ( mBinaryData )
-    {
-        delete mBinaryData;
-    }
-    mBinaryData = new std::vector<unsigned char> (binaryData);
-}
-
-const std::vector<unsigned char> * SDLRPCMessage::getBinaryData() const
-{
-    return mBinaryData;
-}
-
-unsigned int SDLRPCMessage::getCorrelationID() const
-{ 
-    return mCorrelationID;
-}
-
-void SDLRPCMessage::setCorrelationID( unsigned int correlationID ) 
-{ 
-    mCorrelationID = correlationID; 
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCNotification.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCNotification.cpp
deleted file mode 100644
index 3b69fa951..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCNotification.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
-* \file SDLRPCNotification.cpp
-* \brief SDLRPCNotification class source file.
-* Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "JSONHandler/SDLRPCNotification.h"
-
-using namespace NsSmartDeviceLinkRPC;
-
-SDLRPCNotification::SDLRPCNotification(void) :
-SDLRPCMessage(0,NOTIFICATION)
-{
-}
-
-
-SDLRPCNotification::SDLRPCNotification( unsigned int protocolVersion) :
-SDLRPCMessage(protocolVersion,NOTIFICATION)
-{
-}
-
-SDLRPCNotification::SDLRPCNotification( unsigned int protocolVersion, int methodId ) :
-SDLRPCMessage(protocolVersion,NOTIFICATION, methodId)
-{
-}
-
-
-SDLRPCNotification::~SDLRPCNotification()
-{
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_request.cpp
deleted file mode 100644
index 954282cb2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_request.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddCommand_request.h"
-#include "AddCommand_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "MenuParamsMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-AddCommand_request& AddCommand_request::operator =(const AddCommand_request& c)
-{
-  cmdID= c.cmdID;
-  menuParams= c.menuParams ? new MenuParams(c.menuParams[0]) : 0;
-  vrCommands= c.vrCommands ? new std::vector<std::string>(c.vrCommands[0]) : 0;
-
-  return *this;}
-
-
-AddCommand_request::~AddCommand_request(void)
-{
-  if(menuParams)
-    delete menuParams;
-  if(vrCommands)
-    delete vrCommands;
-}
-
-
-AddCommand_request::AddCommand_request(const AddCommand_request& c)
-{
-  *this=c;
-}
-
-
-bool AddCommand_request::checkIntegrity(void)
-{
-  return AddCommand_requestMarshaller::checkIntegrity(*this);
-}
-
-
-AddCommand_request::AddCommand_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_ADDCOMMAND_REQUEST),
-      menuParams(0),
-    vrCommands(0)
-{
-}
-
-
-
-bool AddCommand_request::set_cmdID(unsigned int cmdID_)
-{
-  if(cmdID_>2000000000)  return false;
-  cmdID=cmdID_;
-  return true;
-}
-
-bool AddCommand_request::set_menuParams(const MenuParams& menuParams_)
-{
-  if(!MenuParamsMarshaller::checkIntegrityConst(menuParams_))   return false;
-  delete menuParams;
-  menuParams=0;
-
-  menuParams=new MenuParams(menuParams_);
-  return true;
-}
-
-void AddCommand_request::reset_menuParams(void)
-{
-  if(menuParams)
-    delete menuParams;
-  menuParams=0;
-}
-
-bool AddCommand_request::set_vrCommands(const std::vector<std::string>& vrCommands_)
-{
-  unsigned int i=vrCommands_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(vrCommands_[i].length()>99)  return false;
-  }
-  delete vrCommands;
-  vrCommands=0;
-
-  vrCommands=new std::vector<std::string>(vrCommands_);
-  return true;
-}
-
-void AddCommand_request::reset_vrCommands(void)
-{
-  if(vrCommands)
-    delete vrCommands;
-  vrCommands=0;
-}
-
-
-
-
-unsigned int AddCommand_request::get_cmdID(void) const
-{
-  return cmdID;
-}
-
-const MenuParams* AddCommand_request::get_menuParams(void) const 
-{
-  return menuParams;
-}
-
-const std::vector<std::string>* AddCommand_request::get_vrCommands(void) const 
-{
-  return vrCommands;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_requestMarshaller.cpp
deleted file mode 100644
index 673614e65..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_requestMarshaller.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddCommand_request.h"
-#include "MenuParamsMarshaller.h"
-
-#include "AddCommand_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool AddCommand_requestMarshaller::checkIntegrity(AddCommand_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddCommand_requestMarshaller::fromString(const std::string& s,AddCommand_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddCommand_requestMarshaller::toString(const AddCommand_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddCommand_requestMarshaller::checkIntegrityConst(const AddCommand_request& s)
-{
-  if(s.cmdID>2000000000)  return false;
-  if(s.menuParams && !MenuParamsMarshaller::checkIntegrityConst(*s.menuParams))  return false;
-  if(s.vrCommands)
-  {
-    unsigned int i=s.vrCommands[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.vrCommands[0][i].length()>99)  return false;
-    }
-  }
-  return true;
-}
-
-Json::Value AddCommand_requestMarshaller::toJSON(const AddCommand_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("AddCommand");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["cmdID"]=Json::Value(e.cmdID);
-
-  if(e.menuParams)
-    j["menuParams"]=MenuParamsMarshaller::toJSON(*e.menuParams);
-
-  if(e.vrCommands)
-  {
-    unsigned int sz=e.vrCommands->size();
-    j["vrCommands"]=Json::Value(Json::arrayValue);
-    j["vrCommands"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["vrCommands"][i]=Json::Value(e.vrCommands[0][i]);
-  }
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool AddCommand_requestMarshaller::fromJSON(const Json::Value& js,AddCommand_request& c)
-{
-  if(c.menuParams)  delete c.menuParams;
-  c.menuParams=0;
-
-  if(c.vrCommands)  delete c.vrCommands;
-  c.vrCommands=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("AddCommand"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("cmdID"))  return false;
-    {
-      const Json::Value& j=json["cmdID"];
-      if(!j.isInt())  return false;
-      c.cmdID=j.asInt();
-    }
-    if(json.isMember("menuParams"))
-    {
-      const Json::Value& j=json["menuParams"];
-      c.menuParams=new MenuParams();
-      if(!MenuParamsMarshaller::fromJSON(j,c.menuParams[0]))
-        return false;
-    }
-    if(json.isMember("vrCommands"))
-    {
-      const Json::Value& j=json["vrCommands"];
-      if(!j.isArray())  return false;
-      c.vrCommands=new std::vector<std::string>();
-      c.vrCommands->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.vrCommands[0][i]=j[i].asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_requestMarshaller.h
deleted file mode 100644
index 3807438a5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ADDCOMMAND_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ADDCOMMAND_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddCommand_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct AddCommand_requestMarshaller
-  {
-    static bool checkIntegrity(AddCommand_request& e);
-    static bool checkIntegrityConst(const AddCommand_request& e);
-  
-    static bool fromString(const std::string& s,AddCommand_request& e);
-    static const std::string toString(const AddCommand_request& e);
-  
-    static bool fromJSON(const Json::Value& s,AddCommand_request& e);
-    static Json::Value toJSON(const AddCommand_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_response.cpp
deleted file mode 100644
index da044e6ca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddCommand_response.h"
-#include "AddCommand_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-AddCommand_response& AddCommand_response::operator =(const AddCommand_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-AddCommand_response::~AddCommand_response(void)
-{}
-
-AddCommand_response::AddCommand_response(const AddCommand_response& c)
-{
-    *this = c;
-}
-
-bool AddCommand_response::checkIntegrity(void)
-{
-    return AddCommand_responseMarshaller::checkIntegrity(*this);
-}
-
-AddCommand_response::AddCommand_response(void) : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_ADDCOMMAND_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_responseMarshaller.cpp
deleted file mode 100644
index 181a34869..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddCommand_response.h"
-#include "ResultMarshaller.h"
-
-#include "AddCommand_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool AddCommand_responseMarshaller::checkIntegrity(AddCommand_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddCommand_responseMarshaller::fromString(const std::string& s,AddCommand_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddCommand_responseMarshaller::toString(const AddCommand_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddCommand_responseMarshaller::checkIntegrityConst(const AddCommand_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value AddCommand_responseMarshaller::toJSON(const AddCommand_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("AddCommand");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool AddCommand_responseMarshaller::fromJSON(const Json::Value& js,AddCommand_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("AddCommand"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_responseMarshaller.h
deleted file mode 100644
index 1041b70b5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddCommand_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ADDCOMMAND_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ADDCOMMAND_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddCommand_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct AddCommand_responseMarshaller
-  {
-    static bool checkIntegrity(AddCommand_response& e);
-    static bool checkIntegrityConst(const AddCommand_response& e);
-  
-    static bool fromString(const std::string& s,AddCommand_response& e);
-    static const std::string toString(const AddCommand_response& e);
-  
-    static bool fromJSON(const Json::Value& s,AddCommand_response& e);
-    static Json::Value toJSON(const AddCommand_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_request.cpp
deleted file mode 100644
index 80f3e2ce5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_request.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_request.h"
-#include "AddSubMenu_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-AddSubMenu_request& AddSubMenu_request::operator =(const AddSubMenu_request& c)
-{
-  menuID= c.menuID;
-  position= c.position ? new unsigned int(c.position[0]) : 0;
-  menuName= c.menuName;
-
-  return *this;}
-
-
-AddSubMenu_request::~AddSubMenu_request(void)
-{
-  if(position)
-    delete position;
-}
-
-
-AddSubMenu_request::AddSubMenu_request(const AddSubMenu_request& c)
-{
-  *this=c;
-}
-
-
-bool AddSubMenu_request::checkIntegrity(void)
-{
-  return AddSubMenu_requestMarshaller::checkIntegrity(*this);
-}
-
-
-AddSubMenu_request::AddSubMenu_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_ADDSUBMENU_REQUEST),
-      position(0)
-{
-}
-
-
-
-bool AddSubMenu_request::set_menuID(unsigned int menuID_)
-{
-  if(menuID_>2000000000)  return false;
-  menuID=menuID_;
-  return true;
-}
-
-bool AddSubMenu_request::set_position(unsigned int position_)
-{
-  if(position_>1000)  return false;
-  delete position;
-  position=0;
-
-  position=new unsigned int(position_);
-  return true;
-}
-
-void AddSubMenu_request::reset_position(void)
-{
-  if(position)
-    delete position;
-  position=0;
-}
-
-bool AddSubMenu_request::set_menuName(const std::string& menuName_)
-{
-  if(menuName_.length()>500)  return false;
-  menuName=menuName_;
-  return true;
-}
-
-
-
-
-unsigned int AddSubMenu_request::get_menuID(void) const
-{
-  return menuID;
-}
-
-const unsigned int* AddSubMenu_request::get_position(void) const 
-{
-  return position;
-}
-
-const std::string& AddSubMenu_request::get_menuName(void) const 
-{
-  return menuName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_requestMarshaller.cpp
deleted file mode 100644
index d4e7542df..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_requestMarshaller.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_request.h"
-
-
-#include "AddSubMenu_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool AddSubMenu_requestMarshaller::checkIntegrity(AddSubMenu_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddSubMenu_requestMarshaller::fromString(const std::string& s,AddSubMenu_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddSubMenu_requestMarshaller::toString(const AddSubMenu_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddSubMenu_requestMarshaller::checkIntegrityConst(const AddSubMenu_request& s)
-{
-  if(s.menuID>2000000000)  return false;
-  if(s.position && *s.position>1000)  return false;
-  if(s.menuName.length()>500)  return false;
-  return true;
-}
-
-Json::Value AddSubMenu_requestMarshaller::toJSON(const AddSubMenu_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("AddSubMenu");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["menuID"]=Json::Value(e.menuID);
-
-  if(e.position)
-    j["position"]=Json::Value(*e.position);
-
-  j["menuName"]=Json::Value(e.menuName);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool AddSubMenu_requestMarshaller::fromJSON(const Json::Value& js,AddSubMenu_request& c)
-{
-  if(c.position)  delete c.position;
-  c.position=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("AddSubMenu"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("menuID"))  return false;
-    {
-      const Json::Value& j=json["menuID"];
-      if(!j.isInt())  return false;
-      c.menuID=j.asInt();
-    }
-    if(json.isMember("position"))
-    {
-      const Json::Value& j=json["position"];
-      if(!j.isInt())  return false;
-      c.position=new unsigned int(j.asInt());
-    }
-    if(!json.isMember("menuName"))  return false;
-    {
-      const Json::Value& j=json["menuName"];
-      if(!j.isString())  return false;
-      c.menuName=j.asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_requestMarshaller.h
deleted file mode 100644
index 91e0a3a08..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ADDSUBMENU_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ADDSUBMENU_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct AddSubMenu_requestMarshaller
-  {
-    static bool checkIntegrity(AddSubMenu_request& e);
-    static bool checkIntegrityConst(const AddSubMenu_request& e);
-  
-    static bool fromString(const std::string& s,AddSubMenu_request& e);
-    static const std::string toString(const AddSubMenu_request& e);
-  
-    static bool fromJSON(const Json::Value& s,AddSubMenu_request& e);
-    static Json::Value toJSON(const AddSubMenu_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_response.cpp
deleted file mode 100644
index 69f00033f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_response.h"
-#include "AddSubMenu_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-AddSubMenu_response& AddSubMenu_response::operator =(const AddSubMenu_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-AddSubMenu_response::~AddSubMenu_response(void)
-{}
-
-AddSubMenu_response::AddSubMenu_response(const AddSubMenu_response& c)
-{
-    *this = c;
-}
-
-bool AddSubMenu_response::checkIntegrity(void)
-{
-    return AddSubMenu_responseMarshaller::checkIntegrity(*this);
-}
-
-AddSubMenu_response::AddSubMenu_response(void) : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_ADDSUBMENU_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_responseMarshaller.cpp
deleted file mode 100644
index 7ea547541..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_response.h"
-#include "ResultMarshaller.h"
-
-#include "AddSubMenu_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool AddSubMenu_responseMarshaller::checkIntegrity(AddSubMenu_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddSubMenu_responseMarshaller::fromString(const std::string& s,AddSubMenu_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddSubMenu_responseMarshaller::toString(const AddSubMenu_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddSubMenu_responseMarshaller::checkIntegrityConst(const AddSubMenu_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value AddSubMenu_responseMarshaller::toJSON(const AddSubMenu_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("AddSubMenu");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool AddSubMenu_responseMarshaller::fromJSON(const Json::Value& js,AddSubMenu_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("AddSubMenu"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_responseMarshaller.h
deleted file mode 100644
index 83be341dd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AddSubMenu_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ADDSUBMENU_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ADDSUBMENU_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct AddSubMenu_responseMarshaller
-  {
-    static bool checkIntegrity(AddSubMenu_response& e);
-    static bool checkIntegrityConst(const AddSubMenu_response& e);
-  
-    static bool fromString(const std::string& s,AddSubMenu_response& e);
-    static const std::string toString(const AddSubMenu_response& e);
-  
-    static bool fromJSON(const Json::Value& s,AddSubMenu_response& e);
-    static Json::Value toJSON(const AddSubMenu_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_request.cpp
deleted file mode 100644
index 96917aeea..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_request.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Alert_request.h"
-#include "Alert_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-Alert_request& Alert_request::operator =(const Alert_request& c)
-{
-  alertText1= c.alertText1 ? new std::string(c.alertText1[0]) : 0;
-  alertText2= c.alertText2 ? new std::string(c.alertText2[0]) : 0;
-  ttsChunks= c.ttsChunks ? new std::vector<TTSChunk>(c.ttsChunks[0]) : 0;
-  duration= c.duration ? new unsigned int(c.duration[0]) : 0;
-  playTone= c.playTone ? new bool(c.playTone[0]) : 0;
-
-  return *this;}
-
-
-Alert_request::~Alert_request(void)
-{
-  if(alertText1)
-    delete alertText1;
-  if(alertText2)
-    delete alertText2;
-  if(ttsChunks)
-    delete ttsChunks;
-  if(duration)
-    delete duration;
-  if(playTone)
-    delete playTone;
-}
-
-
-Alert_request::Alert_request(const Alert_request& c)
-{
-  *this=c;
-}
-
-
-bool Alert_request::checkIntegrity(void)
-{
-  return Alert_requestMarshaller::checkIntegrity(*this);
-}
-
-
-Alert_request::Alert_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_ALERT_REQUEST),
-      alertText1(0),
-    alertText2(0),
-    ttsChunks(0),
-    duration(0),
-    playTone(0)
-{
-}
-
-
-
-bool Alert_request::set_alertText1(const std::string& alertText1_)
-{
-  if(alertText1_.length()>500)  return false;
-  delete alertText1;
-  alertText1=0;
-
-  alertText1=new std::string(alertText1_);
-  return true;
-}
-
-void Alert_request::reset_alertText1(void)
-{
-  if(alertText1)
-    delete alertText1;
-  alertText1=0;
-}
-
-bool Alert_request::set_alertText2(const std::string& alertText2_)
-{
-  if(alertText2_.length()>500)  return false;
-  delete alertText2;
-  alertText2=0;
-
-  alertText2=new std::string(alertText2_);
-  return true;
-}
-
-void Alert_request::reset_alertText2(void)
-{
-  if(alertText2)
-    delete alertText2;
-  alertText2=0;
-}
-
-bool Alert_request::set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_)
-{
-  unsigned int i=ttsChunks_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(ttsChunks_[i]))   return false;
-  }
-  delete ttsChunks;
-  ttsChunks=0;
-
-  ttsChunks=new std::vector<TTSChunk>(ttsChunks_);
-  return true;
-}
-
-void Alert_request::reset_ttsChunks(void)
-{
-  if(ttsChunks)
-    delete ttsChunks;
-  ttsChunks=0;
-}
-
-bool Alert_request::set_duration(unsigned int duration_)
-{
-  if(duration_>10000)  return false;
-  if(duration_<3000)  return false;
-  delete duration;
-  duration=0;
-
-  duration=new unsigned int(duration_);
-  return true;
-}
-
-void Alert_request::reset_duration(void)
-{
-  if(duration)
-    delete duration;
-  duration=0;
-}
-
-bool Alert_request::set_playTone(bool playTone_)
-{
-  delete playTone;
-  playTone=0;
-
-  playTone=new bool(playTone_);
-  return true;
-}
-
-void Alert_request::reset_playTone(void)
-{
-  if(playTone)
-    delete playTone;
-  playTone=0;
-}
-
-
-
-
-const std::string* Alert_request::get_alertText1(void) const 
-{
-  return alertText1;
-}
-
-const std::string* Alert_request::get_alertText2(void) const 
-{
-  return alertText2;
-}
-
-const std::vector<TTSChunk>* Alert_request::get_ttsChunks(void) const 
-{
-  return ttsChunks;
-}
-
-const unsigned int* Alert_request::get_duration(void) const 
-{
-  return duration;
-}
-
-const bool* Alert_request::get_playTone(void) const 
-{
-  return playTone;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_requestMarshaller.cpp
deleted file mode 100644
index 96190c021..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_requestMarshaller.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Alert_request.h"
-#include "TTSChunkMarshaller.h"
-
-#include "Alert_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool Alert_requestMarshaller::checkIntegrity(Alert_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Alert_requestMarshaller::fromString(const std::string& s,Alert_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Alert_requestMarshaller::toString(const Alert_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Alert_requestMarshaller::checkIntegrityConst(const Alert_request& s)
-{
-  if(s.alertText1 && s.alertText1->length()>500)  return false;
-  if(s.alertText2 && s.alertText2->length()>500)  return false;
-  if(s.ttsChunks)
-  {
-    unsigned int i=s.ttsChunks[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.ttsChunks[0][i]))   return false;
-    }
-  }
-  if(s.duration && *s.duration>10000)  return false;
-  if(s.duration && *s.duration<3000)  return false;
-  return true;
-}
-
-Json::Value Alert_requestMarshaller::toJSON(const Alert_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("Alert");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  if(e.alertText1)
-    j["alertText1"]=Json::Value(*e.alertText1);
-
-  if(e.alertText2)
-    j["alertText2"]=Json::Value(*e.alertText2);
-
-  if(e.ttsChunks)
-  {
-    unsigned int sz=e.ttsChunks->size();
-    j["ttsChunks"]=Json::Value(Json::arrayValue);
-    j["ttsChunks"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["ttsChunks"][i]=TTSChunkMarshaller::toJSON(e.ttsChunks[0][i]);
-  }
-
-  if(e.duration)
-    j["duration"]=Json::Value(*e.duration);
-
-  if(e.playTone)
-    j["playTone"]=Json::Value(*e.playTone);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool Alert_requestMarshaller::fromJSON(const Json::Value& js,Alert_request& c)
-{
-  if(c.alertText1)  delete c.alertText1;
-  c.alertText1=0;
-
-  if(c.alertText2)  delete c.alertText2;
-  c.alertText2=0;
-
-  if(c.ttsChunks)  delete c.ttsChunks;
-  c.ttsChunks=0;
-
-  if(c.duration)  delete c.duration;
-  c.duration=0;
-
-  if(c.playTone)  delete c.playTone;
-  c.playTone=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("Alert"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(json.isMember("alertText1"))
-    {
-      const Json::Value& j=json["alertText1"];
-      if(!j.isString())  return false;
-      c.alertText1=new std::string(j.asString());
-    }
-    if(json.isMember("alertText2"))
-    {
-      const Json::Value& j=json["alertText2"];
-      if(!j.isString())  return false;
-      c.alertText2=new std::string(j.asString());
-    }
-    if(json.isMember("ttsChunks"))
-    {
-      const Json::Value& j=json["ttsChunks"];
-      if(!j.isArray())  return false;
-      c.ttsChunks=new std::vector<TTSChunk>();
-      c.ttsChunks->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        TTSChunk t;
-        if(!TTSChunkMarshaller::fromJSON(j[i],t))
-          return false;
-        c.ttsChunks[0][i]=t;
-      }
-
-    }
-    if(json.isMember("duration"))
-    {
-      const Json::Value& j=json["duration"];
-      if(!j.isInt())  return false;
-      c.duration=new unsigned int(j.asInt());
-    }
-    if(json.isMember("playTone"))
-    {
-      const Json::Value& j=json["playTone"];
-      if(!j.isBool())  return false;
-      c.playTone=new bool(j.asBool());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_requestMarshaller.h
deleted file mode 100644
index 5479976ea..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ALERT_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ALERT_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Alert_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct Alert_requestMarshaller
-  {
-    static bool checkIntegrity(Alert_request& e);
-    static bool checkIntegrityConst(const Alert_request& e);
-  
-    static bool fromString(const std::string& s,Alert_request& e);
-    static const std::string toString(const Alert_request& e);
-  
-    static bool fromJSON(const Json::Value& s,Alert_request& e);
-    static Json::Value toJSON(const Alert_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_response.cpp
deleted file mode 100644
index 8888fad26..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Alert_response.h"
-#include "Alert_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-Alert_response& Alert_response::operator =(const Alert_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-Alert_response::~Alert_response(void)
-{}
-
-Alert_response::Alert_response(const Alert_response& c)
-{
-    *this = c;
-}
-
-bool Alert_response::checkIntegrity(void)
-{
-    return Alert_responseMarshaller::checkIntegrity(*this);
-}
-
-Alert_response::Alert_response(void) : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_ALERT_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_responseMarshaller.cpp
deleted file mode 100644
index 9d6abdf7a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Alert_response.h"
-#include "ResultMarshaller.h"
-
-#include "Alert_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool Alert_responseMarshaller::checkIntegrity(Alert_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Alert_responseMarshaller::fromString(const std::string& s,Alert_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Alert_responseMarshaller::toString(const Alert_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Alert_responseMarshaller::checkIntegrityConst(const Alert_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value Alert_responseMarshaller::toJSON(const Alert_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("Alert");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool Alert_responseMarshaller::fromJSON(const Json::Value& js,Alert_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("Alert"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_responseMarshaller.h
deleted file mode 100644
index 8be945c23..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Alert_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ALERT_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ALERT_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Alert_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct Alert_responseMarshaller
-  {
-    static bool checkIntegrity(Alert_response& e);
-    static bool checkIntegrityConst(const Alert_response& e);
-  
-    static bool fromString(const std::string& s,Alert_response& e);
-    static const std::string toString(const Alert_response& e);
-  
-    static bool fromJSON(const Json::Value& s,Alert_response& e);
-    static Json::Value toJSON(const Alert_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.cpp
deleted file mode 100644
index d72172a1a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/AppInterfaceUnregisteredReason.h"
-#include "AppInterfaceUnregisteredReasonMarshaller.h"
-#include "AppInterfaceUnregisteredReasonMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const AppInterfaceUnregisteredReason::AppInterfaceUnregisteredReasonInternal AppInterfaceUnregisteredReasonMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return AppInterfaceUnregisteredReason::INVALID_ENUM;
-  const struct PerfectHashTable* p=AppInterfaceUnregisteredReason_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<AppInterfaceUnregisteredReason::AppInterfaceUnregisteredReasonInternal>(p->idx) : AppInterfaceUnregisteredReason::INVALID_ENUM;
-}
-
-
-bool AppInterfaceUnregisteredReasonMarshaller::fromJSON(const Json::Value& s,AppInterfaceUnregisteredReason& e)
-{
-  e.mInternal=AppInterfaceUnregisteredReason::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=AppInterfaceUnregisteredReason::INVALID_ENUM);
-}
-
-
-Json::Value AppInterfaceUnregisteredReasonMarshaller::toJSON(const AppInterfaceUnregisteredReason& e)
-{
-  if(e.mInternal==AppInterfaceUnregisteredReason::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AppInterfaceUnregisteredReasonMarshaller::fromString(const std::string& s,AppInterfaceUnregisteredReason& e)
-{
-  e.mInternal=AppInterfaceUnregisteredReason::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string AppInterfaceUnregisteredReasonMarshaller::toString(const AppInterfaceUnregisteredReason& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==AppInterfaceUnregisteredReason::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AppInterfaceUnregisteredReasonMarshaller::mHashTable[10]=
-{
-  {"USER_EXIT",0},
-  {"IGNITION_OFF",1},
-  {"BLUETOOTH_OFF",2},
-  {"USB_DISCONNECTED",3},
-  {"REQUEST_WHILE_IN_NONE_HMI_LEVEL",4},
-  {"TOO_MANY_REQUESTS",5},
-  {"DRIVER_DISTRACTION_VIOLATION",6},
-  {"LANGUAGE_CHANGE",7},
-  {"MASTER_RESET",8},
-  {"FACTORY_DEFAULTS",9}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp
deleted file mode 100644
index 2f0c1d160..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp
+++ /dev/null
@@ -1,26 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AppInterfaceUnregisteredReason_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-USER_EXIT,0
-IGNITION_OFF,1
-BLUETOOTH_OFF,2
-USB_DISCONNECTED,3
-REQUEST_WHILE_IN_NONE_HMI_LEVEL,4
-TOO_MANY_REQUESTS,5
-DRIVER_DISTRACTION_VIOLATION,6
-LANGUAGE_CHANGE,7
-MASTER_RESET,8
-FACTORY_DEFAULTS,9
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.h
deleted file mode 100644
index ada5bbb86..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_APPINTERFACEUNREGISTEREDREASONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_APPINTERFACEUNREGISTEREDREASONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AppInterfaceUnregisteredReason.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for AppInterfaceUnregisteredReason
-
-  class AppInterfaceUnregisteredReasonMarshaller
-  {
-  public:
-  
-    static std::string toName(const AppInterfaceUnregisteredReason& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(AppInterfaceUnregisteredReason& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=AppInterfaceUnregisteredReason::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(AppInterfaceUnregisteredReason& e)		{ return e.mInternal!=AppInterfaceUnregisteredReason::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const AppInterfaceUnregisteredReason& e)	{ return e.mInternal!=AppInterfaceUnregisteredReason::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,AppInterfaceUnregisteredReason& e);
-    static const std::string toString(const AppInterfaceUnregisteredReason& e);
-  
-    static bool fromJSON(const Json::Value& s,AppInterfaceUnregisteredReason& e);
-    static Json::Value toJSON(const AppInterfaceUnregisteredReason& e);
-  
-    static const char* getName(AppInterfaceUnregisteredReason::AppInterfaceUnregisteredReasonInternal e)
-    {
-       return (e>=0 && e<10) ? mHashTable[e].name : NULL;
-    }
-  
-    static const AppInterfaceUnregisteredReason::AppInterfaceUnregisteredReasonInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[10];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.inc
deleted file mode 100644
index 555530c25..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.inc
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp  */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 10
-#define MIN_WORD_LENGTH 9
-#define MAX_WORD_LENGTH 31
-#define MIN_HASH_VALUE 9
-#define MAX_HASH_VALUE 31
-/* maximum key range = 23, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPC {
-
-class AppInterfaceUnregisteredReason_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-AppInterfaceUnregisteredReason_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32,  0, 32,  0, 32,
-       5, 32, 32, 10, 32, 32,  0,  0, 32, 32,
-      32, 32,  0, 32,  0,  0, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-AppInterfaceUnregisteredReason_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0, 12, 13,
-       0, 15, 16, 17,  0,  0,  0, 16, 12,  0,  0,  0,  0,  0,
-      28,  0,  0, 31
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"USER_EXIT",0},
-      {""}, {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"MASTER_RESET",8},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"BLUETOOTH_OFF",2},
-      {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"LANGUAGE_CHANGE",7},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"USB_DISCONNECTED",3},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"TOO_MANY_REQUESTS",5},
-      {""}, {""}, {""},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"FACTORY_DEFAULTS",9},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"IGNITION_OFF",1},
-      {""}, {""}, {""}, {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"DRIVER_DISTRACTION_VIOLATION",6},
-      {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"REQUEST_WHILE_IN_NONE_HMI_LEVEL",4}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.cpp
deleted file mode 100644
index f7fa2f7fb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/AudioCaptureQuality.h"
-#include "AudioCaptureQualityMarshaller.h"
-#include "AudioCaptureQualityMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const AudioCaptureQuality::AudioCaptureQualityInternal AudioCaptureQualityMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return AudioCaptureQuality::INVALID_ENUM;
-  const struct PerfectHashTable* p=AudioCaptureQuality_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<AudioCaptureQuality::AudioCaptureQualityInternal>(p->idx) : AudioCaptureQuality::INVALID_ENUM;
-}
-
-
-bool AudioCaptureQualityMarshaller::fromJSON(const Json::Value& s,AudioCaptureQuality& e)
-{
-  e.mInternal=AudioCaptureQuality::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=AudioCaptureQuality::INVALID_ENUM);
-}
-
-
-Json::Value AudioCaptureQualityMarshaller::toJSON(const AudioCaptureQuality& e)
-{
-  if(e.mInternal==AudioCaptureQuality::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AudioCaptureQualityMarshaller::fromString(const std::string& s,AudioCaptureQuality& e)
-{
-  e.mInternal=AudioCaptureQuality::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string AudioCaptureQualityMarshaller::toString(const AudioCaptureQuality& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==AudioCaptureQuality::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AudioCaptureQualityMarshaller::mHashTable[2]=
-{
-  {"8KHZ",0},
-  {"16KHZ",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.gp
deleted file mode 100644
index d0d094502..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AudioCaptureQuality_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-8KHZ,0
-16KHZ,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.h
deleted file mode 100644
index c5f12dacb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_AUDIOCAPTUREQUALITYMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_AUDIOCAPTUREQUALITYMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AudioCaptureQuality.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for AudioCaptureQuality
-
-  class AudioCaptureQualityMarshaller
-  {
-  public:
-  
-    static std::string toName(const AudioCaptureQuality& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(AudioCaptureQuality& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=AudioCaptureQuality::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(AudioCaptureQuality& e)		{ return e.mInternal!=AudioCaptureQuality::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const AudioCaptureQuality& e)	{ return e.mInternal!=AudioCaptureQuality::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,AudioCaptureQuality& e);
-    static const std::string toString(const AudioCaptureQuality& e);
-  
-    static bool fromJSON(const Json::Value& s,AudioCaptureQuality& e);
-    static Json::Value toJSON(const AudioCaptureQuality& e);
-  
-    static const char* getName(AudioCaptureQuality::AudioCaptureQualityInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const AudioCaptureQuality::AudioCaptureQualityInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.inc
deleted file mode 100644
index c3d8a7c33..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 5
-/* maximum key range = 2, duplicates = 0 */
-
-class AudioCaptureQuality_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-AudioCaptureQuality_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-AudioCaptureQuality_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  5
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.gp"
-      {"8KHZ",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioCaptureQualityMarshaller.gp"
-      {"16KHZ",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.cpp
deleted file mode 100644
index 8c9b4f09c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/AudioStreamingState.h"
-#include "AudioStreamingStateMarshaller.h"
-#include "AudioStreamingStateMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const AudioStreamingState::AudioStreamingStateInternal AudioStreamingStateMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return AudioStreamingState::INVALID_ENUM;
-  const struct PerfectHashTable* p=AudioStreamingState_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<AudioStreamingState::AudioStreamingStateInternal>(p->idx) : AudioStreamingState::INVALID_ENUM;
-}
-
-
-bool AudioStreamingStateMarshaller::fromJSON(const Json::Value& s,AudioStreamingState& e)
-{
-  e.mInternal=AudioStreamingState::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=AudioStreamingState::INVALID_ENUM);
-}
-
-
-Json::Value AudioStreamingStateMarshaller::toJSON(const AudioStreamingState& e)
-{
-  if(e.mInternal==AudioStreamingState::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AudioStreamingStateMarshaller::fromString(const std::string& s,AudioStreamingState& e)
-{
-  e.mInternal=AudioStreamingState::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string AudioStreamingStateMarshaller::toString(const AudioStreamingState& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==AudioStreamingState::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AudioStreamingStateMarshaller::mHashTable[2]=
-{
-  {"AUDIBLE",0},
-  {"NOT_AUDIBLE",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.gp
deleted file mode 100644
index 233ca9401..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AudioStreamingState_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-AUDIBLE,0
-NOT_AUDIBLE,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.h
deleted file mode 100644
index 62c7e6b31..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_AUDIOSTREAMINGSTATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_AUDIOSTREAMINGSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/AudioStreamingState.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for AudioStreamingState
-
-  class AudioStreamingStateMarshaller
-  {
-  public:
-  
-    static std::string toName(const AudioStreamingState& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(AudioStreamingState& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=AudioStreamingState::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(AudioStreamingState& e)		{ return e.mInternal!=AudioStreamingState::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const AudioStreamingState& e)	{ return e.mInternal!=AudioStreamingState::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,AudioStreamingState& e);
-    static const std::string toString(const AudioStreamingState& e);
-  
-    static bool fromJSON(const Json::Value& s,AudioStreamingState& e);
-    static Json::Value toJSON(const AudioStreamingState& e);
-  
-    static const char* getName(AudioStreamingState::AudioStreamingStateInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const AudioStreamingState::AudioStreamingStateInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.inc
deleted file mode 100644
index 232669a7f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 11
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 11
-/* maximum key range = 5, duplicates = 0 */
-
-class AudioStreamingState_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-AudioStreamingState_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-AudioStreamingState_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0, 11
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.gp"
-      {"AUDIBLE",0},
-      {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/AudioStreamingStateMarshaller.gp"
-      {"NOT_AUDIBLE",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonCapabilities.cpp
deleted file mode 100644
index a31417866..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonCapabilities.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/ButtonCapabilities.h"
-#include "ButtonCapabilitiesMarshaller.h"
-#include "ButtonNameMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPC;
-
-ButtonCapabilities::ButtonCapabilities(const ButtonCapabilities& c)
-{
-  *this=c;
-}
-
-
-bool ButtonCapabilities::checkIntegrity(void)
-{
-  return ButtonCapabilitiesMarshaller::checkIntegrity(*this);
-}
-
-
-ButtonCapabilities::ButtonCapabilities(void)
-{
-}
-
-
-
-bool ButtonCapabilities::set_longPressAvailable(bool longPressAvailable_)
-{
-  longPressAvailable=longPressAvailable_;
-  return true;
-}
-
-bool ButtonCapabilities::set_name(const ButtonName& name_)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(name_))   return false;
-  name=name_;
-  return true;
-}
-
-bool ButtonCapabilities::set_shortPressAvailable(bool shortPressAvailable_)
-{
-  shortPressAvailable=shortPressAvailable_;
-  return true;
-}
-
-bool ButtonCapabilities::set_upDownAvailable(bool upDownAvailable_)
-{
-  upDownAvailable=upDownAvailable_;
-  return true;
-}
-
-
-
-
-bool ButtonCapabilities::get_longPressAvailable(void) const
-{
-  return longPressAvailable;
-}
-
-
-const ButtonName& ButtonCapabilities::get_name(void) const 
-{
-  return name;
-}
-
-
-bool ButtonCapabilities::get_shortPressAvailable(void) const
-{
-  return shortPressAvailable;
-}
-
-
-bool ButtonCapabilities::get_upDownAvailable(void) const
-{
-  return upDownAvailable;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonCapabilitiesMarshaller.cpp
deleted file mode 100644
index 1c72e6b25..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/ButtonCapabilities.h"
-#include "ButtonNameMarshaller.h"
-
-#include "ButtonCapabilitiesMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool ButtonCapabilitiesMarshaller::checkIntegrity(ButtonCapabilities& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ButtonCapabilitiesMarshaller::fromString(const std::string& s,ButtonCapabilities& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ButtonCapabilitiesMarshaller::toString(const ButtonCapabilities& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ButtonCapabilitiesMarshaller::checkIntegrityConst(const ButtonCapabilities& s)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(s.name))  return false;
-  return true;
-}
-
-Json::Value ButtonCapabilitiesMarshaller::toJSON(const ButtonCapabilities& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["longPressAvailable"]=Json::Value(e.longPressAvailable);
-
-  json["name"]=ButtonNameMarshaller::toJSON(e.name);
-
-  json["shortPressAvailable"]=Json::Value(e.shortPressAvailable);
-
-  json["upDownAvailable"]=Json::Value(e.upDownAvailable);
-
-
-  return json;
-}
-
-
-bool ButtonCapabilitiesMarshaller::fromJSON(const Json::Value& json,ButtonCapabilities& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("longPressAvailable"))  return false;
-    {
-      const Json::Value& j=json["longPressAvailable"];
-      if(!j.isBool())  return false;
-      c.longPressAvailable=j.asBool();
-    }
-    if(!json.isMember("name"))  return false;
-    {
-      const Json::Value& j=json["name"];
-      if(!ButtonNameMarshaller::fromJSON(j,c.name))
-        return false;
-    }
-    if(!json.isMember("shortPressAvailable"))  return false;
-    {
-      const Json::Value& j=json["shortPressAvailable"];
-      if(!j.isBool())  return false;
-      c.shortPressAvailable=j.asBool();
-    }
-    if(!json.isMember("upDownAvailable"))  return false;
-    {
-      const Json::Value& j=json["upDownAvailable"];
-      if(!j.isBool())  return false;
-      c.upDownAvailable=j.asBool();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonCapabilitiesMarshaller.h
deleted file mode 100644
index 9a01a8177..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_BUTTONCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_BUTTONCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/ButtonCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct ButtonCapabilitiesMarshaller
-  {
-    static bool checkIntegrity(ButtonCapabilities& e);
-    static bool checkIntegrityConst(const ButtonCapabilities& e);
-  
-    static bool fromString(const std::string& s,ButtonCapabilities& e);
-    static const std::string toString(const ButtonCapabilities& e);
-  
-    static bool fromJSON(const Json::Value& s,ButtonCapabilities& e);
-    static Json::Value toJSON(const ButtonCapabilities& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.cpp
deleted file mode 100644
index 2074e960b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/ButtonEventMode.h"
-#include "ButtonEventModeMarshaller.h"
-#include "ButtonEventModeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const ButtonEventMode::ButtonEventModeInternal ButtonEventModeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return ButtonEventMode::INVALID_ENUM;
-  const struct PerfectHashTable* p=ButtonEventMode_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<ButtonEventMode::ButtonEventModeInternal>(p->idx) : ButtonEventMode::INVALID_ENUM;
-}
-
-
-bool ButtonEventModeMarshaller::fromJSON(const Json::Value& s,ButtonEventMode& e)
-{
-  e.mInternal=ButtonEventMode::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=ButtonEventMode::INVALID_ENUM);
-}
-
-
-Json::Value ButtonEventModeMarshaller::toJSON(const ButtonEventMode& e)
-{
-  if(e.mInternal==ButtonEventMode::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ButtonEventModeMarshaller::fromString(const std::string& s,ButtonEventMode& e)
-{
-  e.mInternal=ButtonEventMode::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string ButtonEventModeMarshaller::toString(const ButtonEventMode& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==ButtonEventMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ButtonEventModeMarshaller::mHashTable[2]=
-{
-  {"BUTTONUP",0},
-  {"BUTTONDOWN",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.gp
deleted file mode 100644
index b9f1d7d57..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name ButtonEventMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-BUTTONUP,0
-BUTTONDOWN,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.h
deleted file mode 100644
index 011c59fa3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_BUTTONEVENTMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_BUTTONEVENTMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/ButtonEventMode.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for ButtonEventMode
-
-  class ButtonEventModeMarshaller
-  {
-  public:
-  
-    static std::string toName(const ButtonEventMode& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(ButtonEventMode& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=ButtonEventMode::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(ButtonEventMode& e)		{ return e.mInternal!=ButtonEventMode::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const ButtonEventMode& e)	{ return e.mInternal!=ButtonEventMode::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,ButtonEventMode& e);
-    static const std::string toString(const ButtonEventMode& e);
-  
-    static bool fromJSON(const Json::Value& s,ButtonEventMode& e);
-    static Json::Value toJSON(const ButtonEventMode& e);
-  
-    static const char* getName(ButtonEventMode::ButtonEventModeInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const ButtonEventMode::ButtonEventModeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.inc
deleted file mode 100644
index 8b9045d59..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 8
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 8
-#define MAX_HASH_VALUE 10
-/* maximum key range = 3, duplicates = 0 */
-
-class ButtonEventMode_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-ButtonEventMode_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-ButtonEventMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  8,  0, 10
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.gp"
-      {"BUTTONUP",0},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonEventModeMarshaller.gp"
-      {"BUTTONDOWN",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.cpp
deleted file mode 100644
index 4fc06ce7e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/ButtonName.h"
-#include "ButtonNameMarshaller.h"
-#include "ButtonNameMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const ButtonName::ButtonNameInternal ButtonNameMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return ButtonName::INVALID_ENUM;
-  const struct PerfectHashTable* p=ButtonName_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<ButtonName::ButtonNameInternal>(p->idx) : ButtonName::INVALID_ENUM;
-}
-
-
-bool ButtonNameMarshaller::fromJSON(const Json::Value& s,ButtonName& e)
-{
-  e.mInternal=ButtonName::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=ButtonName::INVALID_ENUM);
-}
-
-
-Json::Value ButtonNameMarshaller::toJSON(const ButtonName& e)
-{
-  if(e.mInternal==ButtonName::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ButtonNameMarshaller::fromString(const std::string& s,ButtonName& e)
-{
-  e.mInternal=ButtonName::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string ButtonNameMarshaller::toString(const ButtonName& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==ButtonName::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ButtonNameMarshaller::mHashTable[15]=
-{
-  {"OK",0},
-  {"SEEKLEFT",1},
-  {"SEEKRIGHT",2},
-  {"TUNEUP",3},
-  {"TUNEDOWN",4},
-  {"PRESET_0",5},
-  {"PRESET_1",6},
-  {"PRESET_2",7},
-  {"PRESET_3",8},
-  {"PRESET_4",9},
-  {"PRESET_5",10},
-  {"PRESET_6",11},
-  {"PRESET_7",12},
-  {"PRESET_8",13},
-  {"PRESET_9",14}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp
deleted file mode 100644
index a7c5a08b0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp
+++ /dev/null
@@ -1,31 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name ButtonName_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-OK,0
-SEEKLEFT,1
-SEEKRIGHT,2
-TUNEUP,3
-TUNEDOWN,4
-PRESET_0,5
-PRESET_1,6
-PRESET_2,7
-PRESET_3,8
-PRESET_4,9
-PRESET_5,10
-PRESET_6,11
-PRESET_7,12
-PRESET_8,13
-PRESET_9,14
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.h
deleted file mode 100644
index 25cdcfc96..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_BUTTONNAMEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_BUTTONNAMEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/ButtonName.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for ButtonName
-
-  class ButtonNameMarshaller
-  {
-  public:
-  
-    static std::string toName(const ButtonName& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(ButtonName& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=ButtonName::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(ButtonName& e)		{ return e.mInternal!=ButtonName::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const ButtonName& e)	{ return e.mInternal!=ButtonName::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,ButtonName& e);
-    static const std::string toString(const ButtonName& e);
-  
-    static bool fromJSON(const Json::Value& s,ButtonName& e);
-    static Json::Value toJSON(const ButtonName& e);
-  
-    static const char* getName(ButtonName::ButtonNameInternal e)
-    {
-       return (e>=0 && e<15) ? mHashTable[e].name : NULL;
-    }
-  
-    static const ButtonName::ButtonNameInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[15];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.inc
deleted file mode 100644
index 307db7040..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.inc
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp  */
-/* Computed positions: -k'8' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 15
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 9
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 23
-/* maximum key range = 22, duplicates = 0 */
-
-class ButtonName_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-ButtonName_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24,  7,  2,
-      13,  8,  3, 14,  9,  4, 15, 10, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24,  0, 24, 24, 24, 24, 24,  5, 24,
-      24, 24, 24, 24,  0, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[7]];
-      /*FALLTHROUGH*/
-      case 7:
-      case 6:
-      case 5:
-      case 4:
-      case 3:
-      case 2:
-        break;
-    }
-  return hval;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-ButtonName_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  2,  0,  0,  0,  6,  0,  8,  9,  8,  8,  8,  8,
-       0,  8,  8,  8,  8,  0,  0,  8,  8,  8
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"OK",0},
-      {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"TUNEUP",3},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"SEEKLEFT",1},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"SEEKRIGHT",2},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"PRESET_1",6},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"PRESET_4",9},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"PRESET_7",12},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"TUNEDOWN",4},
-      {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"PRESET_0",5},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"PRESET_3",8},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"PRESET_6",11},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"PRESET_9",14},
-      {""}, {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"PRESET_2",7},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"PRESET_5",10},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonNameMarshaller.gp"
-      {"PRESET_8",13}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.cpp
deleted file mode 100644
index d4a55c0a1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/ButtonPressMode.h"
-#include "ButtonPressModeMarshaller.h"
-#include "ButtonPressModeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const ButtonPressMode::ButtonPressModeInternal ButtonPressModeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return ButtonPressMode::INVALID_ENUM;
-  const struct PerfectHashTable* p=ButtonPressMode_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<ButtonPressMode::ButtonPressModeInternal>(p->idx) : ButtonPressMode::INVALID_ENUM;
-}
-
-
-bool ButtonPressModeMarshaller::fromJSON(const Json::Value& s,ButtonPressMode& e)
-{
-  e.mInternal=ButtonPressMode::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=ButtonPressMode::INVALID_ENUM);
-}
-
-
-Json::Value ButtonPressModeMarshaller::toJSON(const ButtonPressMode& e)
-{
-  if(e.mInternal==ButtonPressMode::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ButtonPressModeMarshaller::fromString(const std::string& s,ButtonPressMode& e)
-{
-  e.mInternal=ButtonPressMode::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string ButtonPressModeMarshaller::toString(const ButtonPressMode& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==ButtonPressMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ButtonPressModeMarshaller::mHashTable[2]=
-{
-  {"LONG",0},
-  {"SHORT",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.gp
deleted file mode 100644
index e6482dc86..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name ButtonPressMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-LONG,0
-SHORT,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.h
deleted file mode 100644
index ce359e9e0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_BUTTONPRESSMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_BUTTONPRESSMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/ButtonPressMode.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for ButtonPressMode
-
-  class ButtonPressModeMarshaller
-  {
-  public:
-  
-    static std::string toName(const ButtonPressMode& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(ButtonPressMode& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=ButtonPressMode::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(ButtonPressMode& e)		{ return e.mInternal!=ButtonPressMode::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const ButtonPressMode& e)	{ return e.mInternal!=ButtonPressMode::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,ButtonPressMode& e);
-    static const std::string toString(const ButtonPressMode& e);
-  
-    static bool fromJSON(const Json::Value& s,ButtonPressMode& e);
-    static Json::Value toJSON(const ButtonPressMode& e);
-  
-    static const char* getName(ButtonPressMode::ButtonPressModeInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const ButtonPressMode::ButtonPressModeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.inc
deleted file mode 100644
index ff3313482..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 5
-/* maximum key range = 2, duplicates = 0 */
-
-class ButtonPressMode_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-ButtonPressMode_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-ButtonPressMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  5
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.gp"
-      {"LONG",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ButtonPressModeMarshaller.gp"
-      {"SHORT",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.cpp
deleted file mode 100644
index 186640026..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/CharacterSet.h"
-#include "CharacterSetMarshaller.h"
-#include "CharacterSetMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const CharacterSet::CharacterSetInternal CharacterSetMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return CharacterSet::INVALID_ENUM;
-  const struct PerfectHashTable* p=CharacterSet_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<CharacterSet::CharacterSetInternal>(p->idx) : CharacterSet::INVALID_ENUM;
-}
-
-
-bool CharacterSetMarshaller::fromJSON(const Json::Value& s,CharacterSet& e)
-{
-  e.mInternal=CharacterSet::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=CharacterSet::INVALID_ENUM);
-}
-
-
-Json::Value CharacterSetMarshaller::toJSON(const CharacterSet& e)
-{
-  if(e.mInternal==CharacterSet::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool CharacterSetMarshaller::fromString(const std::string& s,CharacterSet& e)
-{
-  e.mInternal=CharacterSet::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string CharacterSetMarshaller::toString(const CharacterSet& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==CharacterSet::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable CharacterSetMarshaller::mHashTable[4]=
-{
-  {"TYPE2SET",0},
-  {"TYPE5SET",1},
-  {"CID1SET",2},
-  {"CID2SET",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.gp
deleted file mode 100644
index f39607ce7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name CharacterSet_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-TYPE2SET,0
-TYPE5SET,1
-CID1SET,2
-CID2SET,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.h
deleted file mode 100644
index 61d453051..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_CHARACTERSETMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_CHARACTERSETMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/CharacterSet.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for CharacterSet
-
-  class CharacterSetMarshaller
-  {
-  public:
-  
-    static std::string toName(const CharacterSet& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(CharacterSet& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=CharacterSet::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(CharacterSet& e)		{ return e.mInternal!=CharacterSet::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const CharacterSet& e)	{ return e.mInternal!=CharacterSet::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,CharacterSet& e);
-    static const std::string toString(const CharacterSet& e);
-  
-    static bool fromJSON(const Json::Value& s,CharacterSet& e);
-    static Json::Value toJSON(const CharacterSet& e);
-  
-    static const char* getName(CharacterSet::CharacterSetInternal e)
-    {
-       return (e>=0 && e<4) ? mHashTable[e].name : NULL;
-    }
-  
-    static const CharacterSet::CharacterSetInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[4];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.inc
deleted file mode 100644
index 09970013a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.inc
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.gp  */
-/* Computed positions: -k'4-5' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 8
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 13
-/* maximum key range = 7, duplicates = 0 */
-
-class CharacterSet_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-CharacterSet_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-       5, 14, 14,  0, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14,  0, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14
-    };
-  return len + asso_values[(unsigned char)str[4]] + asso_values[(unsigned char)str[3]];
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-CharacterSet_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  7,  8,  0,  0,  0,  7,  8
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.gp"
-      {"CID1SET",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.gp"
-      {"TYPE5SET",1},
-      {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.gp"
-      {"CID2SET",3},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CharacterSetMarshaller.gp"
-      {"TYPE2SET",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Choice.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Choice.cpp
deleted file mode 100644
index 6063c44f8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Choice.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Choice.h"
-#include "ChoiceMarshaller.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPC;
-
-Choice::Choice(const Choice& c)
-{
-  *this=c;
-}
-
-
-bool Choice::checkIntegrity(void)
-{
-  return ChoiceMarshaller::checkIntegrity(*this);
-}
-
-
-Choice::Choice(void)
-{
-}
-
-
-
-bool Choice::set_choiceID(unsigned int choiceID_)
-{
-  if(choiceID_>65535)  return false;
-  choiceID=choiceID_;
-  return true;
-}
-
-bool Choice::set_menuName(const std::string& menuName_)
-{
-  if(menuName_.length()>500)  return false;
-  menuName=menuName_;
-  return true;
-}
-
-bool Choice::set_vrCommands(const std::vector<std::string>& vrCommands_)
-{
-  unsigned int i=vrCommands_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(vrCommands_[i].length()>99)  return false;
-  }
-  vrCommands=vrCommands_;
-  return true;
-}
-
-
-
-
-unsigned int Choice::get_choiceID(void) const
-{
-  return choiceID;
-}
-
-
-const std::string& Choice::get_menuName(void) const 
-{
-  return menuName;
-}
-
-
-const std::vector<std::string>& Choice::get_vrCommands(void) const 
-{
-  return vrCommands;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ChoiceMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ChoiceMarshaller.cpp
deleted file mode 100644
index 1970e06b8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ChoiceMarshaller.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Choice.h"
-
-
-#include "ChoiceMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool ChoiceMarshaller::checkIntegrity(Choice& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ChoiceMarshaller::fromString(const std::string& s,Choice& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ChoiceMarshaller::toString(const Choice& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChoiceMarshaller::checkIntegrityConst(const Choice& s)
-{
-  if(s.choiceID>65535)  return false;
-  if(s.menuName.length()>500)  return false;
-  {
-    unsigned int i=s.vrCommands.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.vrCommands[i].length()>99)  return false;
-    }
-  }
-  return true;
-}
-
-Json::Value ChoiceMarshaller::toJSON(const Choice& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["choiceID"]=Json::Value(e.choiceID);
-
-  json["menuName"]=Json::Value(e.menuName);
-
-  json["vrCommands"]=Json::Value(Json::arrayValue);
-  json["vrCommands"].resize(e.vrCommands.size());
-  for(unsigned int i=0;i<e.vrCommands.size();i++)
-    json["vrCommands"][i]=Json::Value(e.vrCommands[i]);
-
-
-  return json;
-}
-
-
-bool ChoiceMarshaller::fromJSON(const Json::Value& json,Choice& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("choiceID"))  return false;
-    {
-      const Json::Value& j=json["choiceID"];
-      if(!j.isInt())  return false;
-      c.choiceID=j.asInt();
-    }
-    if(!json.isMember("menuName"))  return false;
-    {
-      const Json::Value& j=json["menuName"];
-      if(!j.isString())  return false;
-      c.menuName=j.asString();
-    }
-    if(!json.isMember("vrCommands"))  return false;
-    {
-      const Json::Value& j=json["vrCommands"];
-      if(!j.isArray())  return false;
-      c.vrCommands.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.vrCommands[i]=j[i].asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ChoiceMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ChoiceMarshaller.h
deleted file mode 100644
index 89332849e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ChoiceMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_CHOICEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_CHOICEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Choice.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct ChoiceMarshaller
-  {
-    static bool checkIntegrity(Choice& e);
-    static bool checkIntegrityConst(const Choice& e);
-  
-    static bool fromString(const std::string& s,Choice& e);
-    static const std::string toString(const Choice& e);
-  
-    static bool fromJSON(const Json::Value& s,Choice& e);
-    static Json::Value toJSON(const Choice& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_request.cpp
deleted file mode 100644
index 2dbffb617..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_request.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_request.h"
-#include "CreateInteractionChoiceSet_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "ChoiceMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-CreateInteractionChoiceSet_request::~CreateInteractionChoiceSet_request(void)
-{
-}
-
-
-CreateInteractionChoiceSet_request::CreateInteractionChoiceSet_request(const CreateInteractionChoiceSet_request& c)
-{
-  *this=c;
-}
-
-
-bool CreateInteractionChoiceSet_request::checkIntegrity(void)
-{
-  return CreateInteractionChoiceSet_requestMarshaller::checkIntegrity(*this);
-}
-
-
-CreateInteractionChoiceSet_request::CreateInteractionChoiceSet_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_CREATEINTERACTIONCHOICESET_REQUEST)
-{
-}
-
-
-
-bool CreateInteractionChoiceSet_request::set_interactionChoiceSetID(unsigned int interactionChoiceSetID_)
-{
-  if(interactionChoiceSetID_>2000000000)  return false;
-  interactionChoiceSetID=interactionChoiceSetID_;
-  return true;
-}
-
-bool CreateInteractionChoiceSet_request::set_choiceSet(const std::vector<Choice>& choiceSet_)
-{
-  unsigned int i=choiceSet_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!ChoiceMarshaller::checkIntegrityConst(choiceSet_[i]))   return false;
-  }
-  choiceSet=choiceSet_;
-  return true;
-}
-
-
-
-
-unsigned int CreateInteractionChoiceSet_request::get_interactionChoiceSetID(void) const
-{
-  return interactionChoiceSetID;
-}
-
-const std::vector<Choice>& CreateInteractionChoiceSet_request::get_choiceSet(void) const 
-{
-  return choiceSet;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_requestMarshaller.cpp
deleted file mode 100644
index 85f551daf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_requestMarshaller.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_request.h"
-#include "ChoiceMarshaller.h"
-
-#include "CreateInteractionChoiceSet_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool CreateInteractionChoiceSet_requestMarshaller::checkIntegrity(CreateInteractionChoiceSet_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool CreateInteractionChoiceSet_requestMarshaller::fromString(const std::string& s,CreateInteractionChoiceSet_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string CreateInteractionChoiceSet_requestMarshaller::toString(const CreateInteractionChoiceSet_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool CreateInteractionChoiceSet_requestMarshaller::checkIntegrityConst(const CreateInteractionChoiceSet_request& s)
-{
-  if(s.interactionChoiceSetID>2000000000)  return false;
-  {
-    unsigned int i=s.choiceSet.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!ChoiceMarshaller::checkIntegrityConst(s.choiceSet[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value CreateInteractionChoiceSet_requestMarshaller::toJSON(const CreateInteractionChoiceSet_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("CreateInteractionChoiceSet");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["interactionChoiceSetID"]=Json::Value(e.interactionChoiceSetID);
-
-  j["choiceSet"]=Json::Value(Json::arrayValue);
-  j["choiceSet"].resize(e.choiceSet.size());
-  for(unsigned int i=0;i<e.choiceSet.size();i++)
-    j["choiceSet"][i]=ChoiceMarshaller::toJSON(e.choiceSet[i]);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool CreateInteractionChoiceSet_requestMarshaller::fromJSON(const Json::Value& js,CreateInteractionChoiceSet_request& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("CreateInteractionChoiceSet"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("interactionChoiceSetID"))  return false;
-    {
-      const Json::Value& j=json["interactionChoiceSetID"];
-      if(!j.isInt())  return false;
-      c.interactionChoiceSetID=j.asInt();
-    }
-    if(!json.isMember("choiceSet"))  return false;
-    {
-      const Json::Value& j=json["choiceSet"];
-      if(!j.isArray())  return false;
-      c.choiceSet.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          Choice t;
-          if(!ChoiceMarshaller::fromJSON(j[i],t))
-            return false;
-          c.choiceSet[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_requestMarshaller.h
deleted file mode 100644
index 54cfe9700..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_CREATEINTERACTIONCHOICESET_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_CREATEINTERACTIONCHOICESET_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct CreateInteractionChoiceSet_requestMarshaller
-  {
-    static bool checkIntegrity(CreateInteractionChoiceSet_request& e);
-    static bool checkIntegrityConst(const CreateInteractionChoiceSet_request& e);
-  
-    static bool fromString(const std::string& s,CreateInteractionChoiceSet_request& e);
-    static const std::string toString(const CreateInteractionChoiceSet_request& e);
-  
-    static bool fromJSON(const Json::Value& s,CreateInteractionChoiceSet_request& e);
-    static Json::Value toJSON(const CreateInteractionChoiceSet_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_response.cpp
deleted file mode 100644
index b10cf8871..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_response.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_response.h"
-#include "CreateInteractionChoiceSet_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-CreateInteractionChoiceSet_response& CreateInteractionChoiceSet_response::operator =(
-    const CreateInteractionChoiceSet_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-CreateInteractionChoiceSet_response::~CreateInteractionChoiceSet_response(void)
-{}
-
-CreateInteractionChoiceSet_response::CreateInteractionChoiceSet_response(const CreateInteractionChoiceSet_response& c)
-{
-    *this = c;
-}
-
-bool CreateInteractionChoiceSet_response::checkIntegrity(void)
-{
-    return CreateInteractionChoiceSet_responseMarshaller::checkIntegrity(*this);
-}
-
-
-CreateInteractionChoiceSet_response::CreateInteractionChoiceSet_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_CREATEINTERACTIONCHOICESET_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_responseMarshaller.cpp
deleted file mode 100644
index 24516347a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_response.h"
-#include "ResultMarshaller.h"
-
-#include "CreateInteractionChoiceSet_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool CreateInteractionChoiceSet_responseMarshaller::checkIntegrity(CreateInteractionChoiceSet_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool CreateInteractionChoiceSet_responseMarshaller::fromString(const std::string& s,CreateInteractionChoiceSet_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string CreateInteractionChoiceSet_responseMarshaller::toString(const CreateInteractionChoiceSet_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool CreateInteractionChoiceSet_responseMarshaller::checkIntegrityConst(const CreateInteractionChoiceSet_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value CreateInteractionChoiceSet_responseMarshaller::toJSON(const CreateInteractionChoiceSet_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("CreateInteractionChoiceSet");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool CreateInteractionChoiceSet_responseMarshaller::fromJSON(const Json::Value& js,CreateInteractionChoiceSet_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("CreateInteractionChoiceSet"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_responseMarshaller.h
deleted file mode 100644
index 48f660cfc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/CreateInteractionChoiceSet_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_CREATEINTERACTIONCHOICESET_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_CREATEINTERACTIONCHOICESET_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct CreateInteractionChoiceSet_responseMarshaller
-  {
-    static bool checkIntegrity(CreateInteractionChoiceSet_response& e);
-    static bool checkIntegrityConst(const CreateInteractionChoiceSet_response& e);
-  
-    static bool fromString(const std::string& s,CreateInteractionChoiceSet_response& e);
-    static const std::string toString(const CreateInteractionChoiceSet_response& e);
-  
-    static bool fromJSON(const Json::Value& s,CreateInteractionChoiceSet_response& e);
-    static Json::Value toJSON(const CreateInteractionChoiceSet_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_request.cpp
deleted file mode 100644
index 68515991d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_request.h"
-#include "DeleteCommand_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-DeleteCommand_request::~DeleteCommand_request(void)
-{
-}
-
-
-DeleteCommand_request::DeleteCommand_request(const DeleteCommand_request& c)
-{
-  *this=c;
-}
-
-
-bool DeleteCommand_request::checkIntegrity(void)
-{
-  return DeleteCommand_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DeleteCommand_request::DeleteCommand_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_DELETECOMMAND_REQUEST)
-{
-}
-
-
-
-bool DeleteCommand_request::set_cmdID(unsigned int cmdID_)
-{
-  if(cmdID_>2000000000)  return false;
-  cmdID=cmdID_;
-  return true;
-}
-
-
-
-
-unsigned int DeleteCommand_request::get_cmdID(void) const
-{
-  return cmdID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_requestMarshaller.cpp
deleted file mode 100644
index 81544db69..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_requestMarshaller.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_request.h"
-
-
-#include "DeleteCommand_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool DeleteCommand_requestMarshaller::checkIntegrity(DeleteCommand_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteCommand_requestMarshaller::fromString(const std::string& s,DeleteCommand_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteCommand_requestMarshaller::toString(const DeleteCommand_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteCommand_requestMarshaller::checkIntegrityConst(const DeleteCommand_request& s)
-{
-  if(s.cmdID>2000000000)  return false;
-  return true;
-}
-
-Json::Value DeleteCommand_requestMarshaller::toJSON(const DeleteCommand_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("DeleteCommand");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["cmdID"]=Json::Value(e.cmdID);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool DeleteCommand_requestMarshaller::fromJSON(const Json::Value& js,DeleteCommand_request& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("DeleteCommand"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("cmdID"))  return false;
-    {
-      const Json::Value& j=json["cmdID"];
-      if(!j.isInt())  return false;
-      c.cmdID=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_requestMarshaller.h
deleted file mode 100644
index 9ae921f1b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_DELETECOMMAND_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_DELETECOMMAND_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct DeleteCommand_requestMarshaller
-  {
-    static bool checkIntegrity(DeleteCommand_request& e);
-    static bool checkIntegrityConst(const DeleteCommand_request& e);
-  
-    static bool fromString(const std::string& s,DeleteCommand_request& e);
-    static const std::string toString(const DeleteCommand_request& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteCommand_request& e);
-    static Json::Value toJSON(const DeleteCommand_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_response.cpp
deleted file mode 100644
index e16f993aa..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_response.h"
-#include "DeleteCommand_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-DeleteCommand_response& DeleteCommand_response::operator =(const DeleteCommand_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-DeleteCommand_response::~DeleteCommand_response(void)
-{}
-
-DeleteCommand_response::DeleteCommand_response(const DeleteCommand_response& c)
-{
-    *this = c;
-}
-
-bool DeleteCommand_response::checkIntegrity(void)
-{
-    return DeleteCommand_responseMarshaller::checkIntegrity(*this);
-}
-
-DeleteCommand_response::DeleteCommand_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_DELETECOMMAND_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_responseMarshaller.cpp
deleted file mode 100644
index 00fc9d26e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_response.h"
-#include "ResultMarshaller.h"
-
-#include "DeleteCommand_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool DeleteCommand_responseMarshaller::checkIntegrity(DeleteCommand_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteCommand_responseMarshaller::fromString(const std::string& s,DeleteCommand_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteCommand_responseMarshaller::toString(const DeleteCommand_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteCommand_responseMarshaller::checkIntegrityConst(const DeleteCommand_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value DeleteCommand_responseMarshaller::toJSON(const DeleteCommand_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("DeleteCommand");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool DeleteCommand_responseMarshaller::fromJSON(const Json::Value& js,DeleteCommand_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("DeleteCommand"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_responseMarshaller.h
deleted file mode 100644
index 58285f6a0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteCommand_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_DELETECOMMAND_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_DELETECOMMAND_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct DeleteCommand_responseMarshaller
-  {
-    static bool checkIntegrity(DeleteCommand_response& e);
-    static bool checkIntegrityConst(const DeleteCommand_response& e);
-  
-    static bool fromString(const std::string& s,DeleteCommand_response& e);
-    static const std::string toString(const DeleteCommand_response& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteCommand_response& e);
-    static Json::Value toJSON(const DeleteCommand_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_request.cpp
deleted file mode 100644
index 520dbd928..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_request.h"
-#include "DeleteInteractionChoiceSet_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-DeleteInteractionChoiceSet_request::~DeleteInteractionChoiceSet_request(void)
-{
-}
-
-
-DeleteInteractionChoiceSet_request::DeleteInteractionChoiceSet_request(const DeleteInteractionChoiceSet_request& c)
-{
-  *this=c;
-}
-
-
-bool DeleteInteractionChoiceSet_request::checkIntegrity(void)
-{
-  return DeleteInteractionChoiceSet_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DeleteInteractionChoiceSet_request::DeleteInteractionChoiceSet_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_DELETEINTERACTIONCHOICESET_REQUEST)
-{
-}
-
-
-
-bool DeleteInteractionChoiceSet_request::set_interactionChoiceSetID(unsigned int interactionChoiceSetID_)
-{
-  if(interactionChoiceSetID_>2000000000)  return false;
-  interactionChoiceSetID=interactionChoiceSetID_;
-  return true;
-}
-
-
-
-
-unsigned int DeleteInteractionChoiceSet_request::get_interactionChoiceSetID(void) const
-{
-  return interactionChoiceSetID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_requestMarshaller.cpp
deleted file mode 100644
index 2adb1109e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_requestMarshaller.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_request.h"
-
-
-#include "DeleteInteractionChoiceSet_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool DeleteInteractionChoiceSet_requestMarshaller::checkIntegrity(DeleteInteractionChoiceSet_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteInteractionChoiceSet_requestMarshaller::fromString(const std::string& s,DeleteInteractionChoiceSet_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteInteractionChoiceSet_requestMarshaller::toString(const DeleteInteractionChoiceSet_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteInteractionChoiceSet_requestMarshaller::checkIntegrityConst(const DeleteInteractionChoiceSet_request& s)
-{
-  if(s.interactionChoiceSetID>2000000000)  return false;
-  return true;
-}
-
-Json::Value DeleteInteractionChoiceSet_requestMarshaller::toJSON(const DeleteInteractionChoiceSet_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("DeleteInteractionChoiceSet");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["interactionChoiceSetID"]=Json::Value(e.interactionChoiceSetID);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool DeleteInteractionChoiceSet_requestMarshaller::fromJSON(const Json::Value& js,DeleteInteractionChoiceSet_request& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("DeleteInteractionChoiceSet"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("interactionChoiceSetID"))  return false;
-    {
-      const Json::Value& j=json["interactionChoiceSetID"];
-      if(!j.isInt())  return false;
-      c.interactionChoiceSetID=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_requestMarshaller.h
deleted file mode 100644
index 0a97a00e6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_DELETEINTERACTIONCHOICESET_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_DELETEINTERACTIONCHOICESET_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct DeleteInteractionChoiceSet_requestMarshaller
-  {
-    static bool checkIntegrity(DeleteInteractionChoiceSet_request& e);
-    static bool checkIntegrityConst(const DeleteInteractionChoiceSet_request& e);
-  
-    static bool fromString(const std::string& s,DeleteInteractionChoiceSet_request& e);
-    static const std::string toString(const DeleteInteractionChoiceSet_request& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteInteractionChoiceSet_request& e);
-    static Json::Value toJSON(const DeleteInteractionChoiceSet_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_response.cpp
deleted file mode 100644
index dc5f09cf7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_response.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_response.h"
-#include "DeleteInteractionChoiceSet_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-DeleteInteractionChoiceSet_response& DeleteInteractionChoiceSet_response::operator =(
-    const DeleteInteractionChoiceSet_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-
-DeleteInteractionChoiceSet_response::~DeleteInteractionChoiceSet_response(void)
-{
-    if (info)
-    {
-        delete info;
-    }
-}
-
-
-DeleteInteractionChoiceSet_response::DeleteInteractionChoiceSet_response(const DeleteInteractionChoiceSet_response& c)
-{
-    *this = c;
-}
-
-
-bool DeleteInteractionChoiceSet_response::checkIntegrity(void)
-{
-    return DeleteInteractionChoiceSet_responseMarshaller::checkIntegrity(*this);
-}
-
-
-DeleteInteractionChoiceSet_response::DeleteInteractionChoiceSet_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_DELETEINTERACTIONCHOICESET_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_responseMarshaller.cpp
deleted file mode 100644
index 43e370181..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_response.h"
-#include "ResultMarshaller.h"
-
-#include "DeleteInteractionChoiceSet_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool DeleteInteractionChoiceSet_responseMarshaller::checkIntegrity(DeleteInteractionChoiceSet_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteInteractionChoiceSet_responseMarshaller::fromString(const std::string& s,DeleteInteractionChoiceSet_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteInteractionChoiceSet_responseMarshaller::toString(const DeleteInteractionChoiceSet_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteInteractionChoiceSet_responseMarshaller::checkIntegrityConst(const DeleteInteractionChoiceSet_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value DeleteInteractionChoiceSet_responseMarshaller::toJSON(const DeleteInteractionChoiceSet_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("DeleteInteractionChoiceSet");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool DeleteInteractionChoiceSet_responseMarshaller::fromJSON(const Json::Value& js,DeleteInteractionChoiceSet_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("DeleteInteractionChoiceSet"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_responseMarshaller.h
deleted file mode 100644
index 62e8f5c6c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteInteractionChoiceSet_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_DELETEINTERACTIONCHOICESET_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_DELETEINTERACTIONCHOICESET_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct DeleteInteractionChoiceSet_responseMarshaller
-  {
-    static bool checkIntegrity(DeleteInteractionChoiceSet_response& e);
-    static bool checkIntegrityConst(const DeleteInteractionChoiceSet_response& e);
-  
-    static bool fromString(const std::string& s,DeleteInteractionChoiceSet_response& e);
-    static const std::string toString(const DeleteInteractionChoiceSet_response& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteInteractionChoiceSet_response& e);
-    static Json::Value toJSON(const DeleteInteractionChoiceSet_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_request.cpp
deleted file mode 100644
index 74004227f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_request.h"
-#include "DeleteSubMenu_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-DeleteSubMenu_request::~DeleteSubMenu_request(void)
-{
-}
-
-
-DeleteSubMenu_request::DeleteSubMenu_request(const DeleteSubMenu_request& c)
-{
-  *this=c;
-}
-
-
-bool DeleteSubMenu_request::checkIntegrity(void)
-{
-  return DeleteSubMenu_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DeleteSubMenu_request::DeleteSubMenu_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_DELETESUBMENU_REQUEST)
-{
-}
-
-
-
-bool DeleteSubMenu_request::set_menuID(unsigned int menuID_)
-{
-  if(menuID_>2000000000)  return false;
-  menuID=menuID_;
-  return true;
-}
-
-
-
-
-unsigned int DeleteSubMenu_request::get_menuID(void) const
-{
-  return menuID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_requestMarshaller.cpp
deleted file mode 100644
index 83756354d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_requestMarshaller.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_request.h"
-
-
-#include "DeleteSubMenu_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool DeleteSubMenu_requestMarshaller::checkIntegrity(DeleteSubMenu_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteSubMenu_requestMarshaller::fromString(const std::string& s,DeleteSubMenu_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteSubMenu_requestMarshaller::toString(const DeleteSubMenu_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteSubMenu_requestMarshaller::checkIntegrityConst(const DeleteSubMenu_request& s)
-{
-  if(s.menuID>2000000000)  return false;
-  return true;
-}
-
-Json::Value DeleteSubMenu_requestMarshaller::toJSON(const DeleteSubMenu_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("DeleteSubMenu");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["menuID"]=Json::Value(e.menuID);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool DeleteSubMenu_requestMarshaller::fromJSON(const Json::Value& js,DeleteSubMenu_request& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("DeleteSubMenu"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("menuID"))  return false;
-    {
-      const Json::Value& j=json["menuID"];
-      if(!j.isInt())  return false;
-      c.menuID=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_requestMarshaller.h
deleted file mode 100644
index 6e0bcd216..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_DELETESUBMENU_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_DELETESUBMENU_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct DeleteSubMenu_requestMarshaller
-  {
-    static bool checkIntegrity(DeleteSubMenu_request& e);
-    static bool checkIntegrityConst(const DeleteSubMenu_request& e);
-  
-    static bool fromString(const std::string& s,DeleteSubMenu_request& e);
-    static const std::string toString(const DeleteSubMenu_request& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteSubMenu_request& e);
-    static Json::Value toJSON(const DeleteSubMenu_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_response.cpp
deleted file mode 100644
index ef99e4031..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_response.h"
-#include "DeleteSubMenu_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-DeleteSubMenu_response& DeleteSubMenu_response::operator =(const DeleteSubMenu_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-DeleteSubMenu_response::~DeleteSubMenu_response(void)
-{}
-
-DeleteSubMenu_response::DeleteSubMenu_response(const DeleteSubMenu_response& c)
-{
-    *this = c;
-}
-
-bool DeleteSubMenu_response::checkIntegrity(void)
-{
-    return DeleteSubMenu_responseMarshaller::checkIntegrity(*this);
-}
-
-DeleteSubMenu_response::DeleteSubMenu_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_DELETESUBMENU_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_responseMarshaller.cpp
deleted file mode 100644
index 430e995f0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_response.h"
-#include "ResultMarshaller.h"
-
-#include "DeleteSubMenu_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool DeleteSubMenu_responseMarshaller::checkIntegrity(DeleteSubMenu_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteSubMenu_responseMarshaller::fromString(const std::string& s,DeleteSubMenu_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteSubMenu_responseMarshaller::toString(const DeleteSubMenu_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteSubMenu_responseMarshaller::checkIntegrityConst(const DeleteSubMenu_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value DeleteSubMenu_responseMarshaller::toJSON(const DeleteSubMenu_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("DeleteSubMenu");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool DeleteSubMenu_responseMarshaller::fromJSON(const Json::Value& js,DeleteSubMenu_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("DeleteSubMenu"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_responseMarshaller.h
deleted file mode 100644
index 211c8c8ed..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DeleteSubMenu_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_DELETESUBMENU_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_DELETESUBMENU_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct DeleteSubMenu_responseMarshaller
-  {
-    static bool checkIntegrity(DeleteSubMenu_response& e);
-    static bool checkIntegrityConst(const DeleteSubMenu_response& e);
-  
-    static bool fromString(const std::string& s,DeleteSubMenu_response& e);
-    static const std::string toString(const DeleteSubMenu_response& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteSubMenu_response& e);
-    static Json::Value toJSON(const DeleteSubMenu_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayCapabilities.cpp
deleted file mode 100644
index e8c5a7835..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayCapabilities.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DisplayCapabilities.h"
-#include "DisplayCapabilitiesMarshaller.h"
-#include "DisplayTypeMarshaller.h"
-#include "MediaClockFormatMarshaller.h"
-#include "TextFieldMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPC;
-
-DisplayCapabilities::DisplayCapabilities(const DisplayCapabilities& c)
-{
-  *this=c;
-}
-
-
-bool DisplayCapabilities::checkIntegrity(void)
-{
-  return DisplayCapabilitiesMarshaller::checkIntegrity(*this);
-}
-
-
-DisplayCapabilities::DisplayCapabilities(void)
-{
-}
-
-
-
-bool DisplayCapabilities::set_displayType(const DisplayType& displayType_)
-{
-  if(!DisplayTypeMarshaller::checkIntegrityConst(displayType_))   return false;
-  displayType=displayType_;
-  return true;
-}
-
-bool DisplayCapabilities::set_mediaClockFormats(const std::vector<MediaClockFormat>& mediaClockFormats_)
-{
-  unsigned int i=mediaClockFormats_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!MediaClockFormatMarshaller::checkIntegrityConst(mediaClockFormats_[i]))   return false;
-  }
-  mediaClockFormats=mediaClockFormats_;
-  return true;
-}
-
-bool DisplayCapabilities::set_textFields(const std::vector<TextField>& textFields_)
-{
-  unsigned int i=textFields_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TextFieldMarshaller::checkIntegrityConst(textFields_[i]))   return false;
-  }
-  textFields=textFields_;
-  return true;
-}
-
-
-
-
-const DisplayType& DisplayCapabilities::get_displayType(void) const 
-{
-  return displayType;
-}
-
-
-const std::vector<MediaClockFormat>& DisplayCapabilities::get_mediaClockFormats(void) const 
-{
-  return mediaClockFormats;
-}
-
-
-const std::vector<TextField>& DisplayCapabilities::get_textFields(void) const 
-{
-  return textFields;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayCapabilitiesMarshaller.cpp
deleted file mode 100644
index 897ecbb5d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DisplayCapabilities.h"
-#include "DisplayTypeMarshaller.h"
-#include "MediaClockFormatMarshaller.h"
-#include "TextFieldMarshaller.h"
-
-#include "DisplayCapabilitiesMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool DisplayCapabilitiesMarshaller::checkIntegrity(DisplayCapabilities& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DisplayCapabilitiesMarshaller::fromString(const std::string& s,DisplayCapabilities& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DisplayCapabilitiesMarshaller::toString(const DisplayCapabilities& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DisplayCapabilitiesMarshaller::checkIntegrityConst(const DisplayCapabilities& s)
-{
-  if(!DisplayTypeMarshaller::checkIntegrityConst(s.displayType))  return false;
-  {
-    unsigned int i=s.mediaClockFormats.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!MediaClockFormatMarshaller::checkIntegrityConst(s.mediaClockFormats[i]))   return false;
-    }
-  }
-  {
-    unsigned int i=s.textFields.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TextFieldMarshaller::checkIntegrityConst(s.textFields[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value DisplayCapabilitiesMarshaller::toJSON(const DisplayCapabilities& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["displayType"]=DisplayTypeMarshaller::toJSON(e.displayType);
-
-  json["mediaClockFormats"]=Json::Value(Json::arrayValue);
-  json["mediaClockFormats"].resize(e.mediaClockFormats.size());
-  for(unsigned int i=0;i<e.mediaClockFormats.size();i++)
-    json["mediaClockFormats"][i]=MediaClockFormatMarshaller::toJSON(e.mediaClockFormats[i]);
-
-  json["textFields"]=Json::Value(Json::arrayValue);
-  json["textFields"].resize(e.textFields.size());
-  for(unsigned int i=0;i<e.textFields.size();i++)
-    json["textFields"][i]=TextFieldMarshaller::toJSON(e.textFields[i]);
-
-
-  return json;
-}
-
-
-bool DisplayCapabilitiesMarshaller::fromJSON(const Json::Value& json,DisplayCapabilities& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("displayType"))  return false;
-    {
-      const Json::Value& j=json["displayType"];
-      if(!DisplayTypeMarshaller::fromJSON(j,c.displayType))
-        return false;
-    }
-    if(!json.isMember("mediaClockFormats"))  return false;
-    {
-      const Json::Value& j=json["mediaClockFormats"];
-      if(!j.isArray())  return false;
-      c.mediaClockFormats.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          MediaClockFormat t;
-          if(!MediaClockFormatMarshaller::fromJSON(j[i],t))
-            return false;
-          c.mediaClockFormats[i]=t;
-        }
-
-    }
-    if(!json.isMember("textFields"))  return false;
-    {
-      const Json::Value& j=json["textFields"];
-      if(!j.isArray())  return false;
-      c.textFields.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          TextField t;
-          if(!TextFieldMarshaller::fromJSON(j[i],t))
-            return false;
-          c.textFields[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayCapabilitiesMarshaller.h
deleted file mode 100644
index 387918234..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_DISPLAYCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_DISPLAYCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DisplayCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct DisplayCapabilitiesMarshaller
-  {
-    static bool checkIntegrity(DisplayCapabilities& e);
-    static bool checkIntegrityConst(const DisplayCapabilities& e);
-  
-    static bool fromString(const std::string& s,DisplayCapabilities& e);
-    static const std::string toString(const DisplayCapabilities& e);
-  
-    static bool fromJSON(const Json::Value& s,DisplayCapabilities& e);
-    static Json::Value toJSON(const DisplayCapabilities& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.cpp
deleted file mode 100644
index b75161e7a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/DisplayType.h"
-#include "DisplayTypeMarshaller.h"
-#include "DisplayTypeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const DisplayType::DisplayTypeInternal DisplayTypeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return DisplayType::INVALID_ENUM;
-  const struct PerfectHashTable* p=DisplayType_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<DisplayType::DisplayTypeInternal>(p->idx) : DisplayType::INVALID_ENUM;
-}
-
-
-bool DisplayTypeMarshaller::fromJSON(const Json::Value& s,DisplayType& e)
-{
-  e.mInternal=DisplayType::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=DisplayType::INVALID_ENUM);
-}
-
-
-Json::Value DisplayTypeMarshaller::toJSON(const DisplayType& e)
-{
-  if(e.mInternal==DisplayType::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool DisplayTypeMarshaller::fromString(const std::string& s,DisplayType& e)
-{
-  e.mInternal=DisplayType::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string DisplayTypeMarshaller::toString(const DisplayType& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==DisplayType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable DisplayTypeMarshaller::mHashTable[9]=
-{
-  {"CID",0},
-  {"TYPE2",1},
-  {"TYPE5",2},
-  {"NGN",3},
-  {"GEN2_8_DMA",4},
-  {"GEN2_6_DMA",5},
-  {"MFD3",6},
-  {"MFD4",7},
-  {"MFD5",8}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp
deleted file mode 100644
index ea34d6f9d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp
+++ /dev/null
@@ -1,25 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name DisplayType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-CID,0
-TYPE2,1
-TYPE5,2
-NGN,3
-GEN2_8_DMA,4
-GEN2_6_DMA,5
-MFD3,6
-MFD4,7
-MFD5,8
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.h
deleted file mode 100644
index 8eb9ecacb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_DISPLAYTYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_DISPLAYTYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DisplayType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for DisplayType
-
-  class DisplayTypeMarshaller
-  {
-  public:
-  
-    static std::string toName(const DisplayType& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(DisplayType& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=DisplayType::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(DisplayType& e)		{ return e.mInternal!=DisplayType::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const DisplayType& e)	{ return e.mInternal!=DisplayType::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,DisplayType& e);
-    static const std::string toString(const DisplayType& e);
-  
-    static bool fromJSON(const Json::Value& s,DisplayType& e);
-    static Json::Value toJSON(const DisplayType& e);
-  
-    static const char* getName(DisplayType::DisplayTypeInternal e)
-    {
-       return (e>=0 && e<9) ? mHashTable[e].name : NULL;
-    }
-  
-    static const DisplayType::DisplayTypeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[9];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.inc
deleted file mode 100644
index 62d29cff1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.inc
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp  */
-/* Computed positions: -k'6,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 9
-#define MIN_WORD_LENGTH 3
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 20
-/* maximum key range = 18, duplicates = 0 */
-
-class DisplayType_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-DisplayType_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      15, 10,  5,  0,  5, 21,  0, 21, 21, 21,
-      21, 21, 21, 21, 21,  0, 21, 21,  5, 21,
-      21, 21, 21, 21, 21, 21, 21, 21,  0, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[5]];
-      /*FALLTHROUGH*/
-      case 5:
-      case 4:
-      case 3:
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-DisplayType_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  3,  4,  5,  0,  0,  3,  4, 10,  0,  0,  0,
-       4, 10,  0,  0,  0,  0,  5
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp"
-      {"NGN",3},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp"
-      {"MFD5",8},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp"
-      {"TYPE5",2},
-      {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp"
-      {"CID",0},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp"
-      {"MFD4",7},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp"
-      {"GEN2_8_DMA",4},
-      {""}, {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp"
-      {"MFD3",6},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp"
-      {"GEN2_6_DMA",5},
-      {""}, {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DisplayTypeMarshaller.gp"
-      {"TYPE2",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.cpp
deleted file mode 100644
index 904196923..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/DriverDistractionState.h"
-#include "DriverDistractionStateMarshaller.h"
-#include "DriverDistractionStateMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const DriverDistractionState::DriverDistractionStateInternal DriverDistractionStateMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return DriverDistractionState::INVALID_ENUM;
-  const struct PerfectHashTable* p=DriverDistractionState_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<DriverDistractionState::DriverDistractionStateInternal>(p->idx) : DriverDistractionState::INVALID_ENUM;
-}
-
-
-bool DriverDistractionStateMarshaller::fromJSON(const Json::Value& s,DriverDistractionState& e)
-{
-  e.mInternal=DriverDistractionState::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=DriverDistractionState::INVALID_ENUM);
-}
-
-
-Json::Value DriverDistractionStateMarshaller::toJSON(const DriverDistractionState& e)
-{
-  if(e.mInternal==DriverDistractionState::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool DriverDistractionStateMarshaller::fromString(const std::string& s,DriverDistractionState& e)
-{
-  e.mInternal=DriverDistractionState::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string DriverDistractionStateMarshaller::toString(const DriverDistractionState& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==DriverDistractionState::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable DriverDistractionStateMarshaller::mHashTable[2]=
-{
-  {"DD_ON",0},
-  {"DD_OFF",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.gp
deleted file mode 100644
index 7e98b5c15..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name DriverDistractionState_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-DD_ON,0
-DD_OFF,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.h
deleted file mode 100644
index b9cbfd9b3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_DRIVERDISTRACTIONSTATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_DRIVERDISTRACTIONSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/DriverDistractionState.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for DriverDistractionState
-
-  class DriverDistractionStateMarshaller
-  {
-  public:
-  
-    static std::string toName(const DriverDistractionState& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(DriverDistractionState& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=DriverDistractionState::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(DriverDistractionState& e)		{ return e.mInternal!=DriverDistractionState::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const DriverDistractionState& e)	{ return e.mInternal!=DriverDistractionState::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,DriverDistractionState& e);
-    static const std::string toString(const DriverDistractionState& e);
-  
-    static bool fromJSON(const Json::Value& s,DriverDistractionState& e);
-    static Json::Value toJSON(const DriverDistractionState& e);
-  
-    static const char* getName(DriverDistractionState::DriverDistractionStateInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const DriverDistractionState::DriverDistractionStateInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.inc
deleted file mode 100644
index a82b29bac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 6
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 6
-/* maximum key range = 2, duplicates = 0 */
-
-class DriverDistractionState_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-DriverDistractionState_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-DriverDistractionState_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  5,  6
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.gp"
-      {"DD_ON",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/DriverDistractionStateMarshaller.gp"
-      {"DD_OFF",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_request.cpp
deleted file mode 100644
index 476267107..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_request.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_request.h"
-#include "EncodedSyncPData_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-EncodedSyncPData_request& EncodedSyncPData_request::operator =(const EncodedSyncPData_request& c)
-{
-  data= c.data ? new std::vector<std::string>(c.data[0]) : 0;
-
-  return *this;}
-
-
-EncodedSyncPData_request::~EncodedSyncPData_request(void)
-{
-  if(data)
-    delete data;
-}
-
-
-EncodedSyncPData_request::EncodedSyncPData_request(const EncodedSyncPData_request& c)
-{
-  *this=c;
-}
-
-
-bool EncodedSyncPData_request::checkIntegrity(void)
-{
-  return EncodedSyncPData_requestMarshaller::checkIntegrity(*this);
-}
-
-
-EncodedSyncPData_request::EncodedSyncPData_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_ENCODEDSYNCPDATA_REQUEST),
-      data(0)
-{
-}
-
-
-
-bool EncodedSyncPData_request::set_data(const std::vector<std::string>& data_)
-{
-  unsigned int i=data_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(data_[i].length()>10000)  return false;
-  }
-  delete data;
-  data=0;
-
-  data=new std::vector<std::string>(data_);
-  return true;
-}
-
-void EncodedSyncPData_request::reset_data(void)
-{
-  if(data)
-    delete data;
-  data=0;
-}
-
-
-
-
-const std::vector<std::string>* EncodedSyncPData_request::get_data(void) const 
-{
-  return data;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_requestMarshaller.cpp
deleted file mode 100644
index bdb5006ac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_requestMarshaller.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_request.h"
-
-
-#include "EncodedSyncPData_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool EncodedSyncPData_requestMarshaller::checkIntegrity(EncodedSyncPData_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool EncodedSyncPData_requestMarshaller::fromString(const std::string& s,EncodedSyncPData_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string EncodedSyncPData_requestMarshaller::toString(const EncodedSyncPData_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool EncodedSyncPData_requestMarshaller::checkIntegrityConst(const EncodedSyncPData_request& s)
-{
-  if(s.data)
-  {
-    unsigned int i=s.data[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.data[0][i].length()>10000)  return false;
-    }
-  }
-  return true;
-}
-
-Json::Value EncodedSyncPData_requestMarshaller::toJSON(const EncodedSyncPData_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("EncodedSyncPData");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  if(e.data)
-  {
-    unsigned int sz=e.data->size();
-    j["data"]=Json::Value(Json::arrayValue);
-    j["data"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["data"][i]=Json::Value(e.data[0][i]);
-  }
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool EncodedSyncPData_requestMarshaller::fromJSON(const Json::Value& js,EncodedSyncPData_request& c)
-{
-  if(c.data)  delete c.data;
-  c.data=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("EncodedSyncPData"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(json.isMember("data"))
-    {
-      const Json::Value& j=json["data"];
-      if(!j.isArray())  return false;
-      c.data=new std::vector<std::string>();
-      c.data->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.data[0][i]=j[i].asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_requestMarshaller.h
deleted file mode 100644
index dddf12b16..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ENCODEDSYNCPDATA_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ENCODEDSYNCPDATA_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct EncodedSyncPData_requestMarshaller
-  {
-    static bool checkIntegrity(EncodedSyncPData_request& e);
-    static bool checkIntegrityConst(const EncodedSyncPData_request& e);
-  
-    static bool fromString(const std::string& s,EncodedSyncPData_request& e);
-    static const std::string toString(const EncodedSyncPData_request& e);
-  
-    static bool fromJSON(const Json::Value& s,EncodedSyncPData_request& e);
-    static Json::Value toJSON(const EncodedSyncPData_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_response.cpp
deleted file mode 100644
index f28df3670..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_response.h"
-#include "EncodedSyncPData_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-EncodedSyncPData_response& EncodedSyncPData_response::operator =(const EncodedSyncPData_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-EncodedSyncPData_response::~EncodedSyncPData_response(void)
-{}
-
-EncodedSyncPData_response::EncodedSyncPData_response(const EncodedSyncPData_response& c)
-{
-    *this = c;
-}
-
-bool EncodedSyncPData_response::checkIntegrity(void)
-{
-    return EncodedSyncPData_responseMarshaller::checkIntegrity(*this);
-}
-
-EncodedSyncPData_response::EncodedSyncPData_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_ENCODEDSYNCPDATA_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_responseMarshaller.cpp
deleted file mode 100644
index e3c9b8e9b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_response.h"
-#include "ResultMarshaller.h"
-
-#include "EncodedSyncPData_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool EncodedSyncPData_responseMarshaller::checkIntegrity(EncodedSyncPData_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool EncodedSyncPData_responseMarshaller::fromString(const std::string& s,EncodedSyncPData_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string EncodedSyncPData_responseMarshaller::toString(const EncodedSyncPData_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool EncodedSyncPData_responseMarshaller::checkIntegrityConst(const EncodedSyncPData_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value EncodedSyncPData_responseMarshaller::toJSON(const EncodedSyncPData_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("EncodedSyncPData");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool EncodedSyncPData_responseMarshaller::fromJSON(const Json::Value& js,EncodedSyncPData_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("EncodedSyncPData"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_responseMarshaller.h
deleted file mode 100644
index 903d9ff35..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/EncodedSyncPData_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ENCODEDSYNCPDATA_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ENCODEDSYNCPDATA_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct EncodedSyncPData_responseMarshaller
-  {
-    static bool checkIntegrity(EncodedSyncPData_response& e);
-    static bool checkIntegrityConst(const EncodedSyncPData_response& e);
-  
-    static bool fromString(const std::string& s,EncodedSyncPData_response& e);
-    static const std::string toString(const EncodedSyncPData_response& e);
-  
-    static bool fromJSON(const Json::Value& s,EncodedSyncPData_response& e);
-    static Json::Value toJSON(const EncodedSyncPData_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GenericResponse_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GenericResponse_response.cpp
deleted file mode 100644
index f17773497..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GenericResponse_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/GenericResponse_response.h"
-#include "GenericResponse_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-GenericResponse_response& GenericResponse_response::operator =(const GenericResponse_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-GenericResponse_response::~GenericResponse_response(void)
-{}
-
-GenericResponse_response::GenericResponse_response(const GenericResponse_response& c)
-{
-    *this = c;
-}
-
-bool GenericResponse_response::checkIntegrity(void)
-{
-    return GenericResponse_responseMarshaller::checkIntegrity(*this);
-}
-
-GenericResponse_response::GenericResponse_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_GENERICRESPONSE_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GenericResponse_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GenericResponse_responseMarshaller.cpp
deleted file mode 100644
index 7f30f6c3f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GenericResponse_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/GenericResponse_response.h"
-#include "ResultMarshaller.h"
-
-#include "GenericResponse_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool GenericResponse_responseMarshaller::checkIntegrity(GenericResponse_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GenericResponse_responseMarshaller::fromString(const std::string& s,GenericResponse_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GenericResponse_responseMarshaller::toString(const GenericResponse_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GenericResponse_responseMarshaller::checkIntegrityConst(const GenericResponse_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value GenericResponse_responseMarshaller::toJSON(const GenericResponse_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("GenericResponse");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool GenericResponse_responseMarshaller::fromJSON(const Json::Value& js,GenericResponse_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("GenericResponse"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GenericResponse_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GenericResponse_responseMarshaller.h
deleted file mode 100644
index 555bc7b3f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GenericResponse_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_GENERICRESPONSE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_GENERICRESPONSE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/GenericResponse_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct GenericResponse_responseMarshaller
-  {
-    static bool checkIntegrity(GenericResponse_response& e);
-    static bool checkIntegrityConst(const GenericResponse_response& e);
-  
-    static bool fromString(const std::string& s,GenericResponse_response& e);
-    static const std::string toString(const GenericResponse_response& e);
-  
-    static bool fromJSON(const Json::Value& s,GenericResponse_response& e);
-    static Json::Value toJSON(const GenericResponse_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.cpp
deleted file mode 100644
index 04c31edc3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/GlobalProperty.h"
-#include "GlobalPropertyMarshaller.h"
-#include "GlobalPropertyMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const GlobalProperty::GlobalPropertyInternal GlobalPropertyMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return GlobalProperty::INVALID_ENUM;
-  const struct PerfectHashTable* p=GlobalProperty_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<GlobalProperty::GlobalPropertyInternal>(p->idx) : GlobalProperty::INVALID_ENUM;
-}
-
-
-bool GlobalPropertyMarshaller::fromJSON(const Json::Value& s,GlobalProperty& e)
-{
-  e.mInternal=GlobalProperty::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=GlobalProperty::INVALID_ENUM);
-}
-
-
-Json::Value GlobalPropertyMarshaller::toJSON(const GlobalProperty& e)
-{
-  if(e.mInternal==GlobalProperty::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool GlobalPropertyMarshaller::fromString(const std::string& s,GlobalProperty& e)
-{
-  e.mInternal=GlobalProperty::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string GlobalPropertyMarshaller::toString(const GlobalProperty& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==GlobalProperty::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable GlobalPropertyMarshaller::mHashTable[2]=
-{
-  {"HELPPROMPT",0},
-  {"TIMEOUTPROMPT",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.gp
deleted file mode 100644
index 99a3d1076..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name GlobalProperty_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-HELPPROMPT,0
-TIMEOUTPROMPT,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.h
deleted file mode 100644
index f9b555446..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_GLOBALPROPERTYMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_GLOBALPROPERTYMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/GlobalProperty.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for GlobalProperty
-
-  class GlobalPropertyMarshaller
-  {
-  public:
-  
-    static std::string toName(const GlobalProperty& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(GlobalProperty& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=GlobalProperty::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(GlobalProperty& e)		{ return e.mInternal!=GlobalProperty::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const GlobalProperty& e)	{ return e.mInternal!=GlobalProperty::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,GlobalProperty& e);
-    static const std::string toString(const GlobalProperty& e);
-  
-    static bool fromJSON(const Json::Value& s,GlobalProperty& e);
-    static Json::Value toJSON(const GlobalProperty& e);
-  
-    static const char* getName(GlobalProperty::GlobalPropertyInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const GlobalProperty::GlobalPropertyInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.inc
deleted file mode 100644
index c4cb253af..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.inc
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 10
-#define MAX_WORD_LENGTH 13
-#define MIN_HASH_VALUE 10
-#define MAX_HASH_VALUE 13
-/* maximum key range = 4, duplicates = 0 */
-
-class GlobalProperty_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-GlobalProperty_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-GlobalProperty_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0, 13
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.gp"
-      {"HELPPROMPT",0},
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/GlobalPropertyMarshaller.gp"
-      {"TIMEOUTPROMPT",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.cpp
deleted file mode 100644
index a887ba550..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/HMILevel.h"
-#include "HMILevelMarshaller.h"
-#include "HMILevelMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const HMILevel::HMILevelInternal HMILevelMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return HMILevel::INVALID_ENUM;
-  const struct PerfectHashTable* p=HMILevel_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<HMILevel::HMILevelInternal>(p->idx) : HMILevel::INVALID_ENUM;
-}
-
-
-bool HMILevelMarshaller::fromJSON(const Json::Value& s,HMILevel& e)
-{
-  e.mInternal=HMILevel::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=HMILevel::INVALID_ENUM);
-}
-
-
-Json::Value HMILevelMarshaller::toJSON(const HMILevel& e)
-{
-  if(e.mInternal==HMILevel::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool HMILevelMarshaller::fromString(const std::string& s,HMILevel& e)
-{
-  e.mInternal=HMILevel::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string HMILevelMarshaller::toString(const HMILevel& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==HMILevel::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable HMILevelMarshaller::mHashTable[4]=
-{
-  {"FULL",0},
-  {"LIMITED",1},
-  {"BACKGROUND",2},
-  {"NONE",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.gp
deleted file mode 100644
index 640060844..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name HMILevel_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-FULL,0
-LIMITED,1
-BACKGROUND,2
-NONE,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.h
deleted file mode 100644
index 372e394b5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_HMILEVELMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_HMILEVELMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/HMILevel.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for HMILevel
-
-  class HMILevelMarshaller
-  {
-  public:
-  
-    static std::string toName(const HMILevel& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(HMILevel& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=HMILevel::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(HMILevel& e)		{ return e.mInternal!=HMILevel::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const HMILevel& e)	{ return e.mInternal!=HMILevel::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,HMILevel& e);
-    static const std::string toString(const HMILevel& e);
-  
-    static bool fromJSON(const Json::Value& s,HMILevel& e);
-    static Json::Value toJSON(const HMILevel& e);
-  
-    static const char* getName(HMILevel::HMILevelInternal e)
-    {
-       return (e>=0 && e<4) ? mHashTable[e].name : NULL;
-    }
-  
-    static const HMILevel::HMILevelInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[4];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.inc
deleted file mode 100644
index 8d9728feb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.inc
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Copyright (c) 2013 Ford Motor Company */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.gp  */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 10
-/* maximum key range = 7, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPC {
-
-class HMILevel_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-HMILevel_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11,  0, 11, 11, 11,
-       5, 11, 11, 11, 11, 11,  0, 11,  0, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-HMILevel_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  0,  0,  7,  0,  4, 10
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.gp"
-      {"NONE",3},
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.gp"
-      {"LIMITED",1},
-      {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.gp"
-      {"FULL",0},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HMILevelMarshaller.gp"
-      {"BACKGROUND",2}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
\ No newline at end of file
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.cpp
deleted file mode 100644
index 1c940d491..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/HmiZoneCapabilities.h"
-#include "HmiZoneCapabilitiesMarshaller.h"
-#include "HmiZoneCapabilitiesMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const HmiZoneCapabilities::HmiZoneCapabilitiesInternal HmiZoneCapabilitiesMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return HmiZoneCapabilities::INVALID_ENUM;
-  const struct PerfectHashTable* p=HmiZoneCapabilities_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<HmiZoneCapabilities::HmiZoneCapabilitiesInternal>(p->idx) : HmiZoneCapabilities::INVALID_ENUM;
-}
-
-
-bool HmiZoneCapabilitiesMarshaller::fromJSON(const Json::Value& s,HmiZoneCapabilities& e)
-{
-  e.mInternal=HmiZoneCapabilities::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=HmiZoneCapabilities::INVALID_ENUM);
-}
-
-
-Json::Value HmiZoneCapabilitiesMarshaller::toJSON(const HmiZoneCapabilities& e)
-{
-  if(e.mInternal==HmiZoneCapabilities::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool HmiZoneCapabilitiesMarshaller::fromString(const std::string& s,HmiZoneCapabilities& e)
-{
-  e.mInternal=HmiZoneCapabilities::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string HmiZoneCapabilitiesMarshaller::toString(const HmiZoneCapabilities& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==HmiZoneCapabilities::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable HmiZoneCapabilitiesMarshaller::mHashTable[2]=
-{
-  {"FRONT",0},
-  {"BACK",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.gp
deleted file mode 100644
index 40d272c87..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name HmiZoneCapabilities_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-FRONT,0
-BACK,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.h
deleted file mode 100644
index d05988a59..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_HMIZONECAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_HMIZONECAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/HmiZoneCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for HmiZoneCapabilities
-
-  class HmiZoneCapabilitiesMarshaller
-  {
-  public:
-  
-    static std::string toName(const HmiZoneCapabilities& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(HmiZoneCapabilities& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=HmiZoneCapabilities::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(HmiZoneCapabilities& e)		{ return e.mInternal!=HmiZoneCapabilities::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const HmiZoneCapabilities& e)	{ return e.mInternal!=HmiZoneCapabilities::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,HmiZoneCapabilities& e);
-    static const std::string toString(const HmiZoneCapabilities& e);
-  
-    static bool fromJSON(const Json::Value& s,HmiZoneCapabilities& e);
-    static Json::Value toJSON(const HmiZoneCapabilities& e);
-  
-    static const char* getName(HmiZoneCapabilities::HmiZoneCapabilitiesInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const HmiZoneCapabilities::HmiZoneCapabilitiesInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.inc
deleted file mode 100644
index 1d8e37870..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 5
-/* maximum key range = 2, duplicates = 0 */
-
-class HmiZoneCapabilities_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-HmiZoneCapabilities_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-HmiZoneCapabilities_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  5
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.gp"
-      {"BACK",1},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/HmiZoneCapabilitiesMarshaller.gp"
-      {"FRONT",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.cpp
deleted file mode 100644
index 98ba5a0da..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/InteractionMode.h"
-#include "InteractionModeMarshaller.h"
-#include "InteractionModeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const InteractionMode::InteractionModeInternal InteractionModeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return InteractionMode::INVALID_ENUM;
-  const struct PerfectHashTable* p=InteractionMode_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<InteractionMode::InteractionModeInternal>(p->idx) : InteractionMode::INVALID_ENUM;
-}
-
-
-bool InteractionModeMarshaller::fromJSON(const Json::Value& s,InteractionMode& e)
-{
-  e.mInternal=InteractionMode::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=InteractionMode::INVALID_ENUM);
-}
-
-
-Json::Value InteractionModeMarshaller::toJSON(const InteractionMode& e)
-{
-  if(e.mInternal==InteractionMode::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool InteractionModeMarshaller::fromString(const std::string& s,InteractionMode& e)
-{
-  e.mInternal=InteractionMode::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string InteractionModeMarshaller::toString(const InteractionMode& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==InteractionMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable InteractionModeMarshaller::mHashTable[3]=
-{
-  {"MANUAL_ONLY",0},
-  {"VR_ONLY",1},
-  {"BOTH",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.gp
deleted file mode 100644
index 256bee809..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name InteractionMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-MANUAL_ONLY,0
-VR_ONLY,1
-BOTH,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.h
deleted file mode 100644
index ef1229d91..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_INTERACTIONMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_INTERACTIONMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/InteractionMode.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for InteractionMode
-
-  class InteractionModeMarshaller
-  {
-  public:
-  
-    static std::string toName(const InteractionMode& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(InteractionMode& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=InteractionMode::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(InteractionMode& e)		{ return e.mInternal!=InteractionMode::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const InteractionMode& e)	{ return e.mInternal!=InteractionMode::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,InteractionMode& e);
-    static const std::string toString(const InteractionMode& e);
-  
-    static bool fromJSON(const Json::Value& s,InteractionMode& e);
-    static Json::Value toJSON(const InteractionMode& e);
-  
-    static const char* getName(InteractionMode::InteractionModeInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const InteractionMode::InteractionModeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.inc
deleted file mode 100644
index f01669d29..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.inc
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 11
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 11
-/* maximum key range = 8, duplicates = 0 */
-
-class InteractionMode_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-InteractionMode_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-InteractionMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  0,  0,  7,  0,  0,  0, 11
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.gp"
-      {"BOTH",2},
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.gp"
-      {"VR_ONLY",1},
-      {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/InteractionModeMarshaller.gp"
-      {"MANUAL_ONLY",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.cpp
deleted file mode 100644
index 6e916f276..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/Language.h"
-#include "LanguageMarshaller.h"
-#include "LanguageMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const Language::LanguageInternal LanguageMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return Language::INVALID_ENUM;
-  const struct PerfectHashTable* p=Language_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<Language::LanguageInternal>(p->idx) : Language::INVALID_ENUM;
-}
-
-
-bool LanguageMarshaller::fromJSON(const Json::Value& s,Language& e)
-{
-  e.mInternal=Language::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=Language::INVALID_ENUM);
-}
-
-
-Json::Value LanguageMarshaller::toJSON(const Language& e)
-{
-  if(e.mInternal==Language::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool LanguageMarshaller::fromString(const std::string& s,Language& e)
-{
-  e.mInternal=Language::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string LanguageMarshaller::toString(const Language& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==Language::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable LanguageMarshaller::mHashTable[3]=
-{
-  {"EN-US",0},
-  {"ES-MX",1},
-  {"FR-CA",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.gp
deleted file mode 100644
index 34331fc4d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name Language_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-EN-US,0
-ES-MX,1
-FR-CA,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.h
deleted file mode 100644
index d77fe6db6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_LANGUAGEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_LANGUAGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Language.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for Language
-
-  class LanguageMarshaller
-  {
-  public:
-  
-    static std::string toName(const Language& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(Language& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=Language::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(Language& e)		{ return e.mInternal!=Language::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const Language& e)	{ return e.mInternal!=Language::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,Language& e);
-    static const std::string toString(const Language& e);
-  
-    static bool fromJSON(const Json::Value& s,Language& e);
-    static Json::Value toJSON(const Language& e);
-  
-    static const char* getName(Language::LanguageInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const Language::LanguageInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.inc
deleted file mode 100644
index 4c947e038..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.inc
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.gp  */
-/* Computed positions: -k'2' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 7
-/* maximum key range = 3, duplicates = 0 */
-
-class Language_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Language_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 2, 8,
-      8, 8, 1, 0, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-      8, 8, 8, 8, 8, 8
-    };
-  return len + asso_values[(unsigned char)str[1]];
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-Language_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  5,  5,  5
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.gp"
-      {"ES-MX",1},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.gp"
-      {"FR-CA",2},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/LanguageMarshaller.gp"
-      {"EN-US",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.cpp
deleted file mode 100644
index 79a508129..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.cpp
+++ /dev/null
@@ -1,816 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddCommand_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddCommand_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteCommand_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/AddSubMenu_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteSubMenu_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/CreateInteractionChoiceSet_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/DeleteInteractionChoiceSet_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Alert_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Alert_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Show_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Show_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Speak_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Speak_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/EncodedSyncPData_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/GenericResponse_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnHMIStatus.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnAppInterfaceUnregistered.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnButtonEvent.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnButtonPress.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnCommand.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnEncodedSyncPData.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnTBTClientState.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnDriverDistraction.h"
-namespace NsSmartDeviceLinkRPC
-{
-#include "Marshaller.inc"
-}
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const Marshaller::Methods Marshaller::getIndex(const char* s)
-{
-  if(!s)
-    return METHOD_INVALID;
-  const struct localHash* p=Marshaller_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<Methods>(p->idx) : METHOD_INVALID;
-}
-
-
-SDLRPCMessage* Marshaller::fromString(const std::string& s)
-{
-  SDLRPCMessage* rv=0;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-
-    if(!reader.parse(s,json,false))  return 0;
-    if(!(rv=fromJSON(json)))  return 0;
-  }
-  catch(...)
-  {
-    return 0;
-  }
-  return rv;
-}
-
-std::string Marshaller::toString(const SDLRPCMessage* msg)
-{
-  if(!msg)  return "";
-
-  Json::Value json=toJSON(msg);
-
-  if(json.isNull()) return "";
-
-  Json::FastWriter writer;
-  std::string rv;
-  return writer.write(json);
-}
-
-
-SDLRPCMessage* Marshaller::fromJSON(const Json::Value& json)
-{
-  if(!json.isObject())  return NULL;
-  Json::Value j=Json::Value(Json::nullValue);
-
-  std::string tp;
-  if(json.isMember("notification")) j=json[tp="notification"];
-
-  if(json.isMember("request"))  j=json[tp="request"];
-  if(json.isMember("response"))  j=json[tp="response"];
-
-  if(!j.isObject()) return NULL;
-  if(!j.isMember("name") || !j["name"].isString()) return NULL;
-
-  std::string ts=j["name"].asString()+"_"+tp;
-
-  Methods m=getIndex(ts.c_str());
-  switch(m)							// let's rock, china style
-  {
-    case METHOD_INVALID:
-      return NULL;
-
-    case METHOD_REGISTERAPPINTERFACE_REQUEST:
-    {
-      RegisterAppInterface_request* rv=new RegisterAppInterface_request;
-      if(RegisterAppInterface_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_REGISTERAPPINTERFACE_RESPONSE:
-    {
-      RegisterAppInterface_response* rv=new RegisterAppInterface_response;
-      if(RegisterAppInterface_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_UNREGISTERAPPINTERFACE_REQUEST:
-    {
-      UnregisterAppInterface_request* rv=new UnregisterAppInterface_request;
-      if(UnregisterAppInterface_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_UNREGISTERAPPINTERFACE_RESPONSE:
-    {
-      UnregisterAppInterface_response* rv=new UnregisterAppInterface_response;
-      if(UnregisterAppInterface_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_SETGLOBALPROPERTIES_REQUEST:
-    {
-      SetGlobalProperties_request* rv=new SetGlobalProperties_request;
-      if(SetGlobalProperties_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_SETGLOBALPROPERTIES_RESPONSE:
-    {
-      SetGlobalProperties_response* rv=new SetGlobalProperties_response;
-      if(SetGlobalProperties_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_RESETGLOBALPROPERTIES_REQUEST:
-    {
-      ResetGlobalProperties_request* rv=new ResetGlobalProperties_request;
-      if(ResetGlobalProperties_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_RESETGLOBALPROPERTIES_RESPONSE:
-    {
-      ResetGlobalProperties_response* rv=new ResetGlobalProperties_response;
-      if(ResetGlobalProperties_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ADDCOMMAND_REQUEST:
-    {
-      AddCommand_request* rv=new AddCommand_request;
-      if(AddCommand_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ADDCOMMAND_RESPONSE:
-    {
-      AddCommand_response* rv=new AddCommand_response;
-      if(AddCommand_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_DELETECOMMAND_REQUEST:
-    {
-      DeleteCommand_request* rv=new DeleteCommand_request;
-      if(DeleteCommand_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_DELETECOMMAND_RESPONSE:
-    {
-      DeleteCommand_response* rv=new DeleteCommand_response;
-      if(DeleteCommand_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ADDSUBMENU_REQUEST:
-    {
-      AddSubMenu_request* rv=new AddSubMenu_request;
-      if(AddSubMenu_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ADDSUBMENU_RESPONSE:
-    {
-      AddSubMenu_response* rv=new AddSubMenu_response;
-      if(AddSubMenu_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_DELETESUBMENU_REQUEST:
-    {
-      DeleteSubMenu_request* rv=new DeleteSubMenu_request;
-      if(DeleteSubMenu_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_DELETESUBMENU_RESPONSE:
-    {
-      DeleteSubMenu_response* rv=new DeleteSubMenu_response;
-      if(DeleteSubMenu_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_CREATEINTERACTIONCHOICESET_REQUEST:
-    {
-      CreateInteractionChoiceSet_request* rv=new CreateInteractionChoiceSet_request;
-      if(CreateInteractionChoiceSet_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_CREATEINTERACTIONCHOICESET_RESPONSE:
-    {
-      CreateInteractionChoiceSet_response* rv=new CreateInteractionChoiceSet_response;
-      if(CreateInteractionChoiceSet_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_PERFORMINTERACTION_REQUEST:
-    {
-      PerformInteraction_request* rv=new PerformInteraction_request;
-      if(PerformInteraction_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_PERFORMINTERACTION_RESPONSE:
-    {
-      PerformInteraction_response* rv=new PerformInteraction_response;
-      if(PerformInteraction_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_DELETEINTERACTIONCHOICESET_REQUEST:
-    {
-      DeleteInteractionChoiceSet_request* rv=new DeleteInteractionChoiceSet_request;
-      if(DeleteInteractionChoiceSet_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_DELETEINTERACTIONCHOICESET_RESPONSE:
-    {
-      DeleteInteractionChoiceSet_response* rv=new DeleteInteractionChoiceSet_response;
-      if(DeleteInteractionChoiceSet_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ALERT_REQUEST:
-    {
-      Alert_request* rv=new Alert_request;
-      if(Alert_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ALERT_RESPONSE:
-    {
-      Alert_response* rv=new Alert_response;
-      if(Alert_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_SHOW_REQUEST:
-    {
-      Show_request* rv=new Show_request;
-      if(Show_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_SHOW_RESPONSE:
-    {
-      Show_response* rv=new Show_response;
-      if(Show_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_SPEAK_REQUEST:
-    {
-      Speak_request* rv=new Speak_request;
-      if(Speak_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_SPEAK_RESPONSE:
-    {
-      Speak_response* rv=new Speak_response;
-      if(Speak_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_SETMEDIACLOCKTIMER_REQUEST:
-    {
-      SetMediaClockTimer_request* rv=new SetMediaClockTimer_request;
-      if(SetMediaClockTimer_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_SETMEDIACLOCKTIMER_RESPONSE:
-    {
-      SetMediaClockTimer_response* rv=new SetMediaClockTimer_response;
-      if(SetMediaClockTimer_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ENCODEDSYNCPDATA_REQUEST:
-    {
-      EncodedSyncPData_request* rv=new EncodedSyncPData_request;
-      if(EncodedSyncPData_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ENCODEDSYNCPDATA_RESPONSE:
-    {
-      EncodedSyncPData_response* rv=new EncodedSyncPData_response;
-      if(EncodedSyncPData_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_SUBSCRIBEBUTTON_REQUEST:
-    {
-      SubscribeButton_request* rv=new SubscribeButton_request;
-      if(SubscribeButton_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_SUBSCRIBEBUTTON_RESPONSE:
-    {
-      SubscribeButton_response* rv=new SubscribeButton_response;
-      if(SubscribeButton_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_UNSUBSCRIBEBUTTON_REQUEST:
-    {
-      UnsubscribeButton_request* rv=new UnsubscribeButton_request;
-      if(UnsubscribeButton_requestMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_UNSUBSCRIBEBUTTON_RESPONSE:
-    {
-      UnsubscribeButton_response* rv=new UnsubscribeButton_response;
-      if(UnsubscribeButton_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_GENERICRESPONSE_RESPONSE:
-    {
-      GenericResponse_response* rv=new GenericResponse_response;
-      if(GenericResponse_responseMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ONHMISTATUS:
-    {
-      OnHMIStatus* rv=new OnHMIStatus;
-      if(OnHMIStatusMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ONAPPINTERFACEUNREGISTERED:
-    {
-      OnAppInterfaceUnregistered* rv=new OnAppInterfaceUnregistered;
-      if(OnAppInterfaceUnregisteredMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ONBUTTONEVENT:
-    {
-      OnButtonEvent* rv=new OnButtonEvent;
-      if(OnButtonEventMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ONBUTTONPRESS:
-    {
-      OnButtonPress* rv=new OnButtonPress;
-      if(OnButtonPressMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ONCOMMAND:
-    {
-      OnCommand* rv=new OnCommand;
-      if(OnCommandMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ONENCODEDSYNCPDATA:
-    {
-      OnEncodedSyncPData* rv=new OnEncodedSyncPData;
-      if(OnEncodedSyncPDataMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ONTBTCLIENTSTATE:
-    {
-      OnTBTClientState* rv=new OnTBTClientState;
-      if(OnTBTClientStateMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-
-    case METHOD_ONDRIVERDISTRACTION:
-    {
-      OnDriverDistraction* rv=new OnDriverDistraction;
-      if(OnDriverDistractionMarshaller::fromJSON(json,*rv))
-        return rv;
-      delete rv;
-      return NULL;
-    }
-  }
-
-  return NULL;
-}
-
-Json::Value Marshaller::toJSON(const SDLRPCMessage* msg)
-{
-  Json::Value j=Json::Value(Json::nullValue);
-
-  if(!msg) return j;
-  Methods m=static_cast<Methods>(msg->getMethodId());
-
-  switch(m)
-  {
-    case METHOD_REGISTERAPPINTERFACE_REQUEST:
-         return RegisterAppInterface_requestMarshaller::toJSON(* static_cast<const RegisterAppInterface_request*>(msg));
-
-    case METHOD_REGISTERAPPINTERFACE_RESPONSE:
-         return RegisterAppInterface_responseMarshaller::toJSON(* static_cast<const RegisterAppInterface_response*>(msg));
-
-    case METHOD_UNREGISTERAPPINTERFACE_REQUEST:
-         return UnregisterAppInterface_requestMarshaller::toJSON(* static_cast<const UnregisterAppInterface_request*>(msg));
-
-    case METHOD_UNREGISTERAPPINTERFACE_RESPONSE:
-         return UnregisterAppInterface_responseMarshaller::toJSON(* static_cast<const UnregisterAppInterface_response*>(msg));
-
-    case METHOD_SETGLOBALPROPERTIES_REQUEST:
-         return SetGlobalProperties_requestMarshaller::toJSON(* static_cast<const SetGlobalProperties_request*>(msg));
-
-    case METHOD_SETGLOBALPROPERTIES_RESPONSE:
-         return SetGlobalProperties_responseMarshaller::toJSON(* static_cast<const SetGlobalProperties_response*>(msg));
-
-    case METHOD_RESETGLOBALPROPERTIES_REQUEST:
-         return ResetGlobalProperties_requestMarshaller::toJSON(* static_cast<const ResetGlobalProperties_request*>(msg));
-
-    case METHOD_RESETGLOBALPROPERTIES_RESPONSE:
-         return ResetGlobalProperties_responseMarshaller::toJSON(* static_cast<const ResetGlobalProperties_response*>(msg));
-
-    case METHOD_ADDCOMMAND_REQUEST:
-         return AddCommand_requestMarshaller::toJSON(* static_cast<const AddCommand_request*>(msg));
-
-    case METHOD_ADDCOMMAND_RESPONSE:
-         return AddCommand_responseMarshaller::toJSON(* static_cast<const AddCommand_response*>(msg));
-
-    case METHOD_DELETECOMMAND_REQUEST:
-         return DeleteCommand_requestMarshaller::toJSON(* static_cast<const DeleteCommand_request*>(msg));
-
-    case METHOD_DELETECOMMAND_RESPONSE:
-         return DeleteCommand_responseMarshaller::toJSON(* static_cast<const DeleteCommand_response*>(msg));
-
-    case METHOD_ADDSUBMENU_REQUEST:
-         return AddSubMenu_requestMarshaller::toJSON(* static_cast<const AddSubMenu_request*>(msg));
-
-    case METHOD_ADDSUBMENU_RESPONSE:
-         return AddSubMenu_responseMarshaller::toJSON(* static_cast<const AddSubMenu_response*>(msg));
-
-    case METHOD_DELETESUBMENU_REQUEST:
-         return DeleteSubMenu_requestMarshaller::toJSON(* static_cast<const DeleteSubMenu_request*>(msg));
-
-    case METHOD_DELETESUBMENU_RESPONSE:
-         return DeleteSubMenu_responseMarshaller::toJSON(* static_cast<const DeleteSubMenu_response*>(msg));
-
-    case METHOD_CREATEINTERACTIONCHOICESET_REQUEST:
-         return CreateInteractionChoiceSet_requestMarshaller::toJSON(* static_cast<const CreateInteractionChoiceSet_request*>(msg));
-
-    case METHOD_CREATEINTERACTIONCHOICESET_RESPONSE:
-         return CreateInteractionChoiceSet_responseMarshaller::toJSON(* static_cast<const CreateInteractionChoiceSet_response*>(msg));
-
-    case METHOD_PERFORMINTERACTION_REQUEST:
-         return PerformInteraction_requestMarshaller::toJSON(* static_cast<const PerformInteraction_request*>(msg));
-
-    case METHOD_PERFORMINTERACTION_RESPONSE:
-         return PerformInteraction_responseMarshaller::toJSON(* static_cast<const PerformInteraction_response*>(msg));
-
-    case METHOD_DELETEINTERACTIONCHOICESET_REQUEST:
-         return DeleteInteractionChoiceSet_requestMarshaller::toJSON(* static_cast<const DeleteInteractionChoiceSet_request*>(msg));
-
-    case METHOD_DELETEINTERACTIONCHOICESET_RESPONSE:
-         return DeleteInteractionChoiceSet_responseMarshaller::toJSON(* static_cast<const DeleteInteractionChoiceSet_response*>(msg));
-
-    case METHOD_ALERT_REQUEST:
-         return Alert_requestMarshaller::toJSON(* static_cast<const Alert_request*>(msg));
-
-    case METHOD_ALERT_RESPONSE:
-         return Alert_responseMarshaller::toJSON(* static_cast<const Alert_response*>(msg));
-
-    case METHOD_SHOW_REQUEST:
-         return Show_requestMarshaller::toJSON(* static_cast<const Show_request*>(msg));
-
-    case METHOD_SHOW_RESPONSE:
-         return Show_responseMarshaller::toJSON(* static_cast<const Show_response*>(msg));
-
-    case METHOD_SPEAK_REQUEST:
-         return Speak_requestMarshaller::toJSON(* static_cast<const Speak_request*>(msg));
-
-    case METHOD_SPEAK_RESPONSE:
-         return Speak_responseMarshaller::toJSON(* static_cast<const Speak_response*>(msg));
-
-    case METHOD_SETMEDIACLOCKTIMER_REQUEST:
-         return SetMediaClockTimer_requestMarshaller::toJSON(* static_cast<const SetMediaClockTimer_request*>(msg));
-
-    case METHOD_SETMEDIACLOCKTIMER_RESPONSE:
-         return SetMediaClockTimer_responseMarshaller::toJSON(* static_cast<const SetMediaClockTimer_response*>(msg));
-
-    case METHOD_ENCODEDSYNCPDATA_REQUEST:
-         return EncodedSyncPData_requestMarshaller::toJSON(* static_cast<const EncodedSyncPData_request*>(msg));
-
-    case METHOD_ENCODEDSYNCPDATA_RESPONSE:
-         return EncodedSyncPData_responseMarshaller::toJSON(* static_cast<const EncodedSyncPData_response*>(msg));
-
-    case METHOD_SUBSCRIBEBUTTON_REQUEST:
-         return SubscribeButton_requestMarshaller::toJSON(* static_cast<const SubscribeButton_request*>(msg));
-
-    case METHOD_SUBSCRIBEBUTTON_RESPONSE:
-         return SubscribeButton_responseMarshaller::toJSON(* static_cast<const SubscribeButton_response*>(msg));
-
-    case METHOD_UNSUBSCRIBEBUTTON_REQUEST:
-         return UnsubscribeButton_requestMarshaller::toJSON(* static_cast<const UnsubscribeButton_request*>(msg));
-
-    case METHOD_UNSUBSCRIBEBUTTON_RESPONSE:
-         return UnsubscribeButton_responseMarshaller::toJSON(* static_cast<const UnsubscribeButton_response*>(msg));
-
-    case METHOD_GENERICRESPONSE_RESPONSE:
-         return GenericResponse_responseMarshaller::toJSON(* static_cast<const GenericResponse_response*>(msg));
-
-    case METHOD_ONHMISTATUS:
-         return OnHMIStatusMarshaller::toJSON(* static_cast<const OnHMIStatus*>(msg));
-
-    case METHOD_ONAPPINTERFACEUNREGISTERED:
-         return OnAppInterfaceUnregisteredMarshaller::toJSON(* static_cast<const OnAppInterfaceUnregistered*>(msg));
-
-    case METHOD_ONBUTTONEVENT:
-         return OnButtonEventMarshaller::toJSON(* static_cast<const OnButtonEvent*>(msg));
-
-    case METHOD_ONBUTTONPRESS:
-         return OnButtonPressMarshaller::toJSON(* static_cast<const OnButtonPress*>(msg));
-
-    case METHOD_ONCOMMAND:
-         return OnCommandMarshaller::toJSON(* static_cast<const OnCommand*>(msg));
-
-    case METHOD_ONENCODEDSYNCPDATA:
-         return OnEncodedSyncPDataMarshaller::toJSON(* static_cast<const OnEncodedSyncPData*>(msg));
-
-    case METHOD_ONTBTCLIENTSTATE:
-         return OnTBTClientStateMarshaller::toJSON(* static_cast<const OnTBTClientState*>(msg));
-
-    case METHOD_ONDRIVERDISTRACTION:
-         return OnDriverDistractionMarshaller::toJSON(* static_cast<const OnDriverDistraction*>(msg));
-
-    case METHOD_INVALID:
-    default:
-      return j;
-  }
-
-  return j;
-}
-
-RegisterAppInterface_requestMarshaller Marshaller::mRegisterAppInterface_request;
-RegisterAppInterface_responseMarshaller Marshaller::mRegisterAppInterface_response;
-UnregisterAppInterface_requestMarshaller Marshaller::mUnregisterAppInterface_request;
-UnregisterAppInterface_responseMarshaller Marshaller::mUnregisterAppInterface_response;
-SetGlobalProperties_requestMarshaller Marshaller::mSetGlobalProperties_request;
-SetGlobalProperties_responseMarshaller Marshaller::mSetGlobalProperties_response;
-ResetGlobalProperties_requestMarshaller Marshaller::mResetGlobalProperties_request;
-ResetGlobalProperties_responseMarshaller Marshaller::mResetGlobalProperties_response;
-AddCommand_requestMarshaller Marshaller::mAddCommand_request;
-AddCommand_responseMarshaller Marshaller::mAddCommand_response;
-DeleteCommand_requestMarshaller Marshaller::mDeleteCommand_request;
-DeleteCommand_responseMarshaller Marshaller::mDeleteCommand_response;
-AddSubMenu_requestMarshaller Marshaller::mAddSubMenu_request;
-AddSubMenu_responseMarshaller Marshaller::mAddSubMenu_response;
-DeleteSubMenu_requestMarshaller Marshaller::mDeleteSubMenu_request;
-DeleteSubMenu_responseMarshaller Marshaller::mDeleteSubMenu_response;
-CreateInteractionChoiceSet_requestMarshaller Marshaller::mCreateInteractionChoiceSet_request;
-CreateInteractionChoiceSet_responseMarshaller Marshaller::mCreateInteractionChoiceSet_response;
-PerformInteraction_requestMarshaller Marshaller::mPerformInteraction_request;
-PerformInteraction_responseMarshaller Marshaller::mPerformInteraction_response;
-DeleteInteractionChoiceSet_requestMarshaller Marshaller::mDeleteInteractionChoiceSet_request;
-DeleteInteractionChoiceSet_responseMarshaller Marshaller::mDeleteInteractionChoiceSet_response;
-Alert_requestMarshaller Marshaller::mAlert_request;
-Alert_responseMarshaller Marshaller::mAlert_response;
-Show_requestMarshaller Marshaller::mShow_request;
-Show_responseMarshaller Marshaller::mShow_response;
-Speak_requestMarshaller Marshaller::mSpeak_request;
-Speak_responseMarshaller Marshaller::mSpeak_response;
-SetMediaClockTimer_requestMarshaller Marshaller::mSetMediaClockTimer_request;
-SetMediaClockTimer_responseMarshaller Marshaller::mSetMediaClockTimer_response;
-EncodedSyncPData_requestMarshaller Marshaller::mEncodedSyncPData_request;
-EncodedSyncPData_responseMarshaller Marshaller::mEncodedSyncPData_response;
-SubscribeButton_requestMarshaller Marshaller::mSubscribeButton_request;
-SubscribeButton_responseMarshaller Marshaller::mSubscribeButton_response;
-UnsubscribeButton_requestMarshaller Marshaller::mUnsubscribeButton_request;
-UnsubscribeButton_responseMarshaller Marshaller::mUnsubscribeButton_response;
-GenericResponse_responseMarshaller Marshaller::mGenericResponse_response;
-OnHMIStatusMarshaller Marshaller::mOnHMIStatus;
-OnAppInterfaceUnregisteredMarshaller Marshaller::mOnAppInterfaceUnregistered;
-OnButtonEventMarshaller Marshaller::mOnButtonEvent;
-OnButtonPressMarshaller Marshaller::mOnButtonPress;
-OnCommandMarshaller Marshaller::mOnCommand;
-OnEncodedSyncPDataMarshaller Marshaller::mOnEncodedSyncPData;
-OnTBTClientStateMarshaller Marshaller::mOnTBTClientState;
-OnDriverDistractionMarshaller Marshaller::mOnDriverDistraction;
-
-const Marshaller::localHash Marshaller::mHashTable[45]=
-{
-  {"RegisterAppInterface_request",METHOD_REGISTERAPPINTERFACE_REQUEST,&Marshaller::mRegisterAppInterface_request},
-  {"RegisterAppInterface_response",METHOD_REGISTERAPPINTERFACE_RESPONSE,&Marshaller::mRegisterAppInterface_response},
-  {"UnregisterAppInterface_request",METHOD_UNREGISTERAPPINTERFACE_REQUEST,&Marshaller::mUnregisterAppInterface_request},
-  {"UnregisterAppInterface_response",METHOD_UNREGISTERAPPINTERFACE_RESPONSE,&Marshaller::mUnregisterAppInterface_response},
-  {"SetGlobalProperties_request",METHOD_SETGLOBALPROPERTIES_REQUEST,&Marshaller::mSetGlobalProperties_request},
-  {"SetGlobalProperties_response",METHOD_SETGLOBALPROPERTIES_RESPONSE,&Marshaller::mSetGlobalProperties_response},
-  {"ResetGlobalProperties_request",METHOD_RESETGLOBALPROPERTIES_REQUEST,&Marshaller::mResetGlobalProperties_request},
-  {"ResetGlobalProperties_response",METHOD_RESETGLOBALPROPERTIES_RESPONSE,&Marshaller::mResetGlobalProperties_response},
-  {"AddCommand_request",METHOD_ADDCOMMAND_REQUEST,&Marshaller::mAddCommand_request},
-  {"AddCommand_response",METHOD_ADDCOMMAND_RESPONSE,&Marshaller::mAddCommand_response},
-  {"DeleteCommand_request",METHOD_DELETECOMMAND_REQUEST,&Marshaller::mDeleteCommand_request},
-  {"DeleteCommand_response",METHOD_DELETECOMMAND_RESPONSE,&Marshaller::mDeleteCommand_response},
-  {"AddSubMenu_request",METHOD_ADDSUBMENU_REQUEST,&Marshaller::mAddSubMenu_request},
-  {"AddSubMenu_response",METHOD_ADDSUBMENU_RESPONSE,&Marshaller::mAddSubMenu_response},
-  {"DeleteSubMenu_request",METHOD_DELETESUBMENU_REQUEST,&Marshaller::mDeleteSubMenu_request},
-  {"DeleteSubMenu_response",METHOD_DELETESUBMENU_RESPONSE,&Marshaller::mDeleteSubMenu_response},
-  {"CreateInteractionChoiceSet_request",METHOD_CREATEINTERACTIONCHOICESET_REQUEST,&Marshaller::mCreateInteractionChoiceSet_request},
-  {"CreateInteractionChoiceSet_response",METHOD_CREATEINTERACTIONCHOICESET_RESPONSE,&Marshaller::mCreateInteractionChoiceSet_response},
-  {"PerformInteraction_request",METHOD_PERFORMINTERACTION_REQUEST,&Marshaller::mPerformInteraction_request},
-  {"PerformInteraction_response",METHOD_PERFORMINTERACTION_RESPONSE,&Marshaller::mPerformInteraction_response},
-  {"DeleteInteractionChoiceSet_request",METHOD_DELETEINTERACTIONCHOICESET_REQUEST,&Marshaller::mDeleteInteractionChoiceSet_request},
-  {"DeleteInteractionChoiceSet_response",METHOD_DELETEINTERACTIONCHOICESET_RESPONSE,&Marshaller::mDeleteInteractionChoiceSet_response},
-  {"Alert_request",METHOD_ALERT_REQUEST,&Marshaller::mAlert_request},
-  {"Alert_response",METHOD_ALERT_RESPONSE,&Marshaller::mAlert_response},
-  {"Show_request",METHOD_SHOW_REQUEST,&Marshaller::mShow_request},
-  {"Show_response",METHOD_SHOW_RESPONSE,&Marshaller::mShow_response},
-  {"Speak_request",METHOD_SPEAK_REQUEST,&Marshaller::mSpeak_request},
-  {"Speak_response",METHOD_SPEAK_RESPONSE,&Marshaller::mSpeak_response},
-  {"SetMediaClockTimer_request",METHOD_SETMEDIACLOCKTIMER_REQUEST,&Marshaller::mSetMediaClockTimer_request},
-  {"SetMediaClockTimer_response",METHOD_SETMEDIACLOCKTIMER_RESPONSE,&Marshaller::mSetMediaClockTimer_response},
-  {"EncodedSyncPData_request",METHOD_ENCODEDSYNCPDATA_REQUEST,&Marshaller::mEncodedSyncPData_request},
-  {"EncodedSyncPData_response",METHOD_ENCODEDSYNCPDATA_RESPONSE,&Marshaller::mEncodedSyncPData_response},
-  {"SubscribeButton_request",METHOD_SUBSCRIBEBUTTON_REQUEST,&Marshaller::mSubscribeButton_request},
-  {"SubscribeButton_response",METHOD_SUBSCRIBEBUTTON_RESPONSE,&Marshaller::mSubscribeButton_response},
-  {"UnsubscribeButton_request",METHOD_UNSUBSCRIBEBUTTON_REQUEST,&Marshaller::mUnsubscribeButton_request},
-  {"UnsubscribeButton_response",METHOD_UNSUBSCRIBEBUTTON_RESPONSE,&Marshaller::mUnsubscribeButton_response},
-  {"GenericResponse_response",METHOD_GENERICRESPONSE_RESPONSE,&Marshaller::mGenericResponse_response},
-  {"OnHMIStatus_notification",METHOD_ONHMISTATUS,&Marshaller::mOnHMIStatus},
-  {"OnAppInterfaceUnregistered_notification",METHOD_ONAPPINTERFACEUNREGISTERED,&Marshaller::mOnAppInterfaceUnregistered},
-  {"OnButtonEvent_notification",METHOD_ONBUTTONEVENT,&Marshaller::mOnButtonEvent},
-  {"OnButtonPress_notification",METHOD_ONBUTTONPRESS,&Marshaller::mOnButtonPress},
-  {"OnCommand_notification",METHOD_ONCOMMAND,&Marshaller::mOnCommand},
-  {"OnEncodedSyncPData_notification",METHOD_ONENCODEDSYNCPDATA,&Marshaller::mOnEncodedSyncPData},
-  {"OnTBTClientState_notification",METHOD_ONTBTCLIENTSTATE,&Marshaller::mOnTBTClientState},
-  {"OnDriverDistraction_notification",METHOD_ONDRIVERDISTRACTION,&Marshaller::mOnDriverDistraction}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp
deleted file mode 100644
index 7ea826391..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp
+++ /dev/null
@@ -1,62 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name Marshaller_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::Marshaller::localHash
-{
-  const char *name;
-  unsigned int idx;
-  void* method;
-};
-
-%%
-RegisterAppInterface_request,0,&NsSmartDeviceLinkRPC::Marshaller::mRegisterAppInterface_request
-RegisterAppInterface_response,1,&NsSmartDeviceLinkRPC::Marshaller::mRegisterAppInterface_response
-UnregisterAppInterface_request,2,&NsSmartDeviceLinkRPC::Marshaller::mUnregisterAppInterface_request
-UnregisterAppInterface_response,3,&NsSmartDeviceLinkRPC::Marshaller::mUnregisterAppInterface_response
-SetGlobalProperties_request,4,&NsSmartDeviceLinkRPC::Marshaller::mSetGlobalProperties_request
-SetGlobalProperties_response,5,&NsSmartDeviceLinkRPC::Marshaller::mSetGlobalProperties_response
-ResetGlobalProperties_request,6,&NsSmartDeviceLinkRPC::Marshaller::mResetGlobalProperties_request
-ResetGlobalProperties_response,7,&NsSmartDeviceLinkRPC::Marshaller::mResetGlobalProperties_response
-AddCommand_request,8,&NsSmartDeviceLinkRPC::Marshaller::mAddCommand_request
-AddCommand_response,9,&NsSmartDeviceLinkRPC::Marshaller::mAddCommand_response
-DeleteCommand_request,10,&NsSmartDeviceLinkRPC::Marshaller::mDeleteCommand_request
-DeleteCommand_response,11,&NsSmartDeviceLinkRPC::Marshaller::mDeleteCommand_response
-AddSubMenu_request,12,&NsSmartDeviceLinkRPC::Marshaller::mAddSubMenu_request
-AddSubMenu_response,13,&NsSmartDeviceLinkRPC::Marshaller::mAddSubMenu_response
-DeleteSubMenu_request,14,&NsSmartDeviceLinkRPC::Marshaller::mDeleteSubMenu_request
-DeleteSubMenu_response,15,&NsSmartDeviceLinkRPC::Marshaller::mDeleteSubMenu_response
-CreateInteractionChoiceSet_request,16,&NsSmartDeviceLinkRPC::Marshaller::mCreateInteractionChoiceSet_request
-CreateInteractionChoiceSet_response,17,&NsSmartDeviceLinkRPC::Marshaller::mCreateInteractionChoiceSet_response
-PerformInteraction_request,18,&NsSmartDeviceLinkRPC::Marshaller::mPerformInteraction_request
-PerformInteraction_response,19,&NsSmartDeviceLinkRPC::Marshaller::mPerformInteraction_response
-DeleteInteractionChoiceSet_request,20,&NsSmartDeviceLinkRPC::Marshaller::mDeleteInteractionChoiceSet_request
-DeleteInteractionChoiceSet_response,21,&NsSmartDeviceLinkRPC::Marshaller::mDeleteInteractionChoiceSet_response
-Alert_request,22,&NsSmartDeviceLinkRPC::Marshaller::mAlert_request
-Alert_response,23,&NsSmartDeviceLinkRPC::Marshaller::mAlert_response
-Show_request,24,&NsSmartDeviceLinkRPC::Marshaller::mShow_request
-Show_response,25,&NsSmartDeviceLinkRPC::Marshaller::mShow_response
-Speak_request,26,&NsSmartDeviceLinkRPC::Marshaller::mSpeak_request
-Speak_response,27,&NsSmartDeviceLinkRPC::Marshaller::mSpeak_response
-SetMediaClockTimer_request,28,&NsSmartDeviceLinkRPC::Marshaller::mSetMediaClockTimer_request
-SetMediaClockTimer_response,29,&NsSmartDeviceLinkRPC::Marshaller::mSetMediaClockTimer_response
-EncodedSyncPData_request,30,&NsSmartDeviceLinkRPC::Marshaller::mEncodedSyncPData_request
-EncodedSyncPData_response,31,&NsSmartDeviceLinkRPC::Marshaller::mEncodedSyncPData_response
-SubscribeButton_request,32,&NsSmartDeviceLinkRPC::Marshaller::mSubscribeButton_request
-SubscribeButton_response,33,&NsSmartDeviceLinkRPC::Marshaller::mSubscribeButton_response
-UnsubscribeButton_request,34,&NsSmartDeviceLinkRPC::Marshaller::mUnsubscribeButton_request
-UnsubscribeButton_response,35,&NsSmartDeviceLinkRPC::Marshaller::mUnsubscribeButton_response
-GenericResponse_response,36,&NsSmartDeviceLinkRPC::Marshaller::mGenericResponse_response
-OnHMIStatus_notification,37,&NsSmartDeviceLinkRPC::Marshaller::mOnHMIStatus
-OnAppInterfaceUnregistered_notification,38,&NsSmartDeviceLinkRPC::Marshaller::mOnAppInterfaceUnregistered
-OnButtonEvent_notification,39,&NsSmartDeviceLinkRPC::Marshaller::mOnButtonEvent
-OnButtonPress_notification,40,&NsSmartDeviceLinkRPC::Marshaller::mOnButtonPress
-OnCommand_notification,41,&NsSmartDeviceLinkRPC::Marshaller::mOnCommand
-OnEncodedSyncPData_notification,42,&NsSmartDeviceLinkRPC::Marshaller::mOnEncodedSyncPData
-OnTBTClientState_notification,43,&NsSmartDeviceLinkRPC::Marshaller::mOnTBTClientState
-OnDriverDistraction_notification,44,&NsSmartDeviceLinkRPC::Marshaller::mOnDriverDistraction
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.inc
deleted file mode 100644
index a465a4be0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.inc
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp  */
-/* Computed positions: -k'1,10' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 45
-#define MIN_WORD_LENGTH 12
-#define MAX_WORD_LENGTH 39
-#define MIN_HASH_VALUE 12
-#define MAX_HASH_VALUE 79
-/* maximum key range = 68, duplicates = 0 */
-
-class Marshaller_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::Marshaller::localHash *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Marshaller_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80,  5, 50, 35,  0, 25,
-      80, 30, 80, 80, 80, 80, 80, 40, 80,  5,
-       0, 80, 15,  0, 80, 10, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 15, 80, 15, 20, 80,
-      15,  0, 80, 80, 80,  0, 80, 80, 20,  0,
-      15, 20,  0, 80, 10, 25,  5,  0, 35, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-      80, 80, 80, 80, 80, 80
-    };
-  return len + asso_values[(unsigned char)str[9]] + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPC::Marshaller::localHash *
-Marshaller_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12, 13,
-      14,  0,  0,  0, 13, 14,  0, 21, 22, 18, 19,  0,  0, 27,
-      28, 24,  0, 26, 27, 13, 34, 35, 31, 32, 18, 19,  0, 26,
-      22, 28, 29,  0, 26, 27,  0, 29, 30, 31,  0,  0, 39, 25,
-      26,  0,  0, 29, 30, 21, 22,  0, 24, 25, 26,  0,  0, 34,
-      35,  0,  0, 23, 24,  0,  0,  0,  0, 24
-    };
-  static const struct NsSmartDeviceLinkRPC::Marshaller::localHash wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""},
-#line 42 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"Show_request",24,&NsSmartDeviceLinkRPC::Marshaller::mShow_request},
-#line 44 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"Speak_request",26,&NsSmartDeviceLinkRPC::Marshaller::mSpeak_request},
-#line 45 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"Speak_response",27,&NsSmartDeviceLinkRPC::Marshaller::mSpeak_response},
-      {""}, {""}, {""},
-#line 40 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"Alert_request",22,&NsSmartDeviceLinkRPC::Marshaller::mAlert_request},
-#line 41 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"Alert_response",23,&NsSmartDeviceLinkRPC::Marshaller::mAlert_response},
-      {""},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"DeleteCommand_request",10,&NsSmartDeviceLinkRPC::Marshaller::mDeleteCommand_request},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"DeleteCommand_response",11,&NsSmartDeviceLinkRPC::Marshaller::mDeleteCommand_response},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"AddSubMenu_request",12,&NsSmartDeviceLinkRPC::Marshaller::mAddSubMenu_request},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"AddSubMenu_response",13,&NsSmartDeviceLinkRPC::Marshaller::mAddSubMenu_response},
-      {""}, {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"SetGlobalProperties_request",4,&NsSmartDeviceLinkRPC::Marshaller::mSetGlobalProperties_request},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"SetGlobalProperties_response",5,&NsSmartDeviceLinkRPC::Marshaller::mSetGlobalProperties_response},
-#line 55 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"OnHMIStatus_notification",37,&NsSmartDeviceLinkRPC::Marshaller::mOnHMIStatus},
-      {""},
-#line 36 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"PerformInteraction_request",18,&NsSmartDeviceLinkRPC::Marshaller::mPerformInteraction_request},
-#line 37 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"PerformInteraction_response",19,&NsSmartDeviceLinkRPC::Marshaller::mPerformInteraction_response},
-#line 43 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"Show_response",25,&NsSmartDeviceLinkRPC::Marshaller::mShow_response},
-#line 38 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"DeleteInteractionChoiceSet_request",20,&NsSmartDeviceLinkRPC::Marshaller::mDeleteInteractionChoiceSet_request},
-#line 39 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"DeleteInteractionChoiceSet_response",21,&NsSmartDeviceLinkRPC::Marshaller::mDeleteInteractionChoiceSet_response},
-#line 60 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"OnEncodedSyncPData_notification",42,&NsSmartDeviceLinkRPC::Marshaller::mOnEncodedSyncPData},
-#line 62 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"OnDriverDistraction_notification",44,&NsSmartDeviceLinkRPC::Marshaller::mOnDriverDistraction},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"AddCommand_request",8,&NsSmartDeviceLinkRPC::Marshaller::mAddCommand_request},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"AddCommand_response",9,&NsSmartDeviceLinkRPC::Marshaller::mAddCommand_response},
-      {""},
-#line 58 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"OnButtonPress_notification",40,&NsSmartDeviceLinkRPC::Marshaller::mOnButtonPress},
-#line 59 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"OnCommand_notification",41,&NsSmartDeviceLinkRPC::Marshaller::mOnCommand},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"RegisterAppInterface_request",0,&NsSmartDeviceLinkRPC::Marshaller::mRegisterAppInterface_request},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"RegisterAppInterface_response",1,&NsSmartDeviceLinkRPC::Marshaller::mRegisterAppInterface_response},
-      {""},
-#line 46 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"SetMediaClockTimer_request",28,&NsSmartDeviceLinkRPC::Marshaller::mSetMediaClockTimer_request},
-#line 47 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"SetMediaClockTimer_response",29,&NsSmartDeviceLinkRPC::Marshaller::mSetMediaClockTimer_response},
-      {""},
-#line 61 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"OnTBTClientState_notification",43,&NsSmartDeviceLinkRPC::Marshaller::mOnTBTClientState},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"UnregisterAppInterface_request",2,&NsSmartDeviceLinkRPC::Marshaller::mUnregisterAppInterface_request},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"UnregisterAppInterface_response",3,&NsSmartDeviceLinkRPC::Marshaller::mUnregisterAppInterface_response},
-      {""}, {""},
-#line 56 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"OnAppInterfaceUnregistered_notification",38,&NsSmartDeviceLinkRPC::Marshaller::mOnAppInterfaceUnregistered},
-#line 52 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"UnsubscribeButton_request",34,&NsSmartDeviceLinkRPC::Marshaller::mUnsubscribeButton_request},
-#line 53 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"UnsubscribeButton_response",35,&NsSmartDeviceLinkRPC::Marshaller::mUnsubscribeButton_response},
-      {""}, {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"ResetGlobalProperties_request",6,&NsSmartDeviceLinkRPC::Marshaller::mResetGlobalProperties_request},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"ResetGlobalProperties_response",7,&NsSmartDeviceLinkRPC::Marshaller::mResetGlobalProperties_response},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"DeleteSubMenu_request",14,&NsSmartDeviceLinkRPC::Marshaller::mDeleteSubMenu_request},
-#line 33 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"DeleteSubMenu_response",15,&NsSmartDeviceLinkRPC::Marshaller::mDeleteSubMenu_response},
-      {""},
-#line 48 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"EncodedSyncPData_request",30,&NsSmartDeviceLinkRPC::Marshaller::mEncodedSyncPData_request},
-#line 49 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"EncodedSyncPData_response",31,&NsSmartDeviceLinkRPC::Marshaller::mEncodedSyncPData_response},
-#line 57 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"OnButtonEvent_notification",39,&NsSmartDeviceLinkRPC::Marshaller::mOnButtonEvent},
-      {""}, {""},
-#line 34 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"CreateInteractionChoiceSet_request",16,&NsSmartDeviceLinkRPC::Marshaller::mCreateInteractionChoiceSet_request},
-#line 35 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"CreateInteractionChoiceSet_response",17,&NsSmartDeviceLinkRPC::Marshaller::mCreateInteractionChoiceSet_response},
-      {""}, {""},
-#line 50 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"SubscribeButton_request",32,&NsSmartDeviceLinkRPC::Marshaller::mSubscribeButton_request},
-#line 51 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"SubscribeButton_response",33,&NsSmartDeviceLinkRPC::Marshaller::mSubscribeButton_response},
-      {""}, {""}, {""}, {""},
-#line 54 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Marshaller.gp"
-      {"GenericResponse_response",36,&NsSmartDeviceLinkRPC::Marshaller::mGenericResponse_response}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.cpp
deleted file mode 100644
index d3a80afa7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/MediaClockFormat.h"
-#include "MediaClockFormatMarshaller.h"
-#include "MediaClockFormatMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const MediaClockFormat::MediaClockFormatInternal MediaClockFormatMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return MediaClockFormat::INVALID_ENUM;
-  const struct PerfectHashTable* p=MediaClockFormat_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<MediaClockFormat::MediaClockFormatInternal>(p->idx) : MediaClockFormat::INVALID_ENUM;
-}
-
-
-bool MediaClockFormatMarshaller::fromJSON(const Json::Value& s,MediaClockFormat& e)
-{
-  e.mInternal=MediaClockFormat::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=MediaClockFormat::INVALID_ENUM);
-}
-
-
-Json::Value MediaClockFormatMarshaller::toJSON(const MediaClockFormat& e)
-{
-  if(e.mInternal==MediaClockFormat::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool MediaClockFormatMarshaller::fromString(const std::string& s,MediaClockFormat& e)
-{
-  e.mInternal=MediaClockFormat::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string MediaClockFormatMarshaller::toString(const MediaClockFormat& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==MediaClockFormat::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable MediaClockFormatMarshaller::mHashTable[5]=
-{
-  {"CLOCK1",0},
-  {"CLOCK2",1},
-  {"CLOCKTEXT1",2},
-  {"CLOCKTEXT2",3},
-  {"CLOCKTEXT3",4}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.gp
deleted file mode 100644
index 3b13495cd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.gp
+++ /dev/null
@@ -1,21 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name MediaClockFormat_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-CLOCK1,0
-CLOCK2,1
-CLOCKTEXT1,2
-CLOCKTEXT2,3
-CLOCKTEXT3,4
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.h
deleted file mode 100644
index bc5bfea77..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_MEDIACLOCKFORMATMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_MEDIACLOCKFORMATMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/MediaClockFormat.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for MediaClockFormat
-
-  class MediaClockFormatMarshaller
-  {
-  public:
-  
-    static std::string toName(const MediaClockFormat& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(MediaClockFormat& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=MediaClockFormat::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(MediaClockFormat& e)		{ return e.mInternal!=MediaClockFormat::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const MediaClockFormat& e)	{ return e.mInternal!=MediaClockFormat::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,MediaClockFormat& e);
-    static const std::string toString(const MediaClockFormat& e);
-  
-    static bool fromJSON(const Json::Value& s,MediaClockFormat& e);
-    static Json::Value toJSON(const MediaClockFormat& e);
-  
-    static const char* getName(MediaClockFormat::MediaClockFormatInternal e)
-    {
-       return (e>=0 && e<5) ? mHashTable[e].name : NULL;
-    }
-  
-    static const MediaClockFormat::MediaClockFormatInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[5];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.inc
deleted file mode 100644
index 926a346db..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.inc
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.gp  */
-/* Computed positions: -k'$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 5
-#define MIN_WORD_LENGTH 6
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 15
-/* maximum key range = 10, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPC {
-
-class MediaClockFormat_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-MediaClockFormat_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16,  5,
-       0,  2, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16
-    };
-  return len + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-MediaClockFormat_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  6,  0,  0,  0, 10,  6, 10,  0,
-       0, 10
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.gp"
-      {"CLOCK2",1},
-      {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.gp"
-      {"CLOCKTEXT2",3},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.gp"
-      {"CLOCK1",0},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.gp"
-      {"CLOCKTEXT3",4},
-      {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MediaClockFormatMarshaller.gp"
-      {"CLOCKTEXT1",2}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MenuParams.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MenuParams.cpp
deleted file mode 100644
index ce0169fc2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MenuParams.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/MenuParams.h"
-#include "MenuParamsMarshaller.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPC;
-
-MenuParams& MenuParams::operator =(const MenuParams& c)
-{
-  menuName=c.menuName;
-  parentID=c.parentID ? new unsigned int(c.parentID[0]) : 0;
-  position=c.position ? new unsigned int(c.position[0]) : 0;
-
-  return *this;
-}
-
-
-MenuParams::~MenuParams(void)
-{
-  if(parentID)
-    delete parentID;
-  if(position)
-    delete position;
-}
-
-
-MenuParams::MenuParams(const MenuParams& c)
-{
-  *this=c;
-}
-
-
-bool MenuParams::checkIntegrity(void)
-{
-  return MenuParamsMarshaller::checkIntegrity(*this);
-}
-
-
-MenuParams::MenuParams(void) :
-    parentID(0),
-    position(0)
-{
-}
-
-
-
-bool MenuParams::set_menuName(const std::string& menuName_)
-{
-  if(menuName_.length()>500)  return false;
-  menuName=menuName_;
-  return true;
-}
-
-bool MenuParams::set_parentID(unsigned int parentID_)
-{
-  if(parentID_>2000000000)  return false;
-  delete parentID;
-  parentID=0;
-
-  parentID=new unsigned int(parentID_);
-  return true;
-}
-
-void MenuParams::reset_parentID(void)
-{
-  if(parentID)
-    delete parentID;
-  parentID=0;
-}
-
-bool MenuParams::set_position(unsigned int position_)
-{
-  if(position_>1000)  return false;
-  delete position;
-  position=0;
-
-  position=new unsigned int(position_);
-  return true;
-}
-
-void MenuParams::reset_position(void)
-{
-  if(position)
-    delete position;
-  position=0;
-}
-
-
-
-
-const std::string& MenuParams::get_menuName(void) const 
-{
-  return menuName;
-}
-
-
-const unsigned int* MenuParams::get_parentID(void) const 
-{
-  return parentID;
-}
-
-
-const unsigned int* MenuParams::get_position(void) const 
-{
-  return position;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MenuParamsMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MenuParamsMarshaller.cpp
deleted file mode 100644
index d90f153f4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MenuParamsMarshaller.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/MenuParams.h"
-
-
-#include "MenuParamsMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool MenuParamsMarshaller::checkIntegrity(MenuParams& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool MenuParamsMarshaller::fromString(const std::string& s,MenuParams& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string MenuParamsMarshaller::toString(const MenuParams& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool MenuParamsMarshaller::checkIntegrityConst(const MenuParams& s)
-{
-  if(s.menuName.length()>500)  return false;
-  if(s.parentID && *s.parentID>2000000000)  return false;
-  if(s.position && *s.position>1000)  return false;
-  return true;
-}
-
-Json::Value MenuParamsMarshaller::toJSON(const MenuParams& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["menuName"]=Json::Value(e.menuName);
-
-  if(e.parentID)
-    json["parentID"]=Json::Value(*e.parentID);
-
-  if(e.position)
-    json["position"]=Json::Value(*e.position);
-
-
-  return json;
-}
-
-
-bool MenuParamsMarshaller::fromJSON(const Json::Value& json,MenuParams& c)
-{
-  if(c.parentID)  delete c.parentID;
-  c.parentID=0;
-
-  if(c.position)  delete c.position;
-  c.position=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("menuName"))  return false;
-    {
-      const Json::Value& j=json["menuName"];
-      if(!j.isString())  return false;
-      c.menuName=j.asString();
-    }
-    if(json.isMember("parentID"))
-    {
-      const Json::Value& j=json["parentID"];
-      if(!j.isInt())  return false;
-      c.parentID=new unsigned int(j.asInt());
-    }
-    if(json.isMember("position"))
-    {
-      const Json::Value& j=json["position"];
-      if(!j.isInt())  return false;
-      c.position=new unsigned int(j.asInt());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MenuParamsMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MenuParamsMarshaller.h
deleted file mode 100644
index 4a1f85169..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/MenuParamsMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_MENUPARAMSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_MENUPARAMSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/MenuParams.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct MenuParamsMarshaller
-  {
-    static bool checkIntegrity(MenuParams& e);
-    static bool checkIntegrityConst(const MenuParams& e);
-  
-    static bool fromString(const std::string& s,MenuParams& e);
-    static const std::string toString(const MenuParams& e);
-  
-    static bool fromJSON(const Json::Value& s,MenuParams& e);
-    static Json::Value toJSON(const MenuParams& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnAppInterfaceUnregistered.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnAppInterfaceUnregistered.cpp
deleted file mode 100644
index b426003ef..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnAppInterfaceUnregistered.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnAppInterfaceUnregistered.h"
-#include "OnAppInterfaceUnregisteredMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "AppInterfaceUnregisteredReasonMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-OnAppInterfaceUnregistered::~OnAppInterfaceUnregistered(void)
-{
-}
-
-
-OnAppInterfaceUnregistered::OnAppInterfaceUnregistered(const OnAppInterfaceUnregistered& c)
-{
-  *this=c;
-}
-
-
-bool OnAppInterfaceUnregistered::checkIntegrity(void)
-{
-  return OnAppInterfaceUnregisteredMarshaller::checkIntegrity(*this);
-}
-
-
-OnAppInterfaceUnregistered::OnAppInterfaceUnregistered(void) : SDLRPCNotification(PROTOCOL_VERSION,Marshaller::METHOD_ONAPPINTERFACEUNREGISTERED)
-{
-}
-
-
-
-bool OnAppInterfaceUnregistered::set_reason(const AppInterfaceUnregisteredReason& reason_)
-{
-  if(!AppInterfaceUnregisteredReasonMarshaller::checkIntegrityConst(reason_))   return false;
-  reason=reason_;
-  return true;
-}
-
-
-
-
-const AppInterfaceUnregisteredReason& OnAppInterfaceUnregistered::get_reason(void) const 
-{
-  return reason;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnAppInterfaceUnregisteredMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnAppInterfaceUnregisteredMarshaller.cpp
deleted file mode 100644
index 1241d1a37..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnAppInterfaceUnregisteredMarshaller.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnAppInterfaceUnregistered.h"
-#include "AppInterfaceUnregisteredReasonMarshaller.h"
-
-#include "OnAppInterfaceUnregisteredMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool OnAppInterfaceUnregisteredMarshaller::checkIntegrity(OnAppInterfaceUnregistered& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnAppInterfaceUnregisteredMarshaller::fromString(const std::string& s,OnAppInterfaceUnregistered& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnAppInterfaceUnregisteredMarshaller::toString(const OnAppInterfaceUnregistered& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnAppInterfaceUnregisteredMarshaller::checkIntegrityConst(const OnAppInterfaceUnregistered& s)
-{
-  if(!AppInterfaceUnregisteredReasonMarshaller::checkIntegrityConst(s.reason))  return false;
-  return true;
-}
-
-Json::Value OnAppInterfaceUnregisteredMarshaller::toJSON(const OnAppInterfaceUnregistered& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["notification"]=Json::Value(Json::objectValue);
-  json["notification"]["name"]=Json::Value("OnAppInterfaceUnregistered");
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["reason"]=AppInterfaceUnregisteredReasonMarshaller::toJSON(e.reason);
-
-  json["notification"]["parameters"]=j;
-  return json;
-}
-
-
-bool OnAppInterfaceUnregisteredMarshaller::fromJSON(const Json::Value& js,OnAppInterfaceUnregistered& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("notification"))  return false;
-
-    if(!js["notification"].isObject())  return false;
-    const Json::Value& j2=js["notification"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("OnAppInterfaceUnregistered"))  return false;
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("reason"))  return false;
-    {
-      const Json::Value& j=json["reason"];
-      if(!AppInterfaceUnregisteredReasonMarshaller::fromJSON(j,c.reason))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnAppInterfaceUnregisteredMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnAppInterfaceUnregisteredMarshaller.h
deleted file mode 100644
index 1be620084..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnAppInterfaceUnregisteredMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ONAPPINTERFACEUNREGISTEREDMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ONAPPINTERFACEUNREGISTEREDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnAppInterfaceUnregistered.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct OnAppInterfaceUnregisteredMarshaller
-  {
-    static bool checkIntegrity(OnAppInterfaceUnregistered& e);
-    static bool checkIntegrityConst(const OnAppInterfaceUnregistered& e);
-  
-    static bool fromString(const std::string& s,OnAppInterfaceUnregistered& e);
-    static const std::string toString(const OnAppInterfaceUnregistered& e);
-  
-    static bool fromJSON(const Json::Value& s,OnAppInterfaceUnregistered& e);
-    static Json::Value toJSON(const OnAppInterfaceUnregistered& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonEvent.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonEvent.cpp
deleted file mode 100644
index eabaeec79..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonEvent.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnButtonEvent.h"
-#include "OnButtonEventMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "ButtonEventModeMarshaller.h"
-#include "ButtonNameMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-OnButtonEvent::~OnButtonEvent(void)
-{
-}
-
-
-OnButtonEvent::OnButtonEvent(const OnButtonEvent& c)
-{
-  *this=c;
-}
-
-
-bool OnButtonEvent::checkIntegrity(void)
-{
-  return OnButtonEventMarshaller::checkIntegrity(*this);
-}
-
-
-OnButtonEvent::OnButtonEvent(void) : SDLRPCNotification(PROTOCOL_VERSION,Marshaller::METHOD_ONBUTTONEVENT)
-{
-}
-
-
-
-bool OnButtonEvent::set_buttonName(const ButtonName& buttonName_)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(buttonName_))   return false;
-  buttonName=buttonName_;
-  return true;
-}
-
-bool OnButtonEvent::set_buttonEventMode(const ButtonEventMode& buttonEventMode_)
-{
-  if(!ButtonEventModeMarshaller::checkIntegrityConst(buttonEventMode_))   return false;
-  buttonEventMode=buttonEventMode_;
-  return true;
-}
-
-
-
-
-const ButtonName& OnButtonEvent::get_buttonName(void) const 
-{
-  return buttonName;
-}
-
-const ButtonEventMode& OnButtonEvent::get_buttonEventMode(void) const 
-{
-  return buttonEventMode;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonEventMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonEventMarshaller.cpp
deleted file mode 100644
index 4f2bd6e42..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonEventMarshaller.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnButtonEvent.h"
-#include "ButtonEventModeMarshaller.h"
-#include "ButtonNameMarshaller.h"
-
-#include "OnButtonEventMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool OnButtonEventMarshaller::checkIntegrity(OnButtonEvent& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnButtonEventMarshaller::fromString(const std::string& s,OnButtonEvent& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnButtonEventMarshaller::toString(const OnButtonEvent& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnButtonEventMarshaller::checkIntegrityConst(const OnButtonEvent& s)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(s.buttonName))  return false;
-  if(!ButtonEventModeMarshaller::checkIntegrityConst(s.buttonEventMode))  return false;
-  return true;
-}
-
-Json::Value OnButtonEventMarshaller::toJSON(const OnButtonEvent& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["notification"]=Json::Value(Json::objectValue);
-  json["notification"]["name"]=Json::Value("OnButtonEvent");
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["buttonName"]=ButtonNameMarshaller::toJSON(e.buttonName);
-
-  j["buttonEventMode"]=ButtonEventModeMarshaller::toJSON(e.buttonEventMode);
-
-  json["notification"]["parameters"]=j;
-  return json;
-}
-
-
-bool OnButtonEventMarshaller::fromJSON(const Json::Value& js,OnButtonEvent& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("notification"))  return false;
-
-    if(!js["notification"].isObject())  return false;
-    const Json::Value& j2=js["notification"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("OnButtonEvent"))  return false;
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("buttonName"))  return false;
-    {
-      const Json::Value& j=json["buttonName"];
-      if(!ButtonNameMarshaller::fromJSON(j,c.buttonName))
-        return false;
-    }
-    if(!json.isMember("buttonEventMode"))  return false;
-    {
-      const Json::Value& j=json["buttonEventMode"];
-      if(!ButtonEventModeMarshaller::fromJSON(j,c.buttonEventMode))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonEventMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonEventMarshaller.h
deleted file mode 100644
index a58d1e2cc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonEventMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ONBUTTONEVENTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ONBUTTONEVENTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnButtonEvent.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct OnButtonEventMarshaller
-  {
-    static bool checkIntegrity(OnButtonEvent& e);
-    static bool checkIntegrityConst(const OnButtonEvent& e);
-  
-    static bool fromString(const std::string& s,OnButtonEvent& e);
-    static const std::string toString(const OnButtonEvent& e);
-  
-    static bool fromJSON(const Json::Value& s,OnButtonEvent& e);
-    static Json::Value toJSON(const OnButtonEvent& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonPress.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonPress.cpp
deleted file mode 100644
index 7db8e1354..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonPress.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnButtonPress.h"
-#include "OnButtonPressMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "ButtonNameMarshaller.h"
-#include "ButtonPressModeMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-OnButtonPress::~OnButtonPress(void)
-{
-}
-
-
-OnButtonPress::OnButtonPress(const OnButtonPress& c)
-{
-  *this=c;
-}
-
-
-bool OnButtonPress::checkIntegrity(void)
-{
-  return OnButtonPressMarshaller::checkIntegrity(*this);
-}
-
-
-OnButtonPress::OnButtonPress(void) : SDLRPCNotification(PROTOCOL_VERSION,Marshaller::METHOD_ONBUTTONPRESS)
-{
-}
-
-
-
-bool OnButtonPress::set_buttonName(const ButtonName& buttonName_)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(buttonName_))   return false;
-  buttonName=buttonName_;
-  return true;
-}
-
-bool OnButtonPress::set_buttonPressMode(const ButtonPressMode& buttonPressMode_)
-{
-  if(!ButtonPressModeMarshaller::checkIntegrityConst(buttonPressMode_))   return false;
-  buttonPressMode=buttonPressMode_;
-  return true;
-}
-
-
-
-
-const ButtonName& OnButtonPress::get_buttonName(void) const 
-{
-  return buttonName;
-}
-
-const ButtonPressMode& OnButtonPress::get_buttonPressMode(void) const 
-{
-  return buttonPressMode;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonPressMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonPressMarshaller.cpp
deleted file mode 100644
index a46515328..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonPressMarshaller.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnButtonPress.h"
-#include "ButtonNameMarshaller.h"
-#include "ButtonPressModeMarshaller.h"
-
-#include "OnButtonPressMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool OnButtonPressMarshaller::checkIntegrity(OnButtonPress& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnButtonPressMarshaller::fromString(const std::string& s,OnButtonPress& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnButtonPressMarshaller::toString(const OnButtonPress& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnButtonPressMarshaller::checkIntegrityConst(const OnButtonPress& s)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(s.buttonName))  return false;
-  if(!ButtonPressModeMarshaller::checkIntegrityConst(s.buttonPressMode))  return false;
-  return true;
-}
-
-Json::Value OnButtonPressMarshaller::toJSON(const OnButtonPress& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["notification"]=Json::Value(Json::objectValue);
-  json["notification"]["name"]=Json::Value("OnButtonPress");
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["buttonName"]=ButtonNameMarshaller::toJSON(e.buttonName);
-
-  j["buttonPressMode"]=ButtonPressModeMarshaller::toJSON(e.buttonPressMode);
-
-  json["notification"]["parameters"]=j;
-  return json;
-}
-
-
-bool OnButtonPressMarshaller::fromJSON(const Json::Value& js,OnButtonPress& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("notification"))  return false;
-
-    if(!js["notification"].isObject())  return false;
-    const Json::Value& j2=js["notification"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("OnButtonPress"))  return false;
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("buttonName"))  return false;
-    {
-      const Json::Value& j=json["buttonName"];
-      if(!ButtonNameMarshaller::fromJSON(j,c.buttonName))
-        return false;
-    }
-    if(!json.isMember("buttonPressMode"))  return false;
-    {
-      const Json::Value& j=json["buttonPressMode"];
-      if(!ButtonPressModeMarshaller::fromJSON(j,c.buttonPressMode))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonPressMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonPressMarshaller.h
deleted file mode 100644
index 766cd8c3e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnButtonPressMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ONBUTTONPRESSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ONBUTTONPRESSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnButtonPress.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct OnButtonPressMarshaller
-  {
-    static bool checkIntegrity(OnButtonPress& e);
-    static bool checkIntegrityConst(const OnButtonPress& e);
-  
-    static bool fromString(const std::string& s,OnButtonPress& e);
-    static const std::string toString(const OnButtonPress& e);
-  
-    static bool fromJSON(const Json::Value& s,OnButtonPress& e);
-    static Json::Value toJSON(const OnButtonPress& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnCommand.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnCommand.cpp
deleted file mode 100644
index 650f9b108..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnCommand.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnCommand.h"
-#include "OnCommandMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "TriggerSourceMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-OnCommand::~OnCommand(void)
-{
-}
-
-
-OnCommand::OnCommand(const OnCommand& c)
-{
-  *this=c;
-}
-
-
-bool OnCommand::checkIntegrity(void)
-{
-  return OnCommandMarshaller::checkIntegrity(*this);
-}
-
-
-OnCommand::OnCommand(void) : SDLRPCNotification(PROTOCOL_VERSION,Marshaller::METHOD_ONCOMMAND)
-{
-}
-
-
-
-bool OnCommand::set_cmdID(unsigned int cmdID_)
-{
-  if(cmdID_>2000000000)  return false;
-  cmdID=cmdID_;
-  return true;
-}
-
-bool OnCommand::set_triggerSource(const TriggerSource& triggerSource_)
-{
-  if(!TriggerSourceMarshaller::checkIntegrityConst(triggerSource_))   return false;
-  triggerSource=triggerSource_;
-  return true;
-}
-
-
-
-
-unsigned int OnCommand::get_cmdID(void) const
-{
-  return cmdID;
-}
-
-const TriggerSource& OnCommand::get_triggerSource(void) const 
-{
-  return triggerSource;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnCommandMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnCommandMarshaller.cpp
deleted file mode 100644
index 83bac74cc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnCommandMarshaller.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnCommand.h"
-#include "TriggerSourceMarshaller.h"
-
-#include "OnCommandMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool OnCommandMarshaller::checkIntegrity(OnCommand& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnCommandMarshaller::fromString(const std::string& s,OnCommand& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnCommandMarshaller::toString(const OnCommand& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnCommandMarshaller::checkIntegrityConst(const OnCommand& s)
-{
-  if(s.cmdID>2000000000)  return false;
-  if(!TriggerSourceMarshaller::checkIntegrityConst(s.triggerSource))  return false;
-  return true;
-}
-
-Json::Value OnCommandMarshaller::toJSON(const OnCommand& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["notification"]=Json::Value(Json::objectValue);
-  json["notification"]["name"]=Json::Value("OnCommand");
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["cmdID"]=Json::Value(e.cmdID);
-
-  j["triggerSource"]=TriggerSourceMarshaller::toJSON(e.triggerSource);
-
-  json["notification"]["parameters"]=j;
-  return json;
-}
-
-
-bool OnCommandMarshaller::fromJSON(const Json::Value& js,OnCommand& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("notification"))  return false;
-
-    if(!js["notification"].isObject())  return false;
-    const Json::Value& j2=js["notification"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("OnCommand"))  return false;
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("cmdID"))  return false;
-    {
-      const Json::Value& j=json["cmdID"];
-      if(!j.isInt())  return false;
-      c.cmdID=j.asInt();
-    }
-    if(!json.isMember("triggerSource"))  return false;
-    {
-      const Json::Value& j=json["triggerSource"];
-      if(!TriggerSourceMarshaller::fromJSON(j,c.triggerSource))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnCommandMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnCommandMarshaller.h
deleted file mode 100644
index f39f9d2e8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnCommandMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ONCOMMANDMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ONCOMMANDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnCommand.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct OnCommandMarshaller
-  {
-    static bool checkIntegrity(OnCommand& e);
-    static bool checkIntegrityConst(const OnCommand& e);
-  
-    static bool fromString(const std::string& s,OnCommand& e);
-    static const std::string toString(const OnCommand& e);
-  
-    static bool fromJSON(const Json::Value& s,OnCommand& e);
-    static Json::Value toJSON(const OnCommand& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnDriverDistraction.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnDriverDistraction.cpp
deleted file mode 100644
index 3db16b972..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnDriverDistraction.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnDriverDistraction.h"
-#include "OnDriverDistractionMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "DriverDistractionStateMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-OnDriverDistraction::~OnDriverDistraction(void)
-{
-}
-
-
-OnDriverDistraction::OnDriverDistraction(const OnDriverDistraction& c)
-{
-  *this=c;
-}
-
-
-bool OnDriverDistraction::checkIntegrity(void)
-{
-  return OnDriverDistractionMarshaller::checkIntegrity(*this);
-}
-
-
-OnDriverDistraction::OnDriverDistraction(void) : SDLRPCNotification(PROTOCOL_VERSION,Marshaller::METHOD_ONDRIVERDISTRACTION)
-{
-}
-
-
-
-bool OnDriverDistraction::set_state(const DriverDistractionState& state_)
-{
-  if(!DriverDistractionStateMarshaller::checkIntegrityConst(state_))   return false;
-  state=state_;
-  return true;
-}
-
-
-
-
-const DriverDistractionState& OnDriverDistraction::get_state(void) const 
-{
-  return state;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnDriverDistractionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnDriverDistractionMarshaller.cpp
deleted file mode 100644
index eb3602be5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnDriverDistractionMarshaller.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnDriverDistraction.h"
-#include "DriverDistractionStateMarshaller.h"
-
-#include "OnDriverDistractionMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool OnDriverDistractionMarshaller::checkIntegrity(OnDriverDistraction& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnDriverDistractionMarshaller::fromString(const std::string& s,OnDriverDistraction& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnDriverDistractionMarshaller::toString(const OnDriverDistraction& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnDriverDistractionMarshaller::checkIntegrityConst(const OnDriverDistraction& s)
-{
-  if(!DriverDistractionStateMarshaller::checkIntegrityConst(s.state))  return false;
-  return true;
-}
-
-Json::Value OnDriverDistractionMarshaller::toJSON(const OnDriverDistraction& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["notification"]=Json::Value(Json::objectValue);
-  json["notification"]["name"]=Json::Value("OnDriverDistraction");
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["state"]=DriverDistractionStateMarshaller::toJSON(e.state);
-
-  json["notification"]["parameters"]=j;
-  return json;
-}
-
-
-bool OnDriverDistractionMarshaller::fromJSON(const Json::Value& js,OnDriverDistraction& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("notification"))  return false;
-
-    if(!js["notification"].isObject())  return false;
-    const Json::Value& j2=js["notification"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("OnDriverDistraction"))  return false;
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("state"))  return false;
-    {
-      const Json::Value& j=json["state"];
-      if(!DriverDistractionStateMarshaller::fromJSON(j,c.state))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnDriverDistractionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnDriverDistractionMarshaller.h
deleted file mode 100644
index 5fac52c56..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnDriverDistractionMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ONDRIVERDISTRACTIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ONDRIVERDISTRACTIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnDriverDistraction.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct OnDriverDistractionMarshaller
-  {
-    static bool checkIntegrity(OnDriverDistraction& e);
-    static bool checkIntegrityConst(const OnDriverDistraction& e);
-  
-    static bool fromString(const std::string& s,OnDriverDistraction& e);
-    static const std::string toString(const OnDriverDistraction& e);
-  
-    static bool fromJSON(const Json::Value& s,OnDriverDistraction& e);
-    static Json::Value toJSON(const OnDriverDistraction& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnEncodedSyncPData.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnEncodedSyncPData.cpp
deleted file mode 100644
index 68614ffaa..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnEncodedSyncPData.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnEncodedSyncPData.h"
-#include "OnEncodedSyncPDataMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-OnEncodedSyncPData& OnEncodedSyncPData::operator =(const OnEncodedSyncPData& c)
-{
-  data= c.data ? new std::vector<std::string>(c.data[0]) : 0;
-
-  return *this;}
-
-
-OnEncodedSyncPData::~OnEncodedSyncPData(void)
-{
-  if(data)
-    delete data;
-}
-
-
-OnEncodedSyncPData::OnEncodedSyncPData(const OnEncodedSyncPData& c)
-{
-  *this=c;
-}
-
-
-bool OnEncodedSyncPData::checkIntegrity(void)
-{
-  return OnEncodedSyncPDataMarshaller::checkIntegrity(*this);
-}
-
-
-OnEncodedSyncPData::OnEncodedSyncPData(void) : SDLRPCNotification(PROTOCOL_VERSION,Marshaller::METHOD_ONENCODEDSYNCPDATA),
-      data(0)
-{
-}
-
-
-
-bool OnEncodedSyncPData::set_data(const std::vector<std::string>& data_)
-{
-  unsigned int i=data_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(data_[i].length()>10000)  return false;
-  }
-  delete data;
-  data=0;
-
-  data=new std::vector<std::string>(data_);
-  return true;
-}
-
-void OnEncodedSyncPData::reset_data(void)
-{
-  if(data)
-    delete data;
-  data=0;
-}
-
-
-
-
-const std::vector<std::string>* OnEncodedSyncPData::get_data(void) const 
-{
-  return data;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnEncodedSyncPDataMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnEncodedSyncPDataMarshaller.cpp
deleted file mode 100644
index f8a7fc097..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnEncodedSyncPDataMarshaller.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnEncodedSyncPData.h"
-
-
-#include "OnEncodedSyncPDataMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool OnEncodedSyncPDataMarshaller::checkIntegrity(OnEncodedSyncPData& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnEncodedSyncPDataMarshaller::fromString(const std::string& s,OnEncodedSyncPData& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnEncodedSyncPDataMarshaller::toString(const OnEncodedSyncPData& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnEncodedSyncPDataMarshaller::checkIntegrityConst(const OnEncodedSyncPData& s)
-{
-  if(s.data)
-  {
-    unsigned int i=s.data[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.data[0][i].length()>10000)  return false;
-    }
-  }
-  return true;
-}
-
-Json::Value OnEncodedSyncPDataMarshaller::toJSON(const OnEncodedSyncPData& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["notification"]=Json::Value(Json::objectValue);
-  json["notification"]["name"]=Json::Value("OnEncodedSyncPData");
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  if(e.data)
-  {
-    unsigned int sz=e.data->size();
-    j["data"]=Json::Value(Json::arrayValue);
-    j["data"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["data"][i]=Json::Value(e.data[0][i]);
-  }
-
-  json["notification"]["parameters"]=j;
-  return json;
-}
-
-
-bool OnEncodedSyncPDataMarshaller::fromJSON(const Json::Value& js,OnEncodedSyncPData& c)
-{
-  if(c.data)  delete c.data;
-  c.data=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("notification"))  return false;
-
-    if(!js["notification"].isObject())  return false;
-    const Json::Value& j2=js["notification"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("OnEncodedSyncPData"))  return false;
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(json.isMember("data"))
-    {
-      const Json::Value& j=json["data"];
-      if(!j.isArray())  return false;
-      c.data=new std::vector<std::string>();
-      c.data->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.data[0][i]=j[i].asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnEncodedSyncPDataMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnEncodedSyncPDataMarshaller.h
deleted file mode 100644
index a06aa4ccf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnEncodedSyncPDataMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ONENCODEDSYNCPDATAMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ONENCODEDSYNCPDATAMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnEncodedSyncPData.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct OnEncodedSyncPDataMarshaller
-  {
-    static bool checkIntegrity(OnEncodedSyncPData& e);
-    static bool checkIntegrityConst(const OnEncodedSyncPData& e);
-  
-    static bool fromString(const std::string& s,OnEncodedSyncPData& e);
-    static const std::string toString(const OnEncodedSyncPData& e);
-  
-    static bool fromJSON(const Json::Value& s,OnEncodedSyncPData& e);
-    static Json::Value toJSON(const OnEncodedSyncPData& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnHMIStatus.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnHMIStatus.cpp
deleted file mode 100644
index 0c723c517..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnHMIStatus.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnHMIStatus.h"
-#include "OnHMIStatusMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "AudioStreamingStateMarshaller.h"
-#include "HMILevelMarshaller.h"
-#include "SystemContextMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-OnHMIStatus::~OnHMIStatus(void)
-{
-}
-
-
-OnHMIStatus::OnHMIStatus(const OnHMIStatus& c)
-{
-  *this=c;
-}
-
-
-bool OnHMIStatus::checkIntegrity(void)
-{
-  return OnHMIStatusMarshaller::checkIntegrity(*this);
-}
-
-
-OnHMIStatus::OnHMIStatus(void) : SDLRPCNotification(PROTOCOL_VERSION,Marshaller::METHOD_ONHMISTATUS)
-{
-}
-
-
-
-bool OnHMIStatus::set_hmiLevel(const HMILevel& hmiLevel_)
-{
-  if(!HMILevelMarshaller::checkIntegrityConst(hmiLevel_))   return false;
-  hmiLevel=hmiLevel_;
-  return true;
-}
-
-bool OnHMIStatus::set_audioStreamingState(const AudioStreamingState& audioStreamingState_)
-{
-  if(!AudioStreamingStateMarshaller::checkIntegrityConst(audioStreamingState_))   return false;
-  audioStreamingState=audioStreamingState_;
-  return true;
-}
-
-bool OnHMIStatus::set_systemContext(const SystemContext& systemContext_)
-{
-  if(!SystemContextMarshaller::checkIntegrityConst(systemContext_))   return false;
-  systemContext=systemContext_;
-  return true;
-}
-
-
-
-
-const HMILevel& OnHMIStatus::get_hmiLevel(void) const 
-{
-  return hmiLevel;
-}
-
-const AudioStreamingState& OnHMIStatus::get_audioStreamingState(void) const 
-{
-  return audioStreamingState;
-}
-
-const SystemContext& OnHMIStatus::get_systemContext(void) const 
-{
-  return systemContext;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnHMIStatusMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnHMIStatusMarshaller.cpp
deleted file mode 100644
index d8cbe828e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnHMIStatusMarshaller.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnHMIStatus.h"
-#include "AudioStreamingStateMarshaller.h"
-#include "HMILevelMarshaller.h"
-#include "SystemContextMarshaller.h"
-
-#include "OnHMIStatusMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool OnHMIStatusMarshaller::checkIntegrity(OnHMIStatus& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnHMIStatusMarshaller::fromString(const std::string& s,OnHMIStatus& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnHMIStatusMarshaller::toString(const OnHMIStatus& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnHMIStatusMarshaller::checkIntegrityConst(const OnHMIStatus& s)
-{
-  if(!HMILevelMarshaller::checkIntegrityConst(s.hmiLevel))  return false;
-  if(!AudioStreamingStateMarshaller::checkIntegrityConst(s.audioStreamingState))  return false;
-  if(!SystemContextMarshaller::checkIntegrityConst(s.systemContext))  return false;
-  return true;
-}
-
-Json::Value OnHMIStatusMarshaller::toJSON(const OnHMIStatus& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["notification"]=Json::Value(Json::objectValue);
-  json["notification"]["name"]=Json::Value("OnHMIStatus");
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["hmiLevel"]=HMILevelMarshaller::toJSON(e.hmiLevel);
-
-  j["audioStreamingState"]=AudioStreamingStateMarshaller::toJSON(e.audioStreamingState);
-
-  j["systemContext"]=SystemContextMarshaller::toJSON(e.systemContext);
-
-  json["notification"]["parameters"]=j;
-  return json;
-}
-
-
-bool OnHMIStatusMarshaller::fromJSON(const Json::Value& js,OnHMIStatus& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("notification"))  return false;
-
-    if(!js["notification"].isObject())  return false;
-    const Json::Value& j2=js["notification"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("OnHMIStatus"))  return false;
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("hmiLevel"))  return false;
-    {
-      const Json::Value& j=json["hmiLevel"];
-      if(!HMILevelMarshaller::fromJSON(j,c.hmiLevel))
-        return false;
-    }
-    if(!json.isMember("audioStreamingState"))  return false;
-    {
-      const Json::Value& j=json["audioStreamingState"];
-      if(!AudioStreamingStateMarshaller::fromJSON(j,c.audioStreamingState))
-        return false;
-    }
-    if(!json.isMember("systemContext"))  return false;
-    {
-      const Json::Value& j=json["systemContext"];
-      if(!SystemContextMarshaller::fromJSON(j,c.systemContext))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnHMIStatusMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnHMIStatusMarshaller.h
deleted file mode 100644
index 3eae53291..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnHMIStatusMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ONHMISTATUSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ONHMISTATUSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnHMIStatus.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct OnHMIStatusMarshaller
-  {
-    static bool checkIntegrity(OnHMIStatus& e);
-    static bool checkIntegrityConst(const OnHMIStatus& e);
-  
-    static bool fromString(const std::string& s,OnHMIStatus& e);
-    static const std::string toString(const OnHMIStatus& e);
-  
-    static bool fromJSON(const Json::Value& s,OnHMIStatus& e);
-    static Json::Value toJSON(const OnHMIStatus& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnTBTClientState.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnTBTClientState.cpp
deleted file mode 100644
index 63e1a38b7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnTBTClientState.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnTBTClientState.h"
-#include "OnTBTClientStateMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "TBTStateMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-OnTBTClientState::~OnTBTClientState(void)
-{
-}
-
-
-OnTBTClientState::OnTBTClientState(const OnTBTClientState& c)
-{
-  *this=c;
-}
-
-
-bool OnTBTClientState::checkIntegrity(void)
-{
-  return OnTBTClientStateMarshaller::checkIntegrity(*this);
-}
-
-
-OnTBTClientState::OnTBTClientState(void) : SDLRPCNotification(PROTOCOL_VERSION,Marshaller::METHOD_ONTBTCLIENTSTATE)
-{
-}
-
-
-
-bool OnTBTClientState::set_state(const TBTState& state_)
-{
-  if(!TBTStateMarshaller::checkIntegrityConst(state_))   return false;
-  state=state_;
-  return true;
-}
-
-
-
-
-const TBTState& OnTBTClientState::get_state(void) const 
-{
-  return state;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnTBTClientStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnTBTClientStateMarshaller.cpp
deleted file mode 100644
index 2bb137a3c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnTBTClientStateMarshaller.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnTBTClientState.h"
-#include "TBTStateMarshaller.h"
-
-#include "OnTBTClientStateMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool OnTBTClientStateMarshaller::checkIntegrity(OnTBTClientState& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnTBTClientStateMarshaller::fromString(const std::string& s,OnTBTClientState& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnTBTClientStateMarshaller::toString(const OnTBTClientState& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnTBTClientStateMarshaller::checkIntegrityConst(const OnTBTClientState& s)
-{
-  if(!TBTStateMarshaller::checkIntegrityConst(s.state))  return false;
-  return true;
-}
-
-Json::Value OnTBTClientStateMarshaller::toJSON(const OnTBTClientState& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["notification"]=Json::Value(Json::objectValue);
-  json["notification"]["name"]=Json::Value("OnTBTClientState");
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["state"]=TBTStateMarshaller::toJSON(e.state);
-
-  json["notification"]["parameters"]=j;
-  return json;
-}
-
-
-bool OnTBTClientStateMarshaller::fromJSON(const Json::Value& js,OnTBTClientState& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("notification"))  return false;
-
-    if(!js["notification"].isObject())  return false;
-    const Json::Value& j2=js["notification"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("OnTBTClientState"))  return false;
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("state"))  return false;
-    {
-      const Json::Value& j=json["state"];
-      if(!TBTStateMarshaller::fromJSON(j,c.state))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnTBTClientStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnTBTClientStateMarshaller.h
deleted file mode 100644
index bae0c0461..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/OnTBTClientStateMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_ONTBTCLIENTSTATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_ONTBTCLIENTSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/OnTBTClientState.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct OnTBTClientStateMarshaller
-  {
-    static bool checkIntegrity(OnTBTClientState& e);
-    static bool checkIntegrityConst(const OnTBTClientState& e);
-  
-    static bool fromString(const std::string& s,OnTBTClientState& e);
-    static const std::string toString(const OnTBTClientState& e);
-  
-    static bool fromJSON(const Json::Value& s,OnTBTClientState& e);
-    static Json::Value toJSON(const OnTBTClientState& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerfectHashTable.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerfectHashTable.h
deleted file mode 100644
index d0da6d495..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerfectHashTable.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef PERFECTHASHTABLE_INCLUDE
-#define PERFECTHASHTABLE_INCLUDE
-
-namespace NsSmartDeviceLinkRPC
-{
-  struct PerfectHashTable
-  {
-    const char *name;
-    unsigned int idx;
-  };
-}
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_request.cpp
deleted file mode 100644
index 95249b10f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_request.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_request.h"
-#include "PerformInteraction_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "InteractionModeMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-PerformInteraction_request& PerformInteraction_request::operator =(const PerformInteraction_request& c)
-{
-  initialText= c.initialText;
-  initialPrompt= c.initialPrompt;
-  interactionMode= c.interactionMode;
-  interactionChoiceSetIDList= c.interactionChoiceSetIDList;
-  helpPrompt= c.helpPrompt ? new std::vector<TTSChunk>(c.helpPrompt[0]) : 0;
-  timeoutPrompt= c.timeoutPrompt ? new std::vector<TTSChunk>(c.timeoutPrompt[0]) : 0;
-  timeout= c.timeout ? new unsigned int(c.timeout[0]) : 0;
-
-  return *this;}
-
-
-PerformInteraction_request::~PerformInteraction_request(void)
-{
-  if(helpPrompt)
-    delete helpPrompt;
-  if(timeoutPrompt)
-    delete timeoutPrompt;
-  if(timeout)
-    delete timeout;
-}
-
-
-PerformInteraction_request::PerformInteraction_request(const PerformInteraction_request& c)
-{
-  *this=c;
-}
-
-
-bool PerformInteraction_request::checkIntegrity(void)
-{
-  return PerformInteraction_requestMarshaller::checkIntegrity(*this);
-}
-
-
-PerformInteraction_request::PerformInteraction_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_PERFORMINTERACTION_REQUEST),
-      helpPrompt(0),
-    timeoutPrompt(0),
-    timeout(0)
-{
-}
-
-
-
-bool PerformInteraction_request::set_initialText(const std::string& initialText_)
-{
-  if(initialText_.length()>500)  return false;
-  initialText=initialText_;
-  return true;
-}
-
-bool PerformInteraction_request::set_initialPrompt(const std::vector<TTSChunk>& initialPrompt_)
-{
-  unsigned int i=initialPrompt_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(initialPrompt_[i]))   return false;
-  }
-  initialPrompt=initialPrompt_;
-  return true;
-}
-
-bool PerformInteraction_request::set_interactionMode(const InteractionMode& interactionMode_)
-{
-  if(!InteractionModeMarshaller::checkIntegrityConst(interactionMode_))   return false;
-  interactionMode=interactionMode_;
-  return true;
-}
-
-bool PerformInteraction_request::set_interactionChoiceSetIDList(const std::vector<unsigned int>& interactionChoiceSetIDList_)
-{
-  unsigned int i=interactionChoiceSetIDList_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(interactionChoiceSetIDList_[i]>2000000000)  return false;
-  }
-  interactionChoiceSetIDList=interactionChoiceSetIDList_;
-  return true;
-}
-
-bool PerformInteraction_request::set_helpPrompt(const std::vector<TTSChunk>& helpPrompt_)
-{
-  unsigned int i=helpPrompt_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(helpPrompt_[i]))   return false;
-  }
-  delete helpPrompt;
-  helpPrompt=0;
-
-  helpPrompt=new std::vector<TTSChunk>(helpPrompt_);
-  return true;
-}
-
-void PerformInteraction_request::reset_helpPrompt(void)
-{
-  if(helpPrompt)
-    delete helpPrompt;
-  helpPrompt=0;
-}
-
-bool PerformInteraction_request::set_timeoutPrompt(const std::vector<TTSChunk>& timeoutPrompt_)
-{
-  unsigned int i=timeoutPrompt_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(timeoutPrompt_[i]))   return false;
-  }
-  delete timeoutPrompt;
-  timeoutPrompt=0;
-
-  timeoutPrompt=new std::vector<TTSChunk>(timeoutPrompt_);
-  return true;
-}
-
-void PerformInteraction_request::reset_timeoutPrompt(void)
-{
-  if(timeoutPrompt)
-    delete timeoutPrompt;
-  timeoutPrompt=0;
-}
-
-bool PerformInteraction_request::set_timeout(unsigned int timeout_)
-{
-  if(timeout_>100000)  return false;
-  if(timeout_<5000)  return false;
-  delete timeout;
-  timeout=0;
-
-  timeout=new unsigned int(timeout_);
-  return true;
-}
-
-void PerformInteraction_request::reset_timeout(void)
-{
-  if(timeout)
-    delete timeout;
-  timeout=0;
-}
-
-
-
-
-const std::string& PerformInteraction_request::get_initialText(void) const 
-{
-  return initialText;
-}
-
-const std::vector<TTSChunk>& PerformInteraction_request::get_initialPrompt(void) const 
-{
-  return initialPrompt;
-}
-
-const InteractionMode& PerformInteraction_request::get_interactionMode(void) const 
-{
-  return interactionMode;
-}
-
-const std::vector<unsigned int>& PerformInteraction_request::get_interactionChoiceSetIDList(void) const 
-{
-  return interactionChoiceSetIDList;
-}
-
-const std::vector<TTSChunk>* PerformInteraction_request::get_helpPrompt(void) const 
-{
-  return helpPrompt;
-}
-
-const std::vector<TTSChunk>* PerformInteraction_request::get_timeoutPrompt(void) const 
-{
-  return timeoutPrompt;
-}
-
-const unsigned int* PerformInteraction_request::get_timeout(void) const 
-{
-  return timeout;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_requestMarshaller.cpp
deleted file mode 100644
index a5d8b86ce..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_requestMarshaller.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_request.h"
-#include "InteractionModeMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#include "PerformInteraction_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool PerformInteraction_requestMarshaller::checkIntegrity(PerformInteraction_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PerformInteraction_requestMarshaller::fromString(const std::string& s,PerformInteraction_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PerformInteraction_requestMarshaller::toString(const PerformInteraction_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformInteraction_requestMarshaller::checkIntegrityConst(const PerformInteraction_request& s)
-{
-  if(s.initialText.length()>500)  return false;
-  {
-    unsigned int i=s.initialPrompt.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.initialPrompt[i]))   return false;
-    }
-  }
-  if(!InteractionModeMarshaller::checkIntegrityConst(s.interactionMode))  return false;
-  {
-    unsigned int i=s.interactionChoiceSetIDList.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.interactionChoiceSetIDList[i]>2000000000)  return false;
-    }
-  }
-  if(s.helpPrompt)
-  {
-    unsigned int i=s.helpPrompt[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.helpPrompt[0][i]))   return false;
-    }
-  }
-  if(s.timeoutPrompt)
-  {
-    unsigned int i=s.timeoutPrompt[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.timeoutPrompt[0][i]))   return false;
-    }
-  }
-  if(s.timeout && *s.timeout>100000)  return false;
-  if(s.timeout && *s.timeout<5000)  return false;
-  return true;
-}
-
-Json::Value PerformInteraction_requestMarshaller::toJSON(const PerformInteraction_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("PerformInteraction");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["initialText"]=Json::Value(e.initialText);
-
-  j["initialPrompt"]=Json::Value(Json::arrayValue);
-  j["initialPrompt"].resize(e.initialPrompt.size());
-  for(unsigned int i=0;i<e.initialPrompt.size();i++)
-    j["initialPrompt"][i]=TTSChunkMarshaller::toJSON(e.initialPrompt[i]);
-
-  j["interactionMode"]=InteractionModeMarshaller::toJSON(e.interactionMode);
-
-  j["interactionChoiceSetIDList"]=Json::Value(Json::arrayValue);
-  j["interactionChoiceSetIDList"].resize(e.interactionChoiceSetIDList.size());
-  for(unsigned int i=0;i<e.interactionChoiceSetIDList.size();i++)
-    j["interactionChoiceSetIDList"][i]=Json::Value(e.interactionChoiceSetIDList[i]);
-
-  if(e.helpPrompt)
-  {
-    unsigned int sz=e.helpPrompt->size();
-    j["helpPrompt"]=Json::Value(Json::arrayValue);
-    j["helpPrompt"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["helpPrompt"][i]=TTSChunkMarshaller::toJSON(e.helpPrompt[0][i]);
-  }
-
-  if(e.timeoutPrompt)
-  {
-    unsigned int sz=e.timeoutPrompt->size();
-    j["timeoutPrompt"]=Json::Value(Json::arrayValue);
-    j["timeoutPrompt"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["timeoutPrompt"][i]=TTSChunkMarshaller::toJSON(e.timeoutPrompt[0][i]);
-  }
-
-  if(e.timeout)
-    j["timeout"]=Json::Value(*e.timeout);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool PerformInteraction_requestMarshaller::fromJSON(const Json::Value& js,PerformInteraction_request& c)
-{
-  if(c.helpPrompt)  delete c.helpPrompt;
-  c.helpPrompt=0;
-
-  if(c.timeoutPrompt)  delete c.timeoutPrompt;
-  c.timeoutPrompt=0;
-
-  if(c.timeout)  delete c.timeout;
-  c.timeout=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("PerformInteraction"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("initialText"))  return false;
-    {
-      const Json::Value& j=json["initialText"];
-      if(!j.isString())  return false;
-      c.initialText=j.asString();
-    }
-    if(!json.isMember("initialPrompt"))  return false;
-    {
-      const Json::Value& j=json["initialPrompt"];
-      if(!j.isArray())  return false;
-      c.initialPrompt.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          TTSChunk t;
-          if(!TTSChunkMarshaller::fromJSON(j[i],t))
-            return false;
-          c.initialPrompt[i]=t;
-        }
-
-    }
-    if(!json.isMember("interactionMode"))  return false;
-    {
-      const Json::Value& j=json["interactionMode"];
-      if(!InteractionModeMarshaller::fromJSON(j,c.interactionMode))
-        return false;
-    }
-    if(!json.isMember("interactionChoiceSetIDList"))  return false;
-    {
-      const Json::Value& j=json["interactionChoiceSetIDList"];
-      if(!j.isArray())  return false;
-      c.interactionChoiceSetIDList.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isInt())
-          return false;
-        else
-          c.interactionChoiceSetIDList[i]=j[i].asInt();
-    }
-    if(json.isMember("helpPrompt"))
-    {
-      const Json::Value& j=json["helpPrompt"];
-      if(!j.isArray())  return false;
-      c.helpPrompt=new std::vector<TTSChunk>();
-      c.helpPrompt->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        TTSChunk t;
-        if(!TTSChunkMarshaller::fromJSON(j[i],t))
-          return false;
-        c.helpPrompt[0][i]=t;
-      }
-
-    }
-    if(json.isMember("timeoutPrompt"))
-    {
-      const Json::Value& j=json["timeoutPrompt"];
-      if(!j.isArray())  return false;
-      c.timeoutPrompt=new std::vector<TTSChunk>();
-      c.timeoutPrompt->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        TTSChunk t;
-        if(!TTSChunkMarshaller::fromJSON(j[i],t))
-          return false;
-        c.timeoutPrompt[0][i]=t;
-      }
-
-    }
-    if(json.isMember("timeout"))
-    {
-      const Json::Value& j=json["timeout"];
-      if(!j.isInt())  return false;
-      c.timeout=new unsigned int(j.asInt());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_requestMarshaller.h
deleted file mode 100644
index 2eebc438f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_PERFORMINTERACTION_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_PERFORMINTERACTION_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct PerformInteraction_requestMarshaller
-  {
-    static bool checkIntegrity(PerformInteraction_request& e);
-    static bool checkIntegrityConst(const PerformInteraction_request& e);
-  
-    static bool fromString(const std::string& s,PerformInteraction_request& e);
-    static const std::string toString(const PerformInteraction_request& e);
-  
-    static bool fromJSON(const Json::Value& s,PerformInteraction_request& e);
-    static Json::Value toJSON(const PerformInteraction_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_response.cpp
deleted file mode 100644
index 22bbc055c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_response.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_response.h"
-#include "PerformInteraction_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "TriggerSourceMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-PerformInteraction_response& PerformInteraction_response::operator =(const PerformInteraction_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-    choiceID = c.choiceID ? new unsigned int(c.choiceID[0]) : 0;
-    triggerSource = c.triggerSource ? new TriggerSource(c.triggerSource[0]) : 0;
-
-    return *this;
-}
-
-PerformInteraction_response::~PerformInteraction_response(void)
-{
-    if (choiceID)
-    {
-        delete choiceID;
-    }
-    if (triggerSource)
-    {
-        delete triggerSource;
-    }
-}
-
-PerformInteraction_response::PerformInteraction_response(const PerformInteraction_response& c)
-{
-    *this = c;
-}
-
-bool PerformInteraction_response::checkIntegrity(void)
-{
-    return PerformInteraction_responseMarshaller::checkIntegrity(*this);
-}
-
-PerformInteraction_response::PerformInteraction_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_PERFORMINTERACTION_RESPONSE),
-    choiceID(0),
-    triggerSource(0)
-{}
-
-bool PerformInteraction_response::set_choiceID(unsigned int choiceID_)
-{
-    if (choiceID_ > 2000000000)
-    {
-        return false;
-    }
-    delete choiceID;
-    choiceID = 0;
-
-    choiceID = new unsigned int(choiceID_);
-    return true;
-}
-
-void PerformInteraction_response::reset_choiceID(void)
-{
-    if (choiceID)
-    {
-        delete choiceID;
-    }
-    choiceID = 0;
-}
-
-bool PerformInteraction_response::set_triggerSource(const TriggerSource& triggerSource_)
-{
-    if (!TriggerSourceMarshaller::checkIntegrityConst(triggerSource_))
-    {
-        return false;
-    }
-    delete triggerSource;
-    triggerSource = 0;
-
-    triggerSource = new TriggerSource(triggerSource_);
-    return true;
-}
-
-void PerformInteraction_response::reset_triggerSource(void)
-{
-    if (triggerSource)
-    {
-        delete triggerSource;
-    }
-    triggerSource = 0;
-}
-
-const unsigned int* PerformInteraction_response::get_choiceID(void) const
-{
-    return choiceID;
-}
-
-const TriggerSource* PerformInteraction_response::get_triggerSource(void) const
-{
-    return triggerSource;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_responseMarshaller.cpp
deleted file mode 100644
index 332809b77..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_responseMarshaller.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_response.h"
-#include "ResultMarshaller.h"
-#include "TriggerSourceMarshaller.h"
-
-#include "PerformInteraction_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool PerformInteraction_responseMarshaller::checkIntegrity(PerformInteraction_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PerformInteraction_responseMarshaller::fromString(const std::string& s,PerformInteraction_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PerformInteraction_responseMarshaller::toString(const PerformInteraction_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformInteraction_responseMarshaller::checkIntegrityConst(const PerformInteraction_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  if(s.choiceID && *s.choiceID>2000000000)  return false;
-  if(s.triggerSource && !TriggerSourceMarshaller::checkIntegrityConst(*s.triggerSource))  return false;
-  return true;
-}
-
-Json::Value PerformInteraction_responseMarshaller::toJSON(const PerformInteraction_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("PerformInteraction");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  if(e.choiceID)
-    j["choiceID"]=Json::Value(*e.choiceID);
-
-  if(e.triggerSource)
-    j["triggerSource"]=TriggerSourceMarshaller::toJSON(*e.triggerSource);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool PerformInteraction_responseMarshaller::fromJSON(const Json::Value& js,PerformInteraction_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  if(c.choiceID)  delete c.choiceID;
-  c.choiceID=0;
-
-  if(c.triggerSource)  delete c.triggerSource;
-  c.triggerSource=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("PerformInteraction"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-    if(json.isMember("choiceID"))
-    {
-      const Json::Value& j=json["choiceID"];
-      if(!j.isInt())  return false;
-      c.choiceID=new unsigned int(j.asInt());
-    }
-    if(json.isMember("triggerSource"))
-    {
-      const Json::Value& j=json["triggerSource"];
-      c.triggerSource=new TriggerSource();
-      if(!TriggerSourceMarshaller::fromJSON(j,c.triggerSource[0]))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_responseMarshaller.h
deleted file mode 100644
index 54f3517fc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/PerformInteraction_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_PERFORMINTERACTION_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_PERFORMINTERACTION_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/PerformInteraction_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct PerformInteraction_responseMarshaller
-  {
-    static bool checkIntegrity(PerformInteraction_response& e);
-    static bool checkIntegrityConst(const PerformInteraction_response& e);
-  
-    static bool fromString(const std::string& s,PerformInteraction_response& e);
-    static const std::string toString(const PerformInteraction_response& e);
-  
-    static bool fromJSON(const Json::Value& s,PerformInteraction_response& e);
-    static Json::Value toJSON(const PerformInteraction_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_request.cpp
deleted file mode 100644
index 4ac0d7981..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_request.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_request.h"
-#include "RegisterAppInterface_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "LanguageMarshaller.h"
-#include "SyncMsgVersionMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-RegisterAppInterface_request& RegisterAppInterface_request::operator =(const RegisterAppInterface_request& c)
-{
-  syncMsgVersion= c.syncMsgVersion;
-  appName= c.appName;
-  ngnMediaScreenAppName= c.ngnMediaScreenAppName ? new std::string(c.ngnMediaScreenAppName[0]) : 0;
-  vrSynonyms= c.vrSynonyms ? new std::vector<std::string>(c.vrSynonyms[0]) : 0;
-  usesVehicleData= c.usesVehicleData ? new bool(c.usesVehicleData[0]) : 0;
-  isMediaApplication= c.isMediaApplication;
-  languageDesired= c.languageDesired;
-  autoActivateID= c.autoActivateID ? new std::string(c.autoActivateID[0]) : 0;
-
-  return *this;}
-
-
-RegisterAppInterface_request::~RegisterAppInterface_request(void)
-{
-  if(ngnMediaScreenAppName)
-    delete ngnMediaScreenAppName;
-  if(vrSynonyms)
-    delete vrSynonyms;
-  if(usesVehicleData)
-    delete usesVehicleData;
-  if(autoActivateID)
-    delete autoActivateID;
-}
-
-
-RegisterAppInterface_request::RegisterAppInterface_request(const RegisterAppInterface_request& c)
-{
-  *this=c;
-}
-
-
-bool RegisterAppInterface_request::checkIntegrity(void)
-{
-  return RegisterAppInterface_requestMarshaller::checkIntegrity(*this);
-}
-
-
-RegisterAppInterface_request::RegisterAppInterface_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_REGISTERAPPINTERFACE_REQUEST),
-      ngnMediaScreenAppName(0),
-    vrSynonyms(0),
-    usesVehicleData(0),
-    autoActivateID(0)
-{
-}
-
-
-
-bool RegisterAppInterface_request::set_syncMsgVersion(const SyncMsgVersion& syncMsgVersion_)
-{
-  if(!SyncMsgVersionMarshaller::checkIntegrityConst(syncMsgVersion_))   return false;
-  syncMsgVersion=syncMsgVersion_;
-  return true;
-}
-
-bool RegisterAppInterface_request::set_appName(const std::string& appName_)
-{
-  if(appName_.length()>100)  return false;
-  appName=appName_;
-  return true;
-}
-
-bool RegisterAppInterface_request::set_ngnMediaScreenAppName(const std::string& ngnMediaScreenAppName_)
-{
-  if(ngnMediaScreenAppName_.length()>100)  return false;
-  delete ngnMediaScreenAppName;
-  ngnMediaScreenAppName=0;
-
-  ngnMediaScreenAppName=new std::string(ngnMediaScreenAppName_);
-  return true;
-}
-
-void RegisterAppInterface_request::reset_ngnMediaScreenAppName(void)
-{
-  if(ngnMediaScreenAppName)
-    delete ngnMediaScreenAppName;
-  ngnMediaScreenAppName=0;
-}
-
-bool RegisterAppInterface_request::set_vrSynonyms(const std::vector<std::string>& vrSynonyms_)
-{
-  unsigned int i=vrSynonyms_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(vrSynonyms_[i].length()>40)  return false;
-  }
-  delete vrSynonyms;
-  vrSynonyms=0;
-
-  vrSynonyms=new std::vector<std::string>(vrSynonyms_);
-  return true;
-}
-
-void RegisterAppInterface_request::reset_vrSynonyms(void)
-{
-  if(vrSynonyms)
-    delete vrSynonyms;
-  vrSynonyms=0;
-}
-
-bool RegisterAppInterface_request::set_usesVehicleData(bool usesVehicleData_)
-{
-  delete usesVehicleData;
-  usesVehicleData=0;
-
-  usesVehicleData=new bool(usesVehicleData_);
-  return true;
-}
-
-void RegisterAppInterface_request::reset_usesVehicleData(void)
-{
-  if(usesVehicleData)
-    delete usesVehicleData;
-  usesVehicleData=0;
-}
-
-bool RegisterAppInterface_request::set_isMediaApplication(bool isMediaApplication_)
-{
-  isMediaApplication=isMediaApplication_;
-  return true;
-}
-
-bool RegisterAppInterface_request::set_languageDesired(const Language& languageDesired_)
-{
-  if(!LanguageMarshaller::checkIntegrityConst(languageDesired_))   return false;
-  languageDesired=languageDesired_;
-  return true;
-}
-
-bool RegisterAppInterface_request::set_autoActivateID(const std::string& autoActivateID_)
-{
-  if(autoActivateID_.length()>16)  return false;
-  delete autoActivateID;
-  autoActivateID=0;
-
-  autoActivateID=new std::string(autoActivateID_);
-  return true;
-}
-
-void RegisterAppInterface_request::reset_autoActivateID(void)
-{
-  if(autoActivateID)
-    delete autoActivateID;
-  autoActivateID=0;
-}
-
-
-
-
-const SyncMsgVersion& RegisterAppInterface_request::get_syncMsgVersion(void) const 
-{
-  return syncMsgVersion;
-}
-
-const std::string& RegisterAppInterface_request::get_appName(void) const 
-{
-  return appName;
-}
-
-const std::string* RegisterAppInterface_request::get_ngnMediaScreenAppName(void) const 
-{
-  return ngnMediaScreenAppName;
-}
-
-const std::vector<std::string>* RegisterAppInterface_request::get_vrSynonyms(void) const 
-{
-  return vrSynonyms;
-}
-
-const bool* RegisterAppInterface_request::get_usesVehicleData(void) const 
-{
-  return usesVehicleData;
-}
-
-bool RegisterAppInterface_request::get_isMediaApplication(void) const
-{
-  return isMediaApplication;
-}
-
-const Language& RegisterAppInterface_request::get_languageDesired(void) const 
-{
-  return languageDesired;
-}
-
-const std::string* RegisterAppInterface_request::get_autoActivateID(void) const 
-{
-  return autoActivateID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_requestMarshaller.cpp
deleted file mode 100644
index bcfcb0df6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_requestMarshaller.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_request.h"
-#include "LanguageMarshaller.h"
-#include "SyncMsgVersionMarshaller.h"
-
-#include "RegisterAppInterface_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool RegisterAppInterface_requestMarshaller::checkIntegrity(RegisterAppInterface_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool RegisterAppInterface_requestMarshaller::fromString(const std::string& s,RegisterAppInterface_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string RegisterAppInterface_requestMarshaller::toString(const RegisterAppInterface_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool RegisterAppInterface_requestMarshaller::checkIntegrityConst(const RegisterAppInterface_request& s)
-{
-  if(!SyncMsgVersionMarshaller::checkIntegrityConst(s.syncMsgVersion))  return false;
-  if(s.appName.length()>100)  return false;
-  if(s.ngnMediaScreenAppName && s.ngnMediaScreenAppName->length()>100)  return false;
-  if(s.vrSynonyms)
-  {
-    unsigned int i=s.vrSynonyms[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.vrSynonyms[0][i].length()>40)  return false;
-    }
-  }
-  if(!LanguageMarshaller::checkIntegrityConst(s.languageDesired))  return false;
-  if(s.autoActivateID && s.autoActivateID->length()>16)  return false;
-  return true;
-}
-
-Json::Value RegisterAppInterface_requestMarshaller::toJSON(const RegisterAppInterface_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("RegisterAppInterface");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["syncMsgVersion"]=SyncMsgVersionMarshaller::toJSON(e.syncMsgVersion);
-
-  j["appName"]=Json::Value(e.appName);
-
-  if(e.ngnMediaScreenAppName)
-    j["ngnMediaScreenAppName"]=Json::Value(*e.ngnMediaScreenAppName);
-
-  if(e.vrSynonyms)
-  {
-    unsigned int sz=e.vrSynonyms->size();
-    j["vrSynonyms"]=Json::Value(Json::arrayValue);
-    j["vrSynonyms"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["vrSynonyms"][i]=Json::Value(e.vrSynonyms[0][i]);
-  }
-
-  if(e.usesVehicleData)
-    j["usesVehicleData"]=Json::Value(*e.usesVehicleData);
-
-  j["isMediaApplication"]=Json::Value(e.isMediaApplication);
-
-  j["languageDesired"]=LanguageMarshaller::toJSON(e.languageDesired);
-
-  if(e.autoActivateID)
-    j["autoActivateID"]=Json::Value(*e.autoActivateID);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool RegisterAppInterface_requestMarshaller::fromJSON(const Json::Value& js,RegisterAppInterface_request& c)
-{
-  if(c.ngnMediaScreenAppName)  delete c.ngnMediaScreenAppName;
-  c.ngnMediaScreenAppName=0;
-
-  if(c.vrSynonyms)  delete c.vrSynonyms;
-  c.vrSynonyms=0;
-
-  if(c.usesVehicleData)  delete c.usesVehicleData;
-  c.usesVehicleData=0;
-
-  if(c.autoActivateID)  delete c.autoActivateID;
-  c.autoActivateID=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("RegisterAppInterface"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("syncMsgVersion"))  return false;
-    {
-      const Json::Value& j=json["syncMsgVersion"];
-      if(!SyncMsgVersionMarshaller::fromJSON(j,c.syncMsgVersion))
-        return false;
-    }
-    if(!json.isMember("appName"))  return false;
-    {
-      const Json::Value& j=json["appName"];
-      if(!j.isString())  return false;
-      c.appName=j.asString();
-    }
-    if(json.isMember("ngnMediaScreenAppName"))
-    {
-      const Json::Value& j=json["ngnMediaScreenAppName"];
-      if(!j.isString())  return false;
-      c.ngnMediaScreenAppName=new std::string(j.asString());
-    }
-    if(json.isMember("vrSynonyms"))
-    {
-      const Json::Value& j=json["vrSynonyms"];
-      if(!j.isArray())  return false;
-      c.vrSynonyms=new std::vector<std::string>();
-      c.vrSynonyms->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.vrSynonyms[0][i]=j[i].asString();
-    }
-    if(json.isMember("usesVehicleData"))
-    {
-      const Json::Value& j=json["usesVehicleData"];
-      if(!j.isBool())  return false;
-      c.usesVehicleData=new bool(j.asBool());
-    }
-    if(!json.isMember("isMediaApplication"))  return false;
-    {
-      const Json::Value& j=json["isMediaApplication"];
-      if(!j.isBool())  return false;
-      c.isMediaApplication=j.asBool();
-    }
-    if(!json.isMember("languageDesired"))  return false;
-    {
-      const Json::Value& j=json["languageDesired"];
-      if(!LanguageMarshaller::fromJSON(j,c.languageDesired))
-        return false;
-    }
-    if(json.isMember("autoActivateID"))
-    {
-      const Json::Value& j=json["autoActivateID"];
-      if(!j.isString())  return false;
-      c.autoActivateID=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_requestMarshaller.h
deleted file mode 100644
index 5ec33dfa5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_REGISTERAPPINTERFACE_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_REGISTERAPPINTERFACE_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct RegisterAppInterface_requestMarshaller
-  {
-    static bool checkIntegrity(RegisterAppInterface_request& e);
-    static bool checkIntegrityConst(const RegisterAppInterface_request& e);
-  
-    static bool fromString(const std::string& s,RegisterAppInterface_request& e);
-    static const std::string toString(const RegisterAppInterface_request& e);
-  
-    static bool fromJSON(const Json::Value& s,RegisterAppInterface_request& e);
-    static Json::Value toJSON(const RegisterAppInterface_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_response.cpp
deleted file mode 100644
index 0fbf2c2c8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_response.cpp
+++ /dev/null
@@ -1,380 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_response.h"
-#include "RegisterAppInterface_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "ButtonCapabilitiesMarshaller.h"
-#include "DisplayCapabilitiesMarshaller.h"
-#include "HmiZoneCapabilitiesMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "SpeechCapabilitiesMarshaller.h"
-#include "SyncMsgVersionMarshaller.h"
-#include "VrCapabilitiesMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-RegisterAppInterface_response& RegisterAppInterface_response::operator =(const RegisterAppInterface_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-    syncMsgVersion = c.syncMsgVersion ? new SyncMsgVersion(c.syncMsgVersion[0]) : 0;
-    autoActivateID = c.autoActivateID ? new std::string(c.autoActivateID[0]) : 0;
-    language = c.language ? new Language(c.language[0]) : 0;
-    displayCapabilities = c.displayCapabilities ? new DisplayCapabilities(c.displayCapabilities[0]) : 0;
-    buttonCapabilities = c.buttonCapabilities ? new std::vector<ButtonCapabilities>(c.buttonCapabilities[0]) : 0;
-    hmiZoneCapabilities = c.hmiZoneCapabilities ? new std::vector<HmiZoneCapabilities>(c.hmiZoneCapabilities[0]) : 0;
-    speechCapabilities = c.speechCapabilities ? new std::vector<SpeechCapabilities>(c.speechCapabilities[0]) : 0;
-    vrCapabilities = c.vrCapabilities ? new std::vector<VrCapabilities>(c.vrCapabilities[0]) : 0;
-
-    return *this;
-}
-
-RegisterAppInterface_response::~RegisterAppInterface_response(void)
-{
-    if (syncMsgVersion)
-    {
-        delete syncMsgVersion;
-    }
-    if (autoActivateID)
-    {
-        delete autoActivateID;
-    }
-    if (language)
-    {
-        delete language;
-    }
-    if (displayCapabilities)
-    {
-        delete displayCapabilities;
-    }
-    if (buttonCapabilities)
-    {
-        delete buttonCapabilities;
-    }
-    if (hmiZoneCapabilities)
-    {
-        delete hmiZoneCapabilities;
-    }
-    if (speechCapabilities)
-    {
-        delete speechCapabilities;
-    }
-    if (vrCapabilities)
-    {
-        delete vrCapabilities;
-    }
-}
-
-RegisterAppInterface_response::RegisterAppInterface_response(const RegisterAppInterface_response& c)
-{
-    *this = c;
-}
-
-bool RegisterAppInterface_response::checkIntegrity(void)
-{
-    return RegisterAppInterface_responseMarshaller::checkIntegrity(*this);
-}
-
-RegisterAppInterface_response::RegisterAppInterface_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_REGISTERAPPINTERFACE_RESPONSE),
-      syncMsgVersion(0),
-      autoActivateID(0),
-      language(0),
-      displayCapabilities(0),
-      buttonCapabilities(0),
-      hmiZoneCapabilities(0),
-      speechCapabilities(0),
-      vrCapabilities(0)
-{}
-
-bool RegisterAppInterface_response::set_syncMsgVersion(const SyncMsgVersion& syncMsgVersion_)
-{
-    if (!SyncMsgVersionMarshaller::checkIntegrityConst(syncMsgVersion_))
-    {
-        return false;
-    }
-    delete syncMsgVersion;
-    syncMsgVersion = 0;
-
-    syncMsgVersion = new SyncMsgVersion(syncMsgVersion_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_syncMsgVersion(void)
-{
-    if (syncMsgVersion)
-    {
-        delete syncMsgVersion;
-    }
-    syncMsgVersion = 0;
-}
-
-bool RegisterAppInterface_response::set_autoActivateID(const std::string& autoActivateID_)
-{
-    if (autoActivateID_.length() > 16)
-    {
-        return false;
-    }
-    delete autoActivateID;
-    autoActivateID = 0;
-
-    autoActivateID = new std::string(autoActivateID_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_autoActivateID(void)
-{
-    if (autoActivateID)
-    {
-        delete autoActivateID;
-    }
-    autoActivateID = 0;
-}
-
-bool RegisterAppInterface_response::set_language(const Language& language_)
-{
-    if (!LanguageMarshaller::checkIntegrityConst(language_))
-    {
-        return false;
-    }
-    delete language;
-    language = 0;
-
-    language = new Language(language_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_language(void)
-{
-    if (language)
-    {
-        delete language;
-    }
-    language = 0;
-}
-
-bool RegisterAppInterface_response::set_displayCapabilities(const DisplayCapabilities& displayCapabilities_)
-{
-    if (!DisplayCapabilitiesMarshaller::checkIntegrityConst(displayCapabilities_))
-    {
-        return false;
-    }
-    delete displayCapabilities;
-    displayCapabilities = 0;
-
-    displayCapabilities = new DisplayCapabilities(displayCapabilities_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_displayCapabilities(void)
-{
-    if (displayCapabilities)
-    {
-        delete displayCapabilities;
-    }
-    displayCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_buttonCapabilities(const std::vector<ButtonCapabilities>& buttonCapabilities_)
-{
-    unsigned int i = buttonCapabilities_.size();
-    if (i > 100 || i < 1)
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (!ButtonCapabilitiesMarshaller::checkIntegrityConst(buttonCapabilities_[i]))
-        {
-            return false;
-        }
-    }
-    delete buttonCapabilities;
-    buttonCapabilities = 0;
-
-    buttonCapabilities = new std::vector<ButtonCapabilities>(buttonCapabilities_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_buttonCapabilities(void)
-{
-    if (buttonCapabilities)
-    {
-        delete buttonCapabilities;
-    }
-    buttonCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_hmiZoneCapabilities(const std::vector<HmiZoneCapabilities>& hmiZoneCapabilities_)
-{
-    unsigned int i = hmiZoneCapabilities_.size();
-    if (i > 100 || i < 1)
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (!HmiZoneCapabilitiesMarshaller::checkIntegrityConst(hmiZoneCapabilities_[i]))
-        {
-            return false;
-        }
-    }
-    delete hmiZoneCapabilities;
-    hmiZoneCapabilities = 0;
-
-    hmiZoneCapabilities = new std::vector<HmiZoneCapabilities>(hmiZoneCapabilities_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_hmiZoneCapabilities(void)
-{
-    if (hmiZoneCapabilities)
-    {
-        delete hmiZoneCapabilities;
-    }
-    hmiZoneCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_speechCapabilities(const std::vector<SpeechCapabilities>& speechCapabilities_)
-{
-    unsigned int i = speechCapabilities_.size();
-    if (i > 100 || i < 1)
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (!SpeechCapabilitiesMarshaller::checkIntegrityConst(speechCapabilities_[i]))
-        {
-            return false;
-        }
-    }
-    delete speechCapabilities;
-    speechCapabilities = 0;
-
-    speechCapabilities = new std::vector<SpeechCapabilities>(speechCapabilities_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_speechCapabilities(void)
-{
-    if (speechCapabilities)
-    {
-        delete speechCapabilities;
-    }
-    speechCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_vrCapabilities(const std::vector<VrCapabilities>& vrCapabilities_)
-{
-    unsigned int i = vrCapabilities_.size();
-    if (i > 100 || i < 1)
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (!VrCapabilitiesMarshaller::checkIntegrityConst(vrCapabilities_[i]))
-        {
-            return false;
-        }
-    }
-    delete vrCapabilities;
-    vrCapabilities = 0;
-
-    vrCapabilities = new std::vector<VrCapabilities>(vrCapabilities_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_vrCapabilities(void)
-{
-    if (vrCapabilities)
-    {
-        delete vrCapabilities;
-    }
-    vrCapabilities = 0;
-}
-const SyncMsgVersion* RegisterAppInterface_response::get_syncMsgVersion(void) const
-{
-    return syncMsgVersion;
-}
-
-const std::string* RegisterAppInterface_response::get_autoActivateID(void) const
-{
-    return autoActivateID;
-}
-
-const Language* RegisterAppInterface_response::get_language(void) const
-{
-    return language;
-}
-
-const DisplayCapabilities* RegisterAppInterface_response::get_displayCapabilities(void) const
-{
-    return displayCapabilities;
-}
-
-const std::vector<ButtonCapabilities>* RegisterAppInterface_response::get_buttonCapabilities(void) const
-{
-    return buttonCapabilities;
-}
-
-const std::vector<HmiZoneCapabilities>* RegisterAppInterface_response::get_hmiZoneCapabilities(void) const
-{
-    return hmiZoneCapabilities;
-}
-
-const std::vector<SpeechCapabilities>* RegisterAppInterface_response::get_speechCapabilities(void) const
-{
-    return speechCapabilities;
-}
-
-const std::vector<VrCapabilities>* RegisterAppInterface_response::get_vrCapabilities(void) const
-{
-    return vrCapabilities;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_responseMarshaller.cpp
deleted file mode 100644
index 0952fd3b2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_responseMarshaller.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_response.h"
-#include "ButtonCapabilitiesMarshaller.h"
-#include "DisplayCapabilitiesMarshaller.h"
-#include "HmiZoneCapabilitiesMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "ResultMarshaller.h"
-#include "SpeechCapabilitiesMarshaller.h"
-#include "SyncMsgVersionMarshaller.h"
-#include "VrCapabilitiesMarshaller.h"
-
-#include "RegisterAppInterface_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool RegisterAppInterface_responseMarshaller::checkIntegrity(RegisterAppInterface_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool RegisterAppInterface_responseMarshaller::fromString(const std::string& s,RegisterAppInterface_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string RegisterAppInterface_responseMarshaller::toString(const RegisterAppInterface_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool RegisterAppInterface_responseMarshaller::checkIntegrityConst(const RegisterAppInterface_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  if(s.syncMsgVersion && !SyncMsgVersionMarshaller::checkIntegrityConst(*s.syncMsgVersion))  return false;
-  if(s.autoActivateID && s.autoActivateID->length()>16)  return false;
-  if(s.language && !LanguageMarshaller::checkIntegrityConst(*s.language))  return false;
-  if(s.displayCapabilities && !DisplayCapabilitiesMarshaller::checkIntegrityConst(*s.displayCapabilities))  return false;
-  if(s.buttonCapabilities)
-  {
-    unsigned int i=s.buttonCapabilities[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!ButtonCapabilitiesMarshaller::checkIntegrityConst(s.buttonCapabilities[0][i]))   return false;
-    }
-  }
-  if(s.hmiZoneCapabilities)
-  {
-    unsigned int i=s.hmiZoneCapabilities[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!HmiZoneCapabilitiesMarshaller::checkIntegrityConst(s.hmiZoneCapabilities[0][i]))   return false;
-    }
-  }
-  if(s.speechCapabilities)
-  {
-    unsigned int i=s.speechCapabilities[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!SpeechCapabilitiesMarshaller::checkIntegrityConst(s.speechCapabilities[0][i]))   return false;
-    }
-  }
-  if(s.vrCapabilities)
-  {
-    unsigned int i=s.vrCapabilities[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!VrCapabilitiesMarshaller::checkIntegrityConst(s.vrCapabilities[0][i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value RegisterAppInterface_responseMarshaller::toJSON(const RegisterAppInterface_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("RegisterAppInterface");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  if(e.syncMsgVersion)
-    j["syncMsgVersion"]=SyncMsgVersionMarshaller::toJSON(*e.syncMsgVersion);
-
-  if(e.autoActivateID)
-    j["autoActivateID"]=Json::Value(*e.autoActivateID);
-
-  if(e.language)
-    j["language"]=LanguageMarshaller::toJSON(*e.language);
-
-  if(e.displayCapabilities)
-    j["displayCapabilities"]=DisplayCapabilitiesMarshaller::toJSON(*e.displayCapabilities);
-
-  if(e.buttonCapabilities)
-  {
-    unsigned int sz=e.buttonCapabilities->size();
-    j["buttonCapabilities"]=Json::Value(Json::arrayValue);
-    j["buttonCapabilities"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["buttonCapabilities"][i]=ButtonCapabilitiesMarshaller::toJSON(e.buttonCapabilities[0][i]);
-  }
-
-  if(e.hmiZoneCapabilities)
-  {
-    unsigned int sz=e.hmiZoneCapabilities->size();
-    j["hmiZoneCapabilities"]=Json::Value(Json::arrayValue);
-    j["hmiZoneCapabilities"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["hmiZoneCapabilities"][i]=HmiZoneCapabilitiesMarshaller::toJSON(e.hmiZoneCapabilities[0][i]);
-  }
-
-  if(e.speechCapabilities)
-  {
-    unsigned int sz=e.speechCapabilities->size();
-    j["speechCapabilities"]=Json::Value(Json::arrayValue);
-    j["speechCapabilities"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["speechCapabilities"][i]=SpeechCapabilitiesMarshaller::toJSON(e.speechCapabilities[0][i]);
-  }
-
-  if(e.vrCapabilities)
-  {
-    unsigned int sz=e.vrCapabilities->size();
-    j["vrCapabilities"]=Json::Value(Json::arrayValue);
-    j["vrCapabilities"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["vrCapabilities"][i]=VrCapabilitiesMarshaller::toJSON(e.vrCapabilities[0][i]);
-  }
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool RegisterAppInterface_responseMarshaller::fromJSON(const Json::Value& js,RegisterAppInterface_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  if(c.syncMsgVersion)  delete c.syncMsgVersion;
-  c.syncMsgVersion=0;
-
-  if(c.autoActivateID)  delete c.autoActivateID;
-  c.autoActivateID=0;
-
-  if(c.language)  delete c.language;
-  c.language=0;
-
-  if(c.displayCapabilities)  delete c.displayCapabilities;
-  c.displayCapabilities=0;
-
-  if(c.buttonCapabilities)  delete c.buttonCapabilities;
-  c.buttonCapabilities=0;
-
-  if(c.hmiZoneCapabilities)  delete c.hmiZoneCapabilities;
-  c.hmiZoneCapabilities=0;
-
-  if(c.speechCapabilities)  delete c.speechCapabilities;
-  c.speechCapabilities=0;
-
-  if(c.vrCapabilities)  delete c.vrCapabilities;
-  c.vrCapabilities=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("RegisterAppInterface"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-    if(json.isMember("syncMsgVersion"))
-    {
-      const Json::Value& j=json["syncMsgVersion"];
-      c.syncMsgVersion=new SyncMsgVersion();
-      if(!SyncMsgVersionMarshaller::fromJSON(j,c.syncMsgVersion[0]))
-        return false;
-    }
-    if(json.isMember("autoActivateID"))
-    {
-      const Json::Value& j=json["autoActivateID"];
-      if(!j.isString())  return false;
-      c.autoActivateID=new std::string(j.asString());
-    }
-    if(json.isMember("language"))
-    {
-      const Json::Value& j=json["language"];
-      c.language=new Language();
-      if(!LanguageMarshaller::fromJSON(j,c.language[0]))
-        return false;
-    }
-    if(json.isMember("displayCapabilities"))
-    {
-      const Json::Value& j=json["displayCapabilities"];
-      c.displayCapabilities=new DisplayCapabilities();
-      if(!DisplayCapabilitiesMarshaller::fromJSON(j,c.displayCapabilities[0]))
-        return false;
-    }
-    if(json.isMember("buttonCapabilities"))
-    {
-      const Json::Value& j=json["buttonCapabilities"];
-      if(!j.isArray())  return false;
-      c.buttonCapabilities=new std::vector<ButtonCapabilities>();
-      c.buttonCapabilities->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        ButtonCapabilities t;
-        if(!ButtonCapabilitiesMarshaller::fromJSON(j[i],t))
-          return false;
-        c.buttonCapabilities[0][i]=t;
-      }
-
-    }
-    if(json.isMember("hmiZoneCapabilities"))
-    {
-      const Json::Value& j=json["hmiZoneCapabilities"];
-      if(!j.isArray())  return false;
-      c.hmiZoneCapabilities=new std::vector<HmiZoneCapabilities>();
-      c.hmiZoneCapabilities->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        HmiZoneCapabilities t;
-        if(!HmiZoneCapabilitiesMarshaller::fromJSON(j[i],t))
-          return false;
-        c.hmiZoneCapabilities[0][i]=t;
-      }
-
-    }
-    if(json.isMember("speechCapabilities"))
-    {
-      const Json::Value& j=json["speechCapabilities"];
-      if(!j.isArray())  return false;
-      c.speechCapabilities=new std::vector<SpeechCapabilities>();
-      c.speechCapabilities->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        SpeechCapabilities t;
-        if(!SpeechCapabilitiesMarshaller::fromJSON(j[i],t))
-          return false;
-        c.speechCapabilities[0][i]=t;
-      }
-
-    }
-    if(json.isMember("vrCapabilities"))
-    {
-      const Json::Value& j=json["vrCapabilities"];
-      if(!j.isArray())  return false;
-      c.vrCapabilities=new std::vector<VrCapabilities>();
-      c.vrCapabilities->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        VrCapabilities t;
-        if(!VrCapabilitiesMarshaller::fromJSON(j[i],t))
-          return false;
-        c.vrCapabilities[0][i]=t;
-      }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_responseMarshaller.h
deleted file mode 100644
index b6ad563a4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/RegisterAppInterface_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_REGISTERAPPINTERFACE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_REGISTERAPPINTERFACE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/RegisterAppInterface_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct RegisterAppInterface_responseMarshaller
-  {
-    static bool checkIntegrity(RegisterAppInterface_response& e);
-    static bool checkIntegrityConst(const RegisterAppInterface_response& e);
-  
-    static bool fromString(const std::string& s,RegisterAppInterface_response& e);
-    static const std::string toString(const RegisterAppInterface_response& e);
-  
-    static bool fromJSON(const Json::Value& s,RegisterAppInterface_response& e);
-    static Json::Value toJSON(const RegisterAppInterface_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_request.cpp
deleted file mode 100644
index f0e346407..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_request.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_request.h"
-#include "ResetGlobalProperties_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "GlobalPropertyMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-ResetGlobalProperties_request::~ResetGlobalProperties_request(void)
-{
-}
-
-
-ResetGlobalProperties_request::ResetGlobalProperties_request(const ResetGlobalProperties_request& c)
-{
-  *this=c;
-}
-
-
-bool ResetGlobalProperties_request::checkIntegrity(void)
-{
-  return ResetGlobalProperties_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ResetGlobalProperties_request::ResetGlobalProperties_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_RESETGLOBALPROPERTIES_REQUEST)
-{
-}
-
-
-
-bool ResetGlobalProperties_request::set_properties(const std::vector<GlobalProperty>& properties_)
-{
-  unsigned int i=properties_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!GlobalPropertyMarshaller::checkIntegrityConst(properties_[i]))   return false;
-  }
-  properties=properties_;
-  return true;
-}
-
-
-
-
-const std::vector<GlobalProperty>& ResetGlobalProperties_request::get_properties(void) const 
-{
-  return properties;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_requestMarshaller.cpp
deleted file mode 100644
index d07333697..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_requestMarshaller.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_request.h"
-#include "GlobalPropertyMarshaller.h"
-
-#include "ResetGlobalProperties_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool ResetGlobalProperties_requestMarshaller::checkIntegrity(ResetGlobalProperties_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ResetGlobalProperties_requestMarshaller::fromString(const std::string& s,ResetGlobalProperties_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ResetGlobalProperties_requestMarshaller::toString(const ResetGlobalProperties_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ResetGlobalProperties_requestMarshaller::checkIntegrityConst(const ResetGlobalProperties_request& s)
-{
-  {
-    unsigned int i=s.properties.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!GlobalPropertyMarshaller::checkIntegrityConst(s.properties[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value ResetGlobalProperties_requestMarshaller::toJSON(const ResetGlobalProperties_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("ResetGlobalProperties");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["properties"]=Json::Value(Json::arrayValue);
-  j["properties"].resize(e.properties.size());
-  for(unsigned int i=0;i<e.properties.size();i++)
-    j["properties"][i]=GlobalPropertyMarshaller::toJSON(e.properties[i]);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool ResetGlobalProperties_requestMarshaller::fromJSON(const Json::Value& js,ResetGlobalProperties_request& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("ResetGlobalProperties"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("properties"))  return false;
-    {
-      const Json::Value& j=json["properties"];
-      if(!j.isArray())  return false;
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        GlobalProperty t;
-        if(GlobalPropertyMarshaller::fromJSON(j[i],t))
-        {
-          c.properties.push_back(t);
-        }
-      }
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_requestMarshaller.h
deleted file mode 100644
index 47cc096ca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_RESETGLOBALPROPERTIES_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_RESETGLOBALPROPERTIES_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct ResetGlobalProperties_requestMarshaller
-  {
-    static bool checkIntegrity(ResetGlobalProperties_request& e);
-    static bool checkIntegrityConst(const ResetGlobalProperties_request& e);
-  
-    static bool fromString(const std::string& s,ResetGlobalProperties_request& e);
-    static const std::string toString(const ResetGlobalProperties_request& e);
-  
-    static bool fromJSON(const Json::Value& s,ResetGlobalProperties_request& e);
-    static Json::Value toJSON(const ResetGlobalProperties_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_response.cpp
deleted file mode 100644
index 6ddcf98fa..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_response.h"
-#include "ResetGlobalProperties_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-ResetGlobalProperties_response& ResetGlobalProperties_response::operator =(const ResetGlobalProperties_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-ResetGlobalProperties_response::~ResetGlobalProperties_response(void)
-{}
-
-ResetGlobalProperties_response::ResetGlobalProperties_response(const ResetGlobalProperties_response& c)
-{
-    *this = c;
-}
-
-bool ResetGlobalProperties_response::checkIntegrity(void)
-{
-    return ResetGlobalProperties_responseMarshaller::checkIntegrity(*this);
-}
-
-ResetGlobalProperties_response::ResetGlobalProperties_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_RESETGLOBALPROPERTIES_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_responseMarshaller.cpp
deleted file mode 100644
index 4e96802c1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_response.h"
-#include "ResultMarshaller.h"
-
-#include "ResetGlobalProperties_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool ResetGlobalProperties_responseMarshaller::checkIntegrity(ResetGlobalProperties_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ResetGlobalProperties_responseMarshaller::fromString(const std::string& s,ResetGlobalProperties_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ResetGlobalProperties_responseMarshaller::toString(const ResetGlobalProperties_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ResetGlobalProperties_responseMarshaller::checkIntegrityConst(const ResetGlobalProperties_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value ResetGlobalProperties_responseMarshaller::toJSON(const ResetGlobalProperties_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("ResetGlobalProperties");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool ResetGlobalProperties_responseMarshaller::fromJSON(const Json::Value& js,ResetGlobalProperties_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("ResetGlobalProperties"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_responseMarshaller.h
deleted file mode 100644
index 9a50d1d91..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResetGlobalProperties_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_RESETGLOBALPROPERTIES_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_RESETGLOBALPROPERTIES_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/ResetGlobalProperties_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct ResetGlobalProperties_responseMarshaller
-  {
-    static bool checkIntegrity(ResetGlobalProperties_response& e);
-    static bool checkIntegrityConst(const ResetGlobalProperties_response& e);
-  
-    static bool fromString(const std::string& s,ResetGlobalProperties_response& e);
-    static const std::string toString(const ResetGlobalProperties_response& e);
-  
-    static bool fromJSON(const Json::Value& s,ResetGlobalProperties_response& e);
-    static Json::Value toJSON(const ResetGlobalProperties_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Result.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Result.cpp
deleted file mode 100644
index acc37fa8f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Result.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Result.h"
-#include "ResetGlobalProperties_responseMarshaller.h"
-
-// TODO(AK): remove this after new code generation
-#include "../include/JSONHandler/SDLRPCObjects/V2/Result.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-using namespace NsSmartDeviceLinkRPC;
-
-Result::Result() : mInternal(INVALID_ENUM)
-{}
-
-Result::Result(ResultInternal e) : mInternal(e)
-{}
-
-Result::Result(const Result& result)
-{
-    mInternal = result.mInternal;
-}
-
-Result::ResultInternal Result::get(void) const
-{
-    return mInternal;
-}
-void Result::set(ResultInternal e)
-{
-    mInternal = e;
-}
-
-// TODO(AK): remove this after new code generation
-Result::operator NsSmartDeviceLinkRPCV2::Result()
-{
-    return NsSmartDeviceLinkRPCV2::Result(
-               static_cast<NsSmartDeviceLinkRPCV2::Result::ResultInternal>(mInternal));
-}
-
-// TODO(AK): remove this after new code generation
-Result& Result::operator= (const Result& result)
-{
-    mInternal = result.mInternal;
-    return *this;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.cpp
deleted file mode 100644
index d6ba6a214..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/Result.h"
-#include "ResultMarshaller.h"
-#include "ResultMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const Result::ResultInternal ResultMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return Result::INVALID_ENUM;
-  const struct PerfectHashTable* p=Result_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<Result::ResultInternal>(p->idx) : Result::INVALID_ENUM;
-}
-
-
-bool ResultMarshaller::fromJSON(const Json::Value& s,Result& e)
-{
-  e.mInternal=Result::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=Result::INVALID_ENUM);
-}
-
-
-Json::Value ResultMarshaller::toJSON(const Result& e)
-{
-  if(e.mInternal==Result::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ResultMarshaller::fromString(const std::string& s,Result& e)
-{
-  e.mInternal=Result::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string ResultMarshaller::toString(const Result& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==Result::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ResultMarshaller::mHashTable[20]=
-{
-  {"SUCCESS",0},
-  {"INVALID_DATA",1},
-  {"UNSUPPORTED_REQUEST",2},
-  {"OUT_OF_MEMORY",3},
-  {"TOO_MANY_PENDING_REQUESTS",4},
-  {"INVALID_ID",5},
-  {"DUPLICATE_NAME",6},
-  {"TOO_MANY_APPLICATIONS",7},
-  {"APPLICATION_REGISTERED_ALREADY",8},
-  {"UNSUPPORTED_VERSION",9},
-  {"WRONG_LANGUAGE",10},
-  {"APPLICATION_NOT_REGISTERED",11},
-  {"IN_USE",12},
-  {"SUBSCRIBED_ALREADY",13},
-  {"REJECTED",14},
-  {"ABORTED",15},
-  {"IGNORED",16},
-  {"UNSUPPORTED_BUTTON",17},
-  {"FILE_NOT_FOUND",18},
-  {"GENERIC_ERROR",19}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp
deleted file mode 100644
index f23c23085..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp
+++ /dev/null
@@ -1,36 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name Result_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-SUCCESS,0
-INVALID_DATA,1
-UNSUPPORTED_REQUEST,2
-OUT_OF_MEMORY,3
-TOO_MANY_PENDING_REQUESTS,4
-INVALID_ID,5
-DUPLICATE_NAME,6
-TOO_MANY_APPLICATIONS,7
-APPLICATION_REGISTERED_ALREADY,8
-UNSUPPORTED_VERSION,9
-WRONG_LANGUAGE,10
-APPLICATION_NOT_REGISTERED,11
-IN_USE,12
-SUBSCRIBED_ALREADY,13
-REJECTED,14
-ABORTED,15
-IGNORED,16
-UNSUPPORTED_BUTTON,17
-FILE_NOT_FOUND,18
-GENERIC_ERROR,19
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.h
deleted file mode 100644
index 7361c973c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_RESULTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_RESULTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Result.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for Result
-
-  class ResultMarshaller
-  {
-  public:
-  
-    static std::string toName(const Result& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(Result& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=Result::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(Result& e)		{ return e.mInternal!=Result::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const Result& e)	{ return e.mInternal!=Result::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,Result& e);
-    static const std::string toString(const Result& e);
-  
-    static bool fromJSON(const Json::Value& s,Result& e);
-    static Json::Value toJSON(const Result& e);
-  
-    static const char* getName(Result::ResultInternal e)
-    {
-       return (e>=0 && e<20) ? mHashTable[e].name : NULL;
-    }
-  
-    static const Result::ResultInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[20];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.inc
deleted file mode 100644
index f79567fdc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.inc
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright (c) 2013 Ford Motor Company */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp  */
-/* Computed positions: -k'1,13' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 20
-#define MIN_WORD_LENGTH 6
-#define MAX_WORD_LENGTH 30
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 40
-/* maximum key range = 35, duplicates = 0 */
-
-class Result_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Result_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 10,  5, 41,  0, 41,
-      20,  0, 41,  0, 41, 41,  0, 15,  0,  5,
-      41, 41,  0, 15,  0,  0,  5,  0, 41,  0,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[12]];
-      /*FALLTHROUGH*/
-      case 12:
-      case 11:
-      case 10:
-      case 9:
-      case 8:
-      case 7:
-      case 6:
-      case 5:
-      case 4:
-      case 3:
-      case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-Result_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  6,  7,  8,  0, 10,  0, 12, 13,
-      14,  0,  0,  7, 13, 19,  0, 21,  7, 18, 19, 25,  0,  0,
-       0, 14,  0,  0,  0, 18, 14,  0, 26,  0,  0,  0, 30
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"IN_USE",12},
-#line 33 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"IGNORED",16},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"REJECTED",14},
-      {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"INVALID_ID",5},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"INVALID_DATA",1},
-#line 36 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"GENERIC_ERROR",19},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"WRONG_LANGUAGE",10},
-      {""}, {""},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"ABORTED",15},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"OUT_OF_MEMORY",3},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"UNSUPPORTED_REQUEST",2},
-      {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"TOO_MANY_APPLICATIONS",7},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"SUCCESS",0},
-#line 34 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"UNSUPPORTED_BUTTON",17},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"UNSUPPORTED_VERSION",9},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"TOO_MANY_PENDING_REQUESTS",4},
-      {""}, {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"DUPLICATE_NAME",6},
-      {""}, {""}, {""},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"SUBSCRIBED_ALREADY",13},
-#line 35 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"FILE_NOT_FOUND",18},
-      {""},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"APPLICATION_NOT_REGISTERED",11},
-      {""}, {""}, {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/ResultMarshaller.gp"
-      {"APPLICATION_REGISTERED_ALREADY",8}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_request.cpp
deleted file mode 100644
index ca2346662..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_request.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_request.h"
-#include "SetGlobalProperties_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-SetGlobalProperties_request& SetGlobalProperties_request::operator =(const SetGlobalProperties_request& c)
-{
-  helpPrompt= c.helpPrompt ? new std::vector<TTSChunk>(c.helpPrompt[0]) : 0;
-  timeoutPrompt= c.timeoutPrompt ? new std::vector<TTSChunk>(c.timeoutPrompt[0]) : 0;
-
-  return *this;}
-
-
-SetGlobalProperties_request::~SetGlobalProperties_request(void)
-{
-  if(helpPrompt)
-    delete helpPrompt;
-  if(timeoutPrompt)
-    delete timeoutPrompt;
-}
-
-
-SetGlobalProperties_request::SetGlobalProperties_request(const SetGlobalProperties_request& c)
-{
-  *this=c;
-}
-
-
-bool SetGlobalProperties_request::checkIntegrity(void)
-{
-  return SetGlobalProperties_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SetGlobalProperties_request::SetGlobalProperties_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_SETGLOBALPROPERTIES_REQUEST),
-      helpPrompt(0),
-    timeoutPrompt(0)
-{
-}
-
-
-
-bool SetGlobalProperties_request::set_helpPrompt(const std::vector<TTSChunk>& helpPrompt_)
-{
-  unsigned int i=helpPrompt_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(helpPrompt_[i]))   return false;
-  }
-  delete helpPrompt;
-  helpPrompt=0;
-
-  helpPrompt=new std::vector<TTSChunk>(helpPrompt_);
-  return true;
-}
-
-void SetGlobalProperties_request::reset_helpPrompt(void)
-{
-  if(helpPrompt)
-    delete helpPrompt;
-  helpPrompt=0;
-}
-
-bool SetGlobalProperties_request::set_timeoutPrompt(const std::vector<TTSChunk>& timeoutPrompt_)
-{
-  unsigned int i=timeoutPrompt_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(timeoutPrompt_[i]))   return false;
-  }
-  delete timeoutPrompt;
-  timeoutPrompt=0;
-
-  timeoutPrompt=new std::vector<TTSChunk>(timeoutPrompt_);
-  return true;
-}
-
-void SetGlobalProperties_request::reset_timeoutPrompt(void)
-{
-  if(timeoutPrompt)
-    delete timeoutPrompt;
-  timeoutPrompt=0;
-}
-
-
-
-
-const std::vector<TTSChunk>* SetGlobalProperties_request::get_helpPrompt(void) const 
-{
-  return helpPrompt;
-}
-
-const std::vector<TTSChunk>* SetGlobalProperties_request::get_timeoutPrompt(void) const 
-{
-  return timeoutPrompt;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_requestMarshaller.cpp
deleted file mode 100644
index 1fb2135ec..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_requestMarshaller.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_request.h"
-#include "TTSChunkMarshaller.h"
-
-#include "SetGlobalProperties_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool SetGlobalProperties_requestMarshaller::checkIntegrity(SetGlobalProperties_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetGlobalProperties_requestMarshaller::fromString(const std::string& s,SetGlobalProperties_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetGlobalProperties_requestMarshaller::toString(const SetGlobalProperties_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetGlobalProperties_requestMarshaller::checkIntegrityConst(const SetGlobalProperties_request& s)
-{
-  if(s.helpPrompt)
-  {
-    unsigned int i=s.helpPrompt[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.helpPrompt[0][i]))   return false;
-    }
-  }
-  if(s.timeoutPrompt)
-  {
-    unsigned int i=s.timeoutPrompt[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.timeoutPrompt[0][i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value SetGlobalProperties_requestMarshaller::toJSON(const SetGlobalProperties_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("SetGlobalProperties");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  if(e.helpPrompt)
-  {
-    unsigned int sz=e.helpPrompt->size();
-    j["helpPrompt"]=Json::Value(Json::arrayValue);
-    j["helpPrompt"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["helpPrompt"][i]=TTSChunkMarshaller::toJSON(e.helpPrompt[0][i]);
-  }
-
-  if(e.timeoutPrompt)
-  {
-    unsigned int sz=e.timeoutPrompt->size();
-    j["timeoutPrompt"]=Json::Value(Json::arrayValue);
-    j["timeoutPrompt"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      j["timeoutPrompt"][i]=TTSChunkMarshaller::toJSON(e.timeoutPrompt[0][i]);
-  }
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool SetGlobalProperties_requestMarshaller::fromJSON(const Json::Value& js,SetGlobalProperties_request& c)
-{
-  if(c.helpPrompt)  delete c.helpPrompt;
-  c.helpPrompt=0;
-
-  if(c.timeoutPrompt)  delete c.timeoutPrompt;
-  c.timeoutPrompt=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("SetGlobalProperties"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(json.isMember("helpPrompt"))
-    {
-      const Json::Value& j=json["helpPrompt"];
-      if(!j.isArray())  return false;
-      c.helpPrompt=new std::vector<TTSChunk>();
-      c.helpPrompt->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        TTSChunk t;
-        if(!TTSChunkMarshaller::fromJSON(j[i],t))
-          return false;
-        c.helpPrompt[0][i]=t;
-      }
-
-    }
-    if(json.isMember("timeoutPrompt"))
-    {
-      const Json::Value& j=json["timeoutPrompt"];
-      if(!j.isArray())  return false;
-      c.timeoutPrompt=new std::vector<TTSChunk>();
-      c.timeoutPrompt->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        TTSChunk t;
-        if(!TTSChunkMarshaller::fromJSON(j[i],t))
-          return false;
-        c.timeoutPrompt[0][i]=t;
-      }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_requestMarshaller.h
deleted file mode 100644
index 15efd9deb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SETGLOBALPROPERTIES_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SETGLOBALPROPERTIES_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct SetGlobalProperties_requestMarshaller
-  {
-    static bool checkIntegrity(SetGlobalProperties_request& e);
-    static bool checkIntegrityConst(const SetGlobalProperties_request& e);
-  
-    static bool fromString(const std::string& s,SetGlobalProperties_request& e);
-    static const std::string toString(const SetGlobalProperties_request& e);
-  
-    static bool fromJSON(const Json::Value& s,SetGlobalProperties_request& e);
-    static Json::Value toJSON(const SetGlobalProperties_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_response.cpp
deleted file mode 100644
index 042acaa74..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_response.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_response.h"
-#include "SetGlobalProperties_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-SetGlobalProperties_response& SetGlobalProperties_response::operator =(const SetGlobalProperties_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-SetGlobalProperties_response::~SetGlobalProperties_response(void)
-{}
-
-SetGlobalProperties_response::SetGlobalProperties_response(const SetGlobalProperties_response& c)
-{
-    *this = c;
-}
-
-bool SetGlobalProperties_response::checkIntegrity(void)
-{
-    return SetGlobalProperties_responseMarshaller::checkIntegrity(*this);
-}
-
-SetGlobalProperties_response::SetGlobalProperties_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_SETGLOBALPROPERTIES_RESPONSE)
-{
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_responseMarshaller.cpp
deleted file mode 100644
index f384f4cb2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_response.h"
-#include "ResultMarshaller.h"
-
-#include "SetGlobalProperties_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool SetGlobalProperties_responseMarshaller::checkIntegrity(SetGlobalProperties_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetGlobalProperties_responseMarshaller::fromString(const std::string& s,SetGlobalProperties_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetGlobalProperties_responseMarshaller::toString(const SetGlobalProperties_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetGlobalProperties_responseMarshaller::checkIntegrityConst(const SetGlobalProperties_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value SetGlobalProperties_responseMarshaller::toJSON(const SetGlobalProperties_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("SetGlobalProperties");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool SetGlobalProperties_responseMarshaller::fromJSON(const Json::Value& js,SetGlobalProperties_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("SetGlobalProperties"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_responseMarshaller.h
deleted file mode 100644
index 56928f332..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetGlobalProperties_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SETGLOBALPROPERTIES_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SETGLOBALPROPERTIES_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetGlobalProperties_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct SetGlobalProperties_responseMarshaller
-  {
-    static bool checkIntegrity(SetGlobalProperties_response& e);
-    static bool checkIntegrityConst(const SetGlobalProperties_response& e);
-  
-    static bool fromString(const std::string& s,SetGlobalProperties_response& e);
-    static const std::string toString(const SetGlobalProperties_response& e);
-  
-    static bool fromJSON(const Json::Value& s,SetGlobalProperties_response& e);
-    static Json::Value toJSON(const SetGlobalProperties_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_request.cpp
deleted file mode 100644
index 7c2a2a2a7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_request.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_request.h"
-#include "SetMediaClockTimer_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "StartTimeMarshaller.h"
-#include "UpdateModeMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-SetMediaClockTimer_request& SetMediaClockTimer_request::operator =(const SetMediaClockTimer_request& c)
-{
-  startTime= c.startTime ? new StartTime(c.startTime[0]) : 0;
-  updateMode= c.updateMode;
-
-  return *this;}
-
-
-SetMediaClockTimer_request::~SetMediaClockTimer_request(void)
-{
-  if(startTime)
-    delete startTime;
-}
-
-
-SetMediaClockTimer_request::SetMediaClockTimer_request(const SetMediaClockTimer_request& c)
-{
-  *this=c;
-}
-
-
-bool SetMediaClockTimer_request::checkIntegrity(void)
-{
-  return SetMediaClockTimer_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SetMediaClockTimer_request::SetMediaClockTimer_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_SETMEDIACLOCKTIMER_REQUEST),
-      startTime(0)
-{
-}
-
-
-
-bool SetMediaClockTimer_request::set_startTime(const StartTime& startTime_)
-{
-  if(!StartTimeMarshaller::checkIntegrityConst(startTime_))   return false;
-  delete startTime;
-  startTime=0;
-
-  startTime=new StartTime(startTime_);
-  return true;
-}
-
-void SetMediaClockTimer_request::reset_startTime(void)
-{
-  if(startTime)
-    delete startTime;
-  startTime=0;
-}
-
-bool SetMediaClockTimer_request::set_updateMode(const UpdateMode& updateMode_)
-{
-  if(!UpdateModeMarshaller::checkIntegrityConst(updateMode_))   return false;
-  updateMode=updateMode_;
-  return true;
-}
-
-
-
-
-const StartTime* SetMediaClockTimer_request::get_startTime(void) const 
-{
-  return startTime;
-}
-
-const UpdateMode& SetMediaClockTimer_request::get_updateMode(void) const 
-{
-  return updateMode;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_requestMarshaller.cpp
deleted file mode 100644
index 520b0a29e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_requestMarshaller.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_request.h"
-#include "StartTimeMarshaller.h"
-#include "UpdateModeMarshaller.h"
-
-#include "SetMediaClockTimer_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool SetMediaClockTimer_requestMarshaller::checkIntegrity(SetMediaClockTimer_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetMediaClockTimer_requestMarshaller::fromString(const std::string& s,SetMediaClockTimer_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetMediaClockTimer_requestMarshaller::toString(const SetMediaClockTimer_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetMediaClockTimer_requestMarshaller::checkIntegrityConst(const SetMediaClockTimer_request& s)
-{
-  if(s.startTime && !StartTimeMarshaller::checkIntegrityConst(*s.startTime))  return false;
-  if(!UpdateModeMarshaller::checkIntegrityConst(s.updateMode))  return false;
-  return true;
-}
-
-Json::Value SetMediaClockTimer_requestMarshaller::toJSON(const SetMediaClockTimer_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("SetMediaClockTimer");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  if(e.startTime)
-    j["startTime"]=StartTimeMarshaller::toJSON(*e.startTime);
-
-  j["updateMode"]=UpdateModeMarshaller::toJSON(e.updateMode);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool SetMediaClockTimer_requestMarshaller::fromJSON(const Json::Value& js,SetMediaClockTimer_request& c)
-{
-  if(c.startTime)  delete c.startTime;
-  c.startTime=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("SetMediaClockTimer"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(json.isMember("startTime"))
-    {
-      const Json::Value& j=json["startTime"];
-      c.startTime=new StartTime();
-      if(!StartTimeMarshaller::fromJSON(j,c.startTime[0]))
-        return false;
-    }
-    if(!json.isMember("updateMode"))  return false;
-    {
-      const Json::Value& j=json["updateMode"];
-      if(!UpdateModeMarshaller::fromJSON(j,c.updateMode))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_requestMarshaller.h
deleted file mode 100644
index f0f307bf8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SETMEDIACLOCKTIMER_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SETMEDIACLOCKTIMER_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct SetMediaClockTimer_requestMarshaller
-  {
-    static bool checkIntegrity(SetMediaClockTimer_request& e);
-    static bool checkIntegrityConst(const SetMediaClockTimer_request& e);
-  
-    static bool fromString(const std::string& s,SetMediaClockTimer_request& e);
-    static const std::string toString(const SetMediaClockTimer_request& e);
-  
-    static bool fromJSON(const Json::Value& s,SetMediaClockTimer_request& e);
-    static Json::Value toJSON(const SetMediaClockTimer_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_response.cpp
deleted file mode 100644
index 4ef3d18da..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_response.h"
-#include "SetMediaClockTimer_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-SetMediaClockTimer_response& SetMediaClockTimer_response::operator =(const SetMediaClockTimer_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-SetMediaClockTimer_response::~SetMediaClockTimer_response(void)
-{}
-
-SetMediaClockTimer_response::SetMediaClockTimer_response(const SetMediaClockTimer_response& c)
-{
-    *this = c;
-}
-
-bool SetMediaClockTimer_response::checkIntegrity(void)
-{
-    return SetMediaClockTimer_responseMarshaller::checkIntegrity(*this);
-}
-
-SetMediaClockTimer_response::SetMediaClockTimer_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_SETMEDIACLOCKTIMER_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_responseMarshaller.cpp
deleted file mode 100644
index 429adf6eb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_response.h"
-#include "ResultMarshaller.h"
-
-#include "SetMediaClockTimer_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool SetMediaClockTimer_responseMarshaller::checkIntegrity(SetMediaClockTimer_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetMediaClockTimer_responseMarshaller::fromString(const std::string& s,SetMediaClockTimer_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetMediaClockTimer_responseMarshaller::toString(const SetMediaClockTimer_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetMediaClockTimer_responseMarshaller::checkIntegrityConst(const SetMediaClockTimer_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value SetMediaClockTimer_responseMarshaller::toJSON(const SetMediaClockTimer_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("SetMediaClockTimer");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool SetMediaClockTimer_responseMarshaller::fromJSON(const Json::Value& js,SetMediaClockTimer_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("SetMediaClockTimer"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_responseMarshaller.h
deleted file mode 100644
index 4af1b73cb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SetMediaClockTimer_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SETMEDIACLOCKTIMER_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SETMEDIACLOCKTIMER_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SetMediaClockTimer_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct SetMediaClockTimer_responseMarshaller
-  {
-    static bool checkIntegrity(SetMediaClockTimer_response& e);
-    static bool checkIntegrityConst(const SetMediaClockTimer_response& e);
-  
-    static bool fromString(const std::string& s,SetMediaClockTimer_response& e);
-    static const std::string toString(const SetMediaClockTimer_response& e);
-  
-    static bool fromJSON(const Json::Value& s,SetMediaClockTimer_response& e);
-    static Json::Value toJSON(const SetMediaClockTimer_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_request.cpp
deleted file mode 100644
index 969b6a816..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_request.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Show_request.h"
-#include "Show_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "TextAlignmentMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-Show_request& Show_request::operator =(const Show_request& c)
-{
-  mainField1= c.mainField1 ? new std::string(c.mainField1[0]) : 0;
-  mainField2= c.mainField2 ? new std::string(c.mainField2[0]) : 0;
-  alignment= c.alignment ? new TextAlignment(c.alignment[0]) : 0;
-  statusBar= c.statusBar ? new std::string(c.statusBar[0]) : 0;
-  mediaClock= c.mediaClock ? new std::string(c.mediaClock[0]) : 0;
-  mediaTrack= c.mediaTrack ? new std::string(c.mediaTrack[0]) : 0;
-
-  return *this;}
-
-
-Show_request::~Show_request(void)
-{
-  if(mainField1)
-    delete mainField1;
-  if(mainField2)
-    delete mainField2;
-  if(alignment)
-    delete alignment;
-  if(statusBar)
-    delete statusBar;
-  if(mediaClock)
-    delete mediaClock;
-  if(mediaTrack)
-    delete mediaTrack;
-}
-
-
-Show_request::Show_request(const Show_request& c)
-{
-  *this=c;
-}
-
-
-bool Show_request::checkIntegrity(void)
-{
-  return Show_requestMarshaller::checkIntegrity(*this);
-}
-
-
-Show_request::Show_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_SHOW_REQUEST),
-      mainField1(0),
-    mainField2(0),
-    alignment(0),
-    statusBar(0),
-    mediaClock(0),
-    mediaTrack(0)
-{
-}
-
-
-
-bool Show_request::set_mainField1(const std::string& mainField1_)
-{
-  if(mainField1_.length()>500)  return false;
-  delete mainField1;
-  mainField1=0;
-
-  mainField1=new std::string(mainField1_);
-  return true;
-}
-
-void Show_request::reset_mainField1(void)
-{
-  if(mainField1)
-    delete mainField1;
-  mainField1=0;
-}
-
-bool Show_request::set_mainField2(const std::string& mainField2_)
-{
-  if(mainField2_.length()>500)  return false;
-  delete mainField2;
-  mainField2=0;
-
-  mainField2=new std::string(mainField2_);
-  return true;
-}
-
-void Show_request::reset_mainField2(void)
-{
-  if(mainField2)
-    delete mainField2;
-  mainField2=0;
-}
-
-bool Show_request::set_alignment(const TextAlignment& alignment_)
-{
-  if(!TextAlignmentMarshaller::checkIntegrityConst(alignment_))   return false;
-  delete alignment;
-  alignment=0;
-
-  alignment=new TextAlignment(alignment_);
-  return true;
-}
-
-void Show_request::reset_alignment(void)
-{
-  if(alignment)
-    delete alignment;
-  alignment=0;
-}
-
-bool Show_request::set_statusBar(const std::string& statusBar_)
-{
-  if(statusBar_.length()>500)  return false;
-  delete statusBar;
-  statusBar=0;
-
-  statusBar=new std::string(statusBar_);
-  return true;
-}
-
-void Show_request::reset_statusBar(void)
-{
-  if(statusBar)
-    delete statusBar;
-  statusBar=0;
-}
-
-bool Show_request::set_mediaClock(const std::string& mediaClock_)
-{
-  if(mediaClock_.length()>500)  return false;
-  delete mediaClock;
-  mediaClock=0;
-
-  mediaClock=new std::string(mediaClock_);
-  return true;
-}
-
-void Show_request::reset_mediaClock(void)
-{
-  if(mediaClock)
-    delete mediaClock;
-  mediaClock=0;
-}
-
-bool Show_request::set_mediaTrack(const std::string& mediaTrack_)
-{
-  if(mediaTrack_.length()>500)  return false;
-  delete mediaTrack;
-  mediaTrack=0;
-
-  mediaTrack=new std::string(mediaTrack_);
-  return true;
-}
-
-void Show_request::reset_mediaTrack(void)
-{
-  if(mediaTrack)
-    delete mediaTrack;
-  mediaTrack=0;
-}
-
-
-
-
-const std::string* Show_request::get_mainField1(void) const 
-{
-  return mainField1;
-}
-
-const std::string* Show_request::get_mainField2(void) const 
-{
-  return mainField2;
-}
-
-const TextAlignment* Show_request::get_alignment(void) const 
-{
-  return alignment;
-}
-
-const std::string* Show_request::get_statusBar(void) const 
-{
-  return statusBar;
-}
-
-const std::string* Show_request::get_mediaClock(void) const 
-{
-  return mediaClock;
-}
-
-const std::string* Show_request::get_mediaTrack(void) const 
-{
-  return mediaTrack;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_requestMarshaller.cpp
deleted file mode 100644
index 56f83ecf3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_requestMarshaller.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Show_request.h"
-#include "TextAlignmentMarshaller.h"
-
-#include "Show_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool Show_requestMarshaller::checkIntegrity(Show_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Show_requestMarshaller::fromString(const std::string& s,Show_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Show_requestMarshaller::toString(const Show_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Show_requestMarshaller::checkIntegrityConst(const Show_request& s)
-{
-  if(s.mainField1 && s.mainField1->length()>500)  return false;
-  if(s.mainField2 && s.mainField2->length()>500)  return false;
-  if(s.alignment && !TextAlignmentMarshaller::checkIntegrityConst(*s.alignment))  return false;
-  if(s.statusBar && s.statusBar->length()>500)  return false;
-  if(s.mediaClock && s.mediaClock->length()>500)  return false;
-  if(s.mediaTrack && s.mediaTrack->length()>500)  return false;
-  return true;
-}
-
-Json::Value Show_requestMarshaller::toJSON(const Show_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("Show");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  if(e.mainField1)
-    j["mainField1"]=Json::Value(*e.mainField1);
-
-  if(e.mainField2)
-    j["mainField2"]=Json::Value(*e.mainField2);
-
-  if(e.alignment)
-    j["alignment"]=TextAlignmentMarshaller::toJSON(*e.alignment);
-
-  if(e.statusBar)
-    j["statusBar"]=Json::Value(*e.statusBar);
-
-  if(e.mediaClock)
-    j["mediaClock"]=Json::Value(*e.mediaClock);
-
-  if(e.mediaTrack)
-    j["mediaTrack"]=Json::Value(*e.mediaTrack);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool Show_requestMarshaller::fromJSON(const Json::Value& js,Show_request& c)
-{
-  if(c.mainField1)  delete c.mainField1;
-  c.mainField1=0;
-
-  if(c.mainField2)  delete c.mainField2;
-  c.mainField2=0;
-
-  if(c.alignment)  delete c.alignment;
-  c.alignment=0;
-
-  if(c.statusBar)  delete c.statusBar;
-  c.statusBar=0;
-
-  if(c.mediaClock)  delete c.mediaClock;
-  c.mediaClock=0;
-
-  if(c.mediaTrack)  delete c.mediaTrack;
-  c.mediaTrack=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("Show"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(json.isMember("mainField1"))
-    {
-      const Json::Value& j=json["mainField1"];
-      if(!j.isString())  return false;
-      c.mainField1=new std::string(j.asString());
-    }
-    if(json.isMember("mainField2"))
-    {
-      const Json::Value& j=json["mainField2"];
-      if(!j.isString())  return false;
-      c.mainField2=new std::string(j.asString());
-    }
-    if(json.isMember("alignment"))
-    {
-      const Json::Value& j=json["alignment"];
-      c.alignment=new TextAlignment();
-      if(!TextAlignmentMarshaller::fromJSON(j,c.alignment[0]))
-        return false;
-    }
-    if(json.isMember("statusBar"))
-    {
-      const Json::Value& j=json["statusBar"];
-      if(!j.isString())  return false;
-      c.statusBar=new std::string(j.asString());
-    }
-    if(json.isMember("mediaClock"))
-    {
-      const Json::Value& j=json["mediaClock"];
-      if(!j.isString())  return false;
-      c.mediaClock=new std::string(j.asString());
-    }
-    if(json.isMember("mediaTrack"))
-    {
-      const Json::Value& j=json["mediaTrack"];
-      if(!j.isString())  return false;
-      c.mediaTrack=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_requestMarshaller.h
deleted file mode 100644
index 15b731256..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SHOW_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SHOW_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Show_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct Show_requestMarshaller
-  {
-    static bool checkIntegrity(Show_request& e);
-    static bool checkIntegrityConst(const Show_request& e);
-  
-    static bool fromString(const std::string& s,Show_request& e);
-    static const std::string toString(const Show_request& e);
-  
-    static bool fromJSON(const Json::Value& s,Show_request& e);
-    static Json::Value toJSON(const Show_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_response.cpp
deleted file mode 100644
index 1d94ea720..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Show_response.h"
-#include "Show_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-Show_response& Show_response::operator =(const Show_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-Show_response::~Show_response(void)
-{}
-
-Show_response::Show_response(const Show_response& c)
-{
-    *this = c;
-}
-
-bool Show_response::checkIntegrity(void)
-{
-    return Show_responseMarshaller::checkIntegrity(*this);
-}
-
-Show_response::Show_response(void) : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_SHOW_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_responseMarshaller.cpp
deleted file mode 100644
index 50654f6dd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Show_response.h"
-#include "ResultMarshaller.h"
-
-#include "Show_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool Show_responseMarshaller::checkIntegrity(Show_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Show_responseMarshaller::fromString(const std::string& s,Show_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Show_responseMarshaller::toString(const Show_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Show_responseMarshaller::checkIntegrityConst(const Show_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value Show_responseMarshaller::toJSON(const Show_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("Show");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool Show_responseMarshaller::fromJSON(const Json::Value& js,Show_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("Show"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_responseMarshaller.h
deleted file mode 100644
index 2b77f20d1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Show_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SHOW_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SHOW_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Show_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct Show_responseMarshaller
-  {
-    static bool checkIntegrity(Show_response& e);
-    static bool checkIntegrityConst(const Show_response& e);
-  
-    static bool fromString(const std::string& s,Show_response& e);
-    static const std::string toString(const Show_response& e);
-  
-    static bool fromJSON(const Json::Value& s,Show_response& e);
-    static Json::Value toJSON(const Show_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_request.cpp
deleted file mode 100644
index d1d3ad545..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_request.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Speak_request.h"
-#include "Speak_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-Speak_request::~Speak_request(void)
-{
-}
-
-
-Speak_request::Speak_request(const Speak_request& c)
-{
-  *this=c;
-}
-
-
-bool Speak_request::checkIntegrity(void)
-{
-  return Speak_requestMarshaller::checkIntegrity(*this);
-}
-
-
-Speak_request::Speak_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_SPEAK_REQUEST)
-{
-}
-
-
-
-bool Speak_request::set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_)
-{
-  unsigned int i=ttsChunks_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(ttsChunks_[i]))   return false;
-  }
-  ttsChunks=ttsChunks_;
-  return true;
-}
-
-
-
-
-const std::vector<TTSChunk>& Speak_request::get_ttsChunks(void) const 
-{
-  return ttsChunks;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_requestMarshaller.cpp
deleted file mode 100644
index 4ee518a52..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_requestMarshaller.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Speak_request.h"
-#include "TTSChunkMarshaller.h"
-
-#include "Speak_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool Speak_requestMarshaller::checkIntegrity(Speak_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Speak_requestMarshaller::fromString(const std::string& s,Speak_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Speak_requestMarshaller::toString(const Speak_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Speak_requestMarshaller::checkIntegrityConst(const Speak_request& s)
-{
-  {
-    unsigned int i=s.ttsChunks.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.ttsChunks[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value Speak_requestMarshaller::toJSON(const Speak_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("Speak");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["ttsChunks"]=Json::Value(Json::arrayValue);
-  j["ttsChunks"].resize(e.ttsChunks.size());
-  for(unsigned int i=0;i<e.ttsChunks.size();i++)
-    j["ttsChunks"][i]=TTSChunkMarshaller::toJSON(e.ttsChunks[i]);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool Speak_requestMarshaller::fromJSON(const Json::Value& js,Speak_request& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("Speak"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("ttsChunks"))  return false;
-    {
-      const Json::Value& j=json["ttsChunks"];
-      if(!j.isArray())  return false;
-      c.ttsChunks.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          TTSChunk t;
-          if(!TTSChunkMarshaller::fromJSON(j[i],t))
-            return false;
-          c.ttsChunks[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_requestMarshaller.h
deleted file mode 100644
index 0661e66d9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SPEAK_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SPEAK_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Speak_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct Speak_requestMarshaller
-  {
-    static bool checkIntegrity(Speak_request& e);
-    static bool checkIntegrityConst(const Speak_request& e);
-  
-    static bool fromString(const std::string& s,Speak_request& e);
-    static const std::string toString(const Speak_request& e);
-  
-    static bool fromJSON(const Json::Value& s,Speak_request& e);
-    static Json::Value toJSON(const Speak_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_response.cpp
deleted file mode 100644
index c6921b220..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Speak_response.h"
-#include "Speak_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-Speak_response& Speak_response::operator =(const Speak_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-Speak_response::~Speak_response(void)
-{}
-
-Speak_response::Speak_response(const Speak_response& c)
-{
-    *this = c;
-}
-
-bool Speak_response::checkIntegrity(void)
-{
-    return Speak_responseMarshaller::checkIntegrity(*this);
-}
-
-Speak_response::Speak_response(void) : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_SPEAK_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_responseMarshaller.cpp
deleted file mode 100644
index 5adb1731a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Speak_response.h"
-#include "ResultMarshaller.h"
-
-#include "Speak_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool Speak_responseMarshaller::checkIntegrity(Speak_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Speak_responseMarshaller::fromString(const std::string& s,Speak_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Speak_responseMarshaller::toString(const Speak_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Speak_responseMarshaller::checkIntegrityConst(const Speak_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value Speak_responseMarshaller::toJSON(const Speak_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("Speak");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool Speak_responseMarshaller::fromJSON(const Json::Value& js,Speak_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("Speak"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_responseMarshaller.h
deleted file mode 100644
index eba715e5f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/Speak_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SPEAK_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SPEAK_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/Speak_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct Speak_responseMarshaller
-  {
-    static bool checkIntegrity(Speak_response& e);
-    static bool checkIntegrityConst(const Speak_response& e);
-  
-    static bool fromString(const std::string& s,Speak_response& e);
-    static const std::string toString(const Speak_response& e);
-  
-    static bool fromJSON(const Json::Value& s,Speak_response& e);
-    static Json::Value toJSON(const Speak_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.cpp
deleted file mode 100644
index 1ba2432a1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/SpeechCapabilities.h"
-#include "SpeechCapabilitiesMarshaller.h"
-#include "SpeechCapabilitiesMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const SpeechCapabilities::SpeechCapabilitiesInternal SpeechCapabilitiesMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return SpeechCapabilities::INVALID_ENUM;
-  const struct PerfectHashTable* p=SpeechCapabilities_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<SpeechCapabilities::SpeechCapabilitiesInternal>(p->idx) : SpeechCapabilities::INVALID_ENUM;
-}
-
-
-bool SpeechCapabilitiesMarshaller::fromJSON(const Json::Value& s,SpeechCapabilities& e)
-{
-  e.mInternal=SpeechCapabilities::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=SpeechCapabilities::INVALID_ENUM);
-}
-
-
-Json::Value SpeechCapabilitiesMarshaller::toJSON(const SpeechCapabilities& e)
-{
-  if(e.mInternal==SpeechCapabilities::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SpeechCapabilitiesMarshaller::fromString(const std::string& s,SpeechCapabilities& e)
-{
-  e.mInternal=SpeechCapabilities::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string SpeechCapabilitiesMarshaller::toString(const SpeechCapabilities& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==SpeechCapabilities::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SpeechCapabilitiesMarshaller::mHashTable[5]=
-{
-  {"TEXT",0},
-  {"SAPI_PHONEMES",1},
-  {"LHPLUS_PHONEMES",2},
-  {"PRE_RECORDED",3},
-  {"SILENCE",4}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.gp
deleted file mode 100644
index 698dc17f5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.gp
+++ /dev/null
@@ -1,21 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SpeechCapabilities_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-TEXT,0
-SAPI_PHONEMES,1
-LHPLUS_PHONEMES,2
-PRE_RECORDED,3
-SILENCE,4
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.h
deleted file mode 100644
index cd40bc5fc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SPEECHCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SPEECHCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SpeechCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for SpeechCapabilities
-
-  class SpeechCapabilitiesMarshaller
-  {
-  public:
-  
-    static std::string toName(const SpeechCapabilities& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(SpeechCapabilities& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=SpeechCapabilities::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(SpeechCapabilities& e)		{ return e.mInternal!=SpeechCapabilities::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const SpeechCapabilities& e)	{ return e.mInternal!=SpeechCapabilities::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,SpeechCapabilities& e);
-    static const std::string toString(const SpeechCapabilities& e);
-  
-    static bool fromJSON(const Json::Value& s,SpeechCapabilities& e);
-    static Json::Value toJSON(const SpeechCapabilities& e);
-  
-    static const char* getName(SpeechCapabilities::SpeechCapabilitiesInternal e)
-    {
-       return (e>=0 && e<5) ? mHashTable[e].name : NULL;
-    }
-  
-    static const SpeechCapabilities::SpeechCapabilitiesInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[5];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.inc
deleted file mode 100644
index f58916b3e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright (c) 2013 Ford Motor Company */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 5
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 15
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 15
-/* maximum key range = 12, duplicates = 0 */
-
-class SpeechCapabilities_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-SpeechCapabilities_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-SpeechCapabilities_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  0,  0,  7,  0,  0,  0,  0, 12, 13,
-       0, 15
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.gp"
-      {"TEXT",0},
-      {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.gp"
-      {"SILENCE",4},
-      {""}, {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.gp"
-      {"PRE_RECORDED",3},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.gp"
-      {"SAPI_PHONEMES",1},
-      {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SpeechCapabilitiesMarshaller.gp"
-      {"LHPLUS_PHONEMES",2}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/StartTime.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/StartTime.cpp
deleted file mode 100644
index 1e5a52af0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/StartTime.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/StartTime.h"
-#include "StartTimeMarshaller.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPC;
-
-StartTime::StartTime(const StartTime& c)
-{
-  *this=c;
-}
-
-
-bool StartTime::checkIntegrity(void)
-{
-  return StartTimeMarshaller::checkIntegrity(*this);
-}
-
-
-StartTime::StartTime(void)
-{
-}
-
-
-
-bool StartTime::set_hours(unsigned int hours_)
-{
-  if(hours_>59)  return false;
-  hours=hours_;
-  return true;
-}
-
-bool StartTime::set_minutes(unsigned int minutes_)
-{
-  if(minutes_>59)  return false;
-  minutes=minutes_;
-  return true;
-}
-
-bool StartTime::set_seconds(unsigned int seconds_)
-{
-  if(seconds_>59)  return false;
-  seconds=seconds_;
-  return true;
-}
-
-
-
-
-unsigned int StartTime::get_hours(void) const
-{
-  return hours;
-}
-
-
-unsigned int StartTime::get_minutes(void) const
-{
-  return minutes;
-}
-
-
-unsigned int StartTime::get_seconds(void) const
-{
-  return seconds;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/StartTimeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/StartTimeMarshaller.cpp
deleted file mode 100644
index 1c97f5b52..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/StartTimeMarshaller.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/StartTime.h"
-
-
-#include "StartTimeMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool StartTimeMarshaller::checkIntegrity(StartTime& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool StartTimeMarshaller::fromString(const std::string& s,StartTime& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string StartTimeMarshaller::toString(const StartTime& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool StartTimeMarshaller::checkIntegrityConst(const StartTime& s)
-{
-  if(s.hours>59)  return false;
-  if(s.minutes>59)  return false;
-  if(s.seconds>59)  return false;
-  return true;
-}
-
-Json::Value StartTimeMarshaller::toJSON(const StartTime& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["hours"]=Json::Value(e.hours);
-
-  json["minutes"]=Json::Value(e.minutes);
-
-  json["seconds"]=Json::Value(e.seconds);
-
-
-  return json;
-}
-
-
-bool StartTimeMarshaller::fromJSON(const Json::Value& json,StartTime& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("hours"))  return false;
-    {
-      const Json::Value& j=json["hours"];
-      if(!j.isInt())  return false;
-      c.hours=j.asInt();
-    }
-    if(!json.isMember("minutes"))  return false;
-    {
-      const Json::Value& j=json["minutes"];
-      if(!j.isInt())  return false;
-      c.minutes=j.asInt();
-    }
-    if(!json.isMember("seconds"))  return false;
-    {
-      const Json::Value& j=json["seconds"];
-      if(!j.isInt())  return false;
-      c.seconds=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/StartTimeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/StartTimeMarshaller.h
deleted file mode 100644
index 03e9a6832..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/StartTimeMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_STARTTIMEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_STARTTIMEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/StartTime.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct StartTimeMarshaller
-  {
-    static bool checkIntegrity(StartTime& e);
-    static bool checkIntegrityConst(const StartTime& e);
-  
-    static bool fromString(const std::string& s,StartTime& e);
-    static const std::string toString(const StartTime& e);
-  
-    static bool fromJSON(const Json::Value& s,StartTime& e);
-    static Json::Value toJSON(const StartTime& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_request.cpp
deleted file mode 100644
index b6cc3dc34..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_request.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_request.h"
-#include "SubscribeButton_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "ButtonNameMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-SubscribeButton_request::~SubscribeButton_request(void)
-{
-}
-
-
-SubscribeButton_request::SubscribeButton_request(const SubscribeButton_request& c)
-{
-  *this=c;
-}
-
-
-bool SubscribeButton_request::checkIntegrity(void)
-{
-  return SubscribeButton_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SubscribeButton_request::SubscribeButton_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_SUBSCRIBEBUTTON_REQUEST)
-{
-}
-
-
-
-bool SubscribeButton_request::set_buttonName(const ButtonName& buttonName_)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(buttonName_))   return false;
-  buttonName=buttonName_;
-  return true;
-}
-
-
-
-
-const ButtonName& SubscribeButton_request::get_buttonName(void) const 
-{
-  return buttonName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_requestMarshaller.cpp
deleted file mode 100644
index f8ca51cee..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_requestMarshaller.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_request.h"
-#include "ButtonNameMarshaller.h"
-
-#include "SubscribeButton_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool SubscribeButton_requestMarshaller::checkIntegrity(SubscribeButton_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SubscribeButton_requestMarshaller::fromString(const std::string& s,SubscribeButton_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SubscribeButton_requestMarshaller::toString(const SubscribeButton_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SubscribeButton_requestMarshaller::checkIntegrityConst(const SubscribeButton_request& s)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(s.buttonName))  return false;
-  return true;
-}
-
-Json::Value SubscribeButton_requestMarshaller::toJSON(const SubscribeButton_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("SubscribeButton");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["buttonName"]=ButtonNameMarshaller::toJSON(e.buttonName);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool SubscribeButton_requestMarshaller::fromJSON(const Json::Value& js,SubscribeButton_request& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("SubscribeButton"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("buttonName"))  return false;
-    {
-      const Json::Value& j=json["buttonName"];
-      if(!ButtonNameMarshaller::fromJSON(j,c.buttonName))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_requestMarshaller.h
deleted file mode 100644
index b380b243f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SUBSCRIBEBUTTON_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SUBSCRIBEBUTTON_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct SubscribeButton_requestMarshaller
-  {
-    static bool checkIntegrity(SubscribeButton_request& e);
-    static bool checkIntegrityConst(const SubscribeButton_request& e);
-  
-    static bool fromString(const std::string& s,SubscribeButton_request& e);
-    static const std::string toString(const SubscribeButton_request& e);
-  
-    static bool fromJSON(const Json::Value& s,SubscribeButton_request& e);
-    static Json::Value toJSON(const SubscribeButton_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_response.cpp
deleted file mode 100644
index b88f16198..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_response.h"
-#include "SubscribeButton_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-SubscribeButton_response& SubscribeButton_response::operator =(const SubscribeButton_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-SubscribeButton_response::~SubscribeButton_response(void)
-{}
-
-SubscribeButton_response::SubscribeButton_response(const SubscribeButton_response& c)
-{
-    *this = c;
-}
-
-bool SubscribeButton_response::checkIntegrity(void)
-{
-    return SubscribeButton_responseMarshaller::checkIntegrity(*this);
-}
-
-SubscribeButton_response::SubscribeButton_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_SUBSCRIBEBUTTON_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_responseMarshaller.cpp
deleted file mode 100644
index 017dd93b0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_response.h"
-#include "ResultMarshaller.h"
-
-#include "SubscribeButton_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool SubscribeButton_responseMarshaller::checkIntegrity(SubscribeButton_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SubscribeButton_responseMarshaller::fromString(const std::string& s,SubscribeButton_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SubscribeButton_responseMarshaller::toString(const SubscribeButton_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SubscribeButton_responseMarshaller::checkIntegrityConst(const SubscribeButton_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value SubscribeButton_responseMarshaller::toJSON(const SubscribeButton_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("SubscribeButton");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool SubscribeButton_responseMarshaller::fromJSON(const Json::Value& js,SubscribeButton_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("SubscribeButton"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_responseMarshaller.h
deleted file mode 100644
index 102b9c6f4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SubscribeButton_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SUBSCRIBEBUTTON_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SUBSCRIBEBUTTON_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SubscribeButton_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct SubscribeButton_responseMarshaller
-  {
-    static bool checkIntegrity(SubscribeButton_response& e);
-    static bool checkIntegrityConst(const SubscribeButton_response& e);
-  
-    static bool fromString(const std::string& s,SubscribeButton_response& e);
-    static const std::string toString(const SubscribeButton_response& e);
-  
-    static bool fromJSON(const Json::Value& s,SubscribeButton_response& e);
-    static Json::Value toJSON(const SubscribeButton_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SyncMsgVersion.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SyncMsgVersion.cpp
deleted file mode 100644
index cffc86e31..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SyncMsgVersion.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SyncMsgVersion.h"
-#include "SyncMsgVersionMarshaller.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPC;
-
-SyncMsgVersion::SyncMsgVersion(const SyncMsgVersion& c)
-{
-  *this=c;
-}
-
-
-bool SyncMsgVersion::checkIntegrity(void)
-{
-  return SyncMsgVersionMarshaller::checkIntegrity(*this);
-}
-
-
-SyncMsgVersion::SyncMsgVersion(void)
-{
-}
-
-
-
-bool SyncMsgVersion::set_majorVersion(unsigned int majorVersion_)
-{
-  if(majorVersion_>1)  return false;
-  if(majorVersion_<1)  return false;
-  majorVersion=majorVersion_;
-  return true;
-}
-
-bool SyncMsgVersion::set_minorVersion(unsigned int minorVersion_)
-{
-  if(minorVersion_>1000)  return false;
-  minorVersion=minorVersion_;
-  return true;
-}
-
-
-
-
-unsigned int SyncMsgVersion::get_majorVersion(void) const
-{
-  return majorVersion;
-}
-
-
-unsigned int SyncMsgVersion::get_minorVersion(void) const
-{
-  return minorVersion;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SyncMsgVersionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SyncMsgVersionMarshaller.cpp
deleted file mode 100644
index a76cdfbad..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SyncMsgVersionMarshaller.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SyncMsgVersion.h"
-
-
-#include "SyncMsgVersionMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool SyncMsgVersionMarshaller::checkIntegrity(SyncMsgVersion& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SyncMsgVersionMarshaller::fromString(const std::string& s,SyncMsgVersion& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SyncMsgVersionMarshaller::toString(const SyncMsgVersion& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SyncMsgVersionMarshaller::checkIntegrityConst(const SyncMsgVersion& s)
-{
-  if(s.majorVersion>1)  return false;
-  if(s.majorVersion<1)  return false;
-  if(s.minorVersion>1000)  return false;
-  return true;
-}
-
-Json::Value SyncMsgVersionMarshaller::toJSON(const SyncMsgVersion& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["majorVersion"]=Json::Value(e.majorVersion);
-
-  json["minorVersion"]=Json::Value(e.minorVersion);
-
-
-  return json;
-}
-
-
-bool SyncMsgVersionMarshaller::fromJSON(const Json::Value& json,SyncMsgVersion& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("majorVersion"))  return false;
-    {
-      const Json::Value& j=json["majorVersion"];
-      if(!j.isInt())  return false;
-      c.majorVersion=j.asInt();
-    }
-    if(!json.isMember("minorVersion"))  return false;
-    {
-      const Json::Value& j=json["minorVersion"];
-      if(!j.isInt())  return false;
-      c.minorVersion=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SyncMsgVersionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SyncMsgVersionMarshaller.h
deleted file mode 100644
index c681bf2c1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SyncMsgVersionMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SYNCMSGVERSIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SYNCMSGVERSIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SyncMsgVersion.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct SyncMsgVersionMarshaller
-  {
-    static bool checkIntegrity(SyncMsgVersion& e);
-    static bool checkIntegrityConst(const SyncMsgVersion& e);
-  
-    static bool fromString(const std::string& s,SyncMsgVersion& e);
-    static const std::string toString(const SyncMsgVersion& e);
-  
-    static bool fromJSON(const Json::Value& s,SyncMsgVersion& e);
-    static Json::Value toJSON(const SyncMsgVersion& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.cpp
deleted file mode 100644
index 77ba41464..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/SystemContext.h"
-#include "SystemContextMarshaller.h"
-#include "SystemContextMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const SystemContext::SystemContextInternal SystemContextMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return SystemContext::INVALID_ENUM;
-  const struct PerfectHashTable* p=SystemContext_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<SystemContext::SystemContextInternal>(p->idx) : SystemContext::INVALID_ENUM;
-}
-
-
-bool SystemContextMarshaller::fromJSON(const Json::Value& s,SystemContext& e)
-{
-  e.mInternal=SystemContext::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=SystemContext::INVALID_ENUM);
-}
-
-
-Json::Value SystemContextMarshaller::toJSON(const SystemContext& e)
-{
-  if(e.mInternal==SystemContext::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SystemContextMarshaller::fromString(const std::string& s,SystemContext& e)
-{
-  e.mInternal=SystemContext::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string SystemContextMarshaller::toString(const SystemContext& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==SystemContext::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SystemContextMarshaller::mHashTable[3]=
-{
-  {"MAIN",0},
-  {"VRSESSION",1},
-  {"MENU",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.gp
deleted file mode 100644
index cb2be4d05..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SystemContext_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-MAIN,0
-VRSESSION,1
-MENU,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.h
deleted file mode 100644
index f5b876cb0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_SYSTEMCONTEXTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_SYSTEMCONTEXTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/SystemContext.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for SystemContext
-
-  class SystemContextMarshaller
-  {
-  public:
-  
-    static std::string toName(const SystemContext& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(SystemContext& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=SystemContext::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(SystemContext& e)		{ return e.mInternal!=SystemContext::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const SystemContext& e)	{ return e.mInternal!=SystemContext::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,SystemContext& e);
-    static const std::string toString(const SystemContext& e);
-  
-    static bool fromJSON(const Json::Value& s,SystemContext& e);
-    static Json::Value toJSON(const SystemContext& e);
-  
-    static const char* getName(SystemContext::SystemContextInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const SystemContext::SystemContextInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.inc
deleted file mode 100644
index ef72360c5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.inc
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.gp  */
-/* Computed positions: -k'2' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 9
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 9
-/* maximum key range = 6, duplicates = 0 */
-
-class SystemContext_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-SystemContext_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10, 1,10,10,10, 0,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10, 0,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10,10,10,10,10,
-     10,10,10,10,10,10
-    };
-  return len + asso_values[(unsigned char)str[1]];
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-SystemContext_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  4,  0,  0,  0,  9
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.gp"
-      {"MENU",2},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.gp"
-      {"MAIN",0},
-      {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/SystemContextMarshaller.gp"
-      {"VRSESSION",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.cpp
deleted file mode 100644
index dacf604fd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/TBTState.h"
-#include "TBTStateMarshaller.h"
-#include "TBTStateMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const TBTState::TBTStateInternal TBTStateMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return TBTState::INVALID_ENUM;
-  const struct PerfectHashTable* p=TBTState_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<TBTState::TBTStateInternal>(p->idx) : TBTState::INVALID_ENUM;
-}
-
-
-bool TBTStateMarshaller::fromJSON(const Json::Value& s,TBTState& e)
-{
-  e.mInternal=TBTState::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=TBTState::INVALID_ENUM);
-}
-
-
-Json::Value TBTStateMarshaller::toJSON(const TBTState& e)
-{
-  if(e.mInternal==TBTState::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TBTStateMarshaller::fromString(const std::string& s,TBTState& e)
-{
-  e.mInternal=TBTState::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string TBTStateMarshaller::toString(const TBTState& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==TBTState::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TBTStateMarshaller::mHashTable[4]=
-{
-  {"ROUTE_UPDATE_REQUEST",0},
-  {"ROUTE_ACCEPTED",1},
-  {"ROUTE_REFUSED",2},
-  {"ROUTE_CANCELLED",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.gp
deleted file mode 100644
index ed99cb0b2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TBTState_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-ROUTE_UPDATE_REQUEST,0
-ROUTE_ACCEPTED,1
-ROUTE_REFUSED,2
-ROUTE_CANCELLED,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.h
deleted file mode 100644
index b4703eae7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_TBTSTATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_TBTSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/TBTState.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for TBTState
-
-  class TBTStateMarshaller
-  {
-  public:
-  
-    static std::string toName(const TBTState& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(TBTState& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=TBTState::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(TBTState& e)		{ return e.mInternal!=TBTState::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const TBTState& e)	{ return e.mInternal!=TBTState::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,TBTState& e);
-    static const std::string toString(const TBTState& e);
-  
-    static bool fromJSON(const Json::Value& s,TBTState& e);
-    static Json::Value toJSON(const TBTState& e);
-  
-    static const char* getName(TBTState::TBTStateInternal e)
-    {
-       return (e>=0 && e<4) ? mHashTable[e].name : NULL;
-    }
-  
-    static const TBTState::TBTStateInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[4];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.inc
deleted file mode 100644
index 7d5db48d6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.inc
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 13
-#define MAX_WORD_LENGTH 20
-#define MIN_HASH_VALUE 13
-#define MAX_HASH_VALUE 20
-/* maximum key range = 8, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPC {
-
-class TBTState_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-TBTState_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-TBTState_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 13,
-      14, 15,  0,  0,  0,  0, 20
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.gp"
-      {"ROUTE_REFUSED",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.gp"
-      {"ROUTE_ACCEPTED",1},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.gp"
-      {"ROUTE_CANCELLED",3},
-      {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TBTStateMarshaller.gp"
-      {"ROUTE_UPDATE_REQUEST",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TTSChunk.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TTSChunk.cpp
deleted file mode 100644
index caaa3c7d5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TTSChunk.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/TTSChunk.h"
-#include "TTSChunkMarshaller.h"
-#include "SpeechCapabilitiesMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPC;
-
-TTSChunk::TTSChunk(const TTSChunk& c)
-{
-  *this=c;
-}
-
-
-bool TTSChunk::checkIntegrity(void)
-{
-  return TTSChunkMarshaller::checkIntegrity(*this);
-}
-
-
-TTSChunk::TTSChunk(void)
-{
-}
-
-
-
-bool TTSChunk::set_text(const std::string& text_)
-{
-  if(text_.length()>500)  return false;
-  text=text_;
-  return true;
-}
-
-bool TTSChunk::set_type(const SpeechCapabilities& type_)
-{
-  if(!SpeechCapabilitiesMarshaller::checkIntegrityConst(type_))   return false;
-  type=type_;
-  return true;
-}
-
-
-
-
-const std::string& TTSChunk::get_text(void) const 
-{
-  return text;
-}
-
-
-const SpeechCapabilities& TTSChunk::get_type(void) const 
-{
-  return type;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TTSChunkMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TTSChunkMarshaller.cpp
deleted file mode 100644
index e11e7716b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TTSChunkMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/TTSChunk.h"
-#include "SpeechCapabilitiesMarshaller.h"
-
-#include "TTSChunkMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool TTSChunkMarshaller::checkIntegrity(TTSChunk& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool TTSChunkMarshaller::fromString(const std::string& s,TTSChunk& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string TTSChunkMarshaller::toString(const TTSChunk& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool TTSChunkMarshaller::checkIntegrityConst(const TTSChunk& s)
-{
-  if(s.text.length()>500)  return false;
-  if(!SpeechCapabilitiesMarshaller::checkIntegrityConst(s.type))  return false;
-  return true;
-}
-
-Json::Value TTSChunkMarshaller::toJSON(const TTSChunk& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["text"]=Json::Value(e.text);
-
-  json["type"]=SpeechCapabilitiesMarshaller::toJSON(e.type);
-
-
-  return json;
-}
-
-
-bool TTSChunkMarshaller::fromJSON(const Json::Value& json,TTSChunk& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("text"))  return false;
-    {
-      const Json::Value& j=json["text"];
-      if(!j.isString())  return false;
-      c.text=j.asString();
-    }
-    if(!json.isMember("type"))  return false;
-    {
-      const Json::Value& j=json["type"];
-      if(!SpeechCapabilitiesMarshaller::fromJSON(j,c.type))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TTSChunkMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TTSChunkMarshaller.h
deleted file mode 100644
index f1f7e5ea2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TTSChunkMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_TTSCHUNKMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_TTSCHUNKMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/TTSChunk.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct TTSChunkMarshaller
-  {
-    static bool checkIntegrity(TTSChunk& e);
-    static bool checkIntegrityConst(const TTSChunk& e);
-  
-    static bool fromString(const std::string& s,TTSChunk& e);
-    static const std::string toString(const TTSChunk& e);
-  
-    static bool fromJSON(const Json::Value& s,TTSChunk& e);
-    static Json::Value toJSON(const TTSChunk& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.cpp
deleted file mode 100644
index 05ce153f1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/TextAlignment.h"
-#include "TextAlignmentMarshaller.h"
-#include "TextAlignmentMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const TextAlignment::TextAlignmentInternal TextAlignmentMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return TextAlignment::INVALID_ENUM;
-  const struct PerfectHashTable* p=TextAlignment_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<TextAlignment::TextAlignmentInternal>(p->idx) : TextAlignment::INVALID_ENUM;
-}
-
-
-bool TextAlignmentMarshaller::fromJSON(const Json::Value& s,TextAlignment& e)
-{
-  e.mInternal=TextAlignment::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=TextAlignment::INVALID_ENUM);
-}
-
-
-Json::Value TextAlignmentMarshaller::toJSON(const TextAlignment& e)
-{
-  if(e.mInternal==TextAlignment::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TextAlignmentMarshaller::fromString(const std::string& s,TextAlignment& e)
-{
-  e.mInternal=TextAlignment::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string TextAlignmentMarshaller::toString(const TextAlignment& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==TextAlignment::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TextAlignmentMarshaller::mHashTable[3]=
-{
-  {"LEFT_ALIGNED",0},
-  {"RIGHT_ALIGNED",1},
-  {"CENTERED",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.gp
deleted file mode 100644
index 77f3f9eb1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TextAlignment_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-LEFT_ALIGNED,0
-RIGHT_ALIGNED,1
-CENTERED,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.h
deleted file mode 100644
index d2fe2292d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_TEXTALIGNMENTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_TEXTALIGNMENTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/TextAlignment.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for TextAlignment
-
-  class TextAlignmentMarshaller
-  {
-  public:
-  
-    static std::string toName(const TextAlignment& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(TextAlignment& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=TextAlignment::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(TextAlignment& e)		{ return e.mInternal!=TextAlignment::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const TextAlignment& e)	{ return e.mInternal!=TextAlignment::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,TextAlignment& e);
-    static const std::string toString(const TextAlignment& e);
-  
-    static bool fromJSON(const Json::Value& s,TextAlignment& e);
-    static Json::Value toJSON(const TextAlignment& e);
-  
-    static const char* getName(TextAlignment::TextAlignmentInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const TextAlignment::TextAlignmentInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.inc
deleted file mode 100644
index cbcf7fa11..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 8
-#define MAX_WORD_LENGTH 13
-#define MIN_HASH_VALUE 8
-#define MAX_HASH_VALUE 13
-/* maximum key range = 6, duplicates = 0 */
-
-class TextAlignment_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-TextAlignment_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-TextAlignment_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0, 12, 13
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.gp"
-      {"CENTERED",2},
-      {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.gp"
-      {"LEFT_ALIGNED",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextAlignmentMarshaller.gp"
-      {"RIGHT_ALIGNED",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextField.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextField.cpp
deleted file mode 100644
index 6ddf20c4f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextField.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/TextField.h"
-#include "TextFieldMarshaller.h"
-#include "CharacterSetMarshaller.h"
-#include "TextFieldNameMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPC;
-
-TextField::TextField(const TextField& c)
-{
-  *this=c;
-}
-
-
-bool TextField::checkIntegrity(void)
-{
-  return TextFieldMarshaller::checkIntegrity(*this);
-}
-
-
-TextField::TextField(void)
-{
-}
-
-
-
-bool TextField::set_characterSet(const CharacterSet& characterSet_)
-{
-  if(!CharacterSetMarshaller::checkIntegrityConst(characterSet_))   return false;
-  characterSet=characterSet_;
-  return true;
-}
-
-bool TextField::set_name(const TextFieldName& name_)
-{
-  if(!TextFieldNameMarshaller::checkIntegrityConst(name_))   return false;
-  name=name_;
-  return true;
-}
-
-bool TextField::set_rows(unsigned int rows_)
-{
-  if(rows_>3)  return false;
-  if(rows_<1)  return false;
-  rows=rows_;
-  return true;
-}
-
-bool TextField::set_width(unsigned int width_)
-{
-  if(width_>40)  return false;
-  if(width_<1)  return false;
-  width=width_;
-  return true;
-}
-
-
-
-
-const CharacterSet& TextField::get_characterSet(void) const 
-{
-  return characterSet;
-}
-
-
-const TextFieldName& TextField::get_name(void) const 
-{
-  return name;
-}
-
-
-unsigned int TextField::get_rows(void) const
-{
-  return rows;
-}
-
-
-unsigned int TextField::get_width(void) const
-{
-  return width;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldMarshaller.cpp
deleted file mode 100644
index a643250cb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldMarshaller.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/TextField.h"
-#include "CharacterSetMarshaller.h"
-#include "TextFieldNameMarshaller.h"
-
-#include "TextFieldMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool TextFieldMarshaller::checkIntegrity(TextField& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool TextFieldMarshaller::fromString(const std::string& s,TextField& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string TextFieldMarshaller::toString(const TextField& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool TextFieldMarshaller::checkIntegrityConst(const TextField& s)
-{
-  if(!CharacterSetMarshaller::checkIntegrityConst(s.characterSet))  return false;
-  if(!TextFieldNameMarshaller::checkIntegrityConst(s.name))  return false;
-  if(s.rows>3)  return false;
-  if(s.rows<1)  return false;
-  if(s.width>40)  return false;
-  if(s.width<1)  return false;
-  return true;
-}
-
-Json::Value TextFieldMarshaller::toJSON(const TextField& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["characterSet"]=CharacterSetMarshaller::toJSON(e.characterSet);
-
-  json["name"]=TextFieldNameMarshaller::toJSON(e.name);
-
-  json["rows"]=Json::Value(e.rows);
-
-  json["width"]=Json::Value(e.width);
-
-
-  return json;
-}
-
-
-bool TextFieldMarshaller::fromJSON(const Json::Value& json,TextField& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("characterSet"))  return false;
-    {
-      const Json::Value& j=json["characterSet"];
-      if(!CharacterSetMarshaller::fromJSON(j,c.characterSet))
-        return false;
-    }
-    if(!json.isMember("name"))  return false;
-    {
-      const Json::Value& j=json["name"];
-      if(!TextFieldNameMarshaller::fromJSON(j,c.name))
-        return false;
-    }
-    if(!json.isMember("rows"))  return false;
-    {
-      const Json::Value& j=json["rows"];
-      if(!j.isInt())  return false;
-      c.rows=j.asInt();
-    }
-    if(!json.isMember("width"))  return false;
-    {
-      const Json::Value& j=json["width"];
-      if(!j.isInt())  return false;
-      c.width=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldMarshaller.h
deleted file mode 100644
index 7631d6eb4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_TEXTFIELDMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_TEXTFIELDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/TextField.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct TextFieldMarshaller
-  {
-    static bool checkIntegrity(TextField& e);
-    static bool checkIntegrityConst(const TextField& e);
-  
-    static bool fromString(const std::string& s,TextField& e);
-    static const std::string toString(const TextField& e);
-  
-    static bool fromJSON(const Json::Value& s,TextField& e);
-    static Json::Value toJSON(const TextField& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.cpp
deleted file mode 100644
index 1494eee2b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/TextFieldName.h"
-#include "TextFieldNameMarshaller.h"
-#include "TextFieldNameMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const TextFieldName::TextFieldNameInternal TextFieldNameMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return TextFieldName::INVALID_ENUM;
-  const struct PerfectHashTable* p=TextFieldName_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<TextFieldName::TextFieldNameInternal>(p->idx) : TextFieldName::INVALID_ENUM;
-}
-
-
-bool TextFieldNameMarshaller::fromJSON(const Json::Value& s,TextFieldName& e)
-{
-  e.mInternal=TextFieldName::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=TextFieldName::INVALID_ENUM);
-}
-
-
-Json::Value TextFieldNameMarshaller::toJSON(const TextFieldName& e)
-{
-  if(e.mInternal==TextFieldName::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TextFieldNameMarshaller::fromString(const std::string& s,TextFieldName& e)
-{
-  e.mInternal=TextFieldName::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string TextFieldNameMarshaller::toString(const TextFieldName& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==TextFieldName::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TextFieldNameMarshaller::mHashTable[7]=
-{
-  {"mainField1",0},
-  {"mainField2",1},
-  {"statusBar",2},
-  {"mediaClock",3},
-  {"mediaTrack",4},
-  {"alertText1",5},
-  {"alertText2",6}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.gp
deleted file mode 100644
index 001026e5e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.gp
+++ /dev/null
@@ -1,23 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TextFieldName_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-mainField1,0
-mainField2,1
-statusBar,2
-mediaClock,3
-mediaTrack,4
-alertText1,5
-alertText2,6
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.h
deleted file mode 100644
index 37b070a9c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_TEXTFIELDNAMEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_TEXTFIELDNAMEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/TextFieldName.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for TextFieldName
-
-  class TextFieldNameMarshaller
-  {
-  public:
-  
-    static std::string toName(const TextFieldName& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(TextFieldName& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=TextFieldName::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(TextFieldName& e)		{ return e.mInternal!=TextFieldName::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const TextFieldName& e)	{ return e.mInternal!=TextFieldName::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,TextFieldName& e);
-    static const std::string toString(const TextFieldName& e);
-  
-    static bool fromJSON(const Json::Value& s,TextFieldName& e);
-    static Json::Value toJSON(const TextFieldName& e);
-  
-    static const char* getName(TextFieldName::TextFieldNameInternal e)
-    {
-       return (e>=0 && e<7) ? mHashTable[e].name : NULL;
-    }
-  
-    static const TextFieldName::TextFieldNameInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[7];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.inc
deleted file mode 100644
index 5512b621d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.inc
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.gp  */
-/* Computed positions: -k'8,10' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 7
-#define MIN_WORD_LENGTH 9
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 9
-#define MAX_HASH_VALUE 19
-/* maximum key range = 11, duplicates = 0 */
-
-class TextFieldName_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-TextFieldName_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20,  2,
-       0, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20,  0, 20, 20,
-      20, 20, 20, 20, 20, 20, 20,  4,  5, 20,
-      20,  5, 20, 20, 20, 20, 20, 20, 20, 20,
-       0, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[9]];
-      /*FALLTHROUGH*/
-      case 9:
-      case 8:
-        hval += asso_values[(unsigned char)str[7]];
-        break;
-    }
-  return hval;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-TextFieldName_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  9, 10,  0, 10,  0,
-      10, 10,  0, 10,  0, 10
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.gp"
-      {"statusBar",2},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.gp"
-      {"alertText2",6},
-      {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.gp"
-      {"alertText1",5},
-      {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.gp"
-      {"mediaTrack",4},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.gp"
-      {"mainField2",1},
-      {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.gp"
-      {"mainField1",0},
-      {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TextFieldNameMarshaller.gp"
-      {"mediaClock",3}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.cpp
deleted file mode 100644
index 475f62be4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/TriggerSource.h"
-#include "TriggerSourceMarshaller.h"
-#include "TriggerSourceMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const TriggerSource::TriggerSourceInternal TriggerSourceMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return TriggerSource::INVALID_ENUM;
-  const struct PerfectHashTable* p=TriggerSource_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<TriggerSource::TriggerSourceInternal>(p->idx) : TriggerSource::INVALID_ENUM;
-}
-
-
-bool TriggerSourceMarshaller::fromJSON(const Json::Value& s,TriggerSource& e)
-{
-  e.mInternal=TriggerSource::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=TriggerSource::INVALID_ENUM);
-}
-
-
-Json::Value TriggerSourceMarshaller::toJSON(const TriggerSource& e)
-{
-  if(e.mInternal==TriggerSource::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TriggerSourceMarshaller::fromString(const std::string& s,TriggerSource& e)
-{
-  e.mInternal=TriggerSource::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string TriggerSourceMarshaller::toString(const TriggerSource& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==TriggerSource::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TriggerSourceMarshaller::mHashTable[2]=
-{
-  {"MENU",0},
-  {"VR",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.gp
deleted file mode 100644
index b0dc33dd6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TriggerSource_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-MENU,0
-VR,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.h
deleted file mode 100644
index 3ea49c31b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_TRIGGERSOURCEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_TRIGGERSOURCEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/TriggerSource.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for TriggerSource
-
-  class TriggerSourceMarshaller
-  {
-  public:
-  
-    static std::string toName(const TriggerSource& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(TriggerSource& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=TriggerSource::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(TriggerSource& e)		{ return e.mInternal!=TriggerSource::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const TriggerSource& e)	{ return e.mInternal!=TriggerSource::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,TriggerSource& e);
-    static const std::string toString(const TriggerSource& e);
-  
-    static bool fromJSON(const Json::Value& s,TriggerSource& e);
-    static Json::Value toJSON(const TriggerSource& e);
-  
-    static const char* getName(TriggerSource::TriggerSourceInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const TriggerSource::TriggerSourceInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.inc
deleted file mode 100644
index 8ae6d4f0e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 4
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 4
-/* maximum key range = 3, duplicates = 0 */
-
-class TriggerSource_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-TriggerSource_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-TriggerSource_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  2,  0,  4
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.gp"
-      {"VR",1},
-      {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/TriggerSourceMarshaller.gp"
-      {"MENU",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_request.cpp
deleted file mode 100644
index 7b09ec2ac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_request.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_request.h"
-#include "UnregisterAppInterface_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-UnregisterAppInterface_request::~UnregisterAppInterface_request(void)
-{
-}
-
-
-UnregisterAppInterface_request::UnregisterAppInterface_request(const UnregisterAppInterface_request& c)
-{
-  *this=c;
-}
-
-
-bool UnregisterAppInterface_request::checkIntegrity(void)
-{
-  return UnregisterAppInterface_requestMarshaller::checkIntegrity(*this);
-}
-
-
-UnregisterAppInterface_request::UnregisterAppInterface_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_UNREGISTERAPPINTERFACE_REQUEST)
-{
-}
-
-
-
-
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_requestMarshaller.cpp
deleted file mode 100644
index 649d630b3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_requestMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_request.h"
-
-
-#include "UnregisterAppInterface_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool UnregisterAppInterface_requestMarshaller::checkIntegrity(UnregisterAppInterface_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UnregisterAppInterface_requestMarshaller::fromString(const std::string& s,UnregisterAppInterface_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UnregisterAppInterface_requestMarshaller::toString(const UnregisterAppInterface_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnregisterAppInterface_requestMarshaller::checkIntegrityConst(const UnregisterAppInterface_request& s)
-{
-  return true;
-}
-
-Json::Value UnregisterAppInterface_requestMarshaller::toJSON(const UnregisterAppInterface_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("UnregisterAppInterface");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool UnregisterAppInterface_requestMarshaller::fromJSON(const Json::Value& js,UnregisterAppInterface_request& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("UnregisterAppInterface"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_requestMarshaller.h
deleted file mode 100644
index e0edad192..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_UNREGISTERAPPINTERFACE_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_UNREGISTERAPPINTERFACE_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct UnregisterAppInterface_requestMarshaller
-  {
-    static bool checkIntegrity(UnregisterAppInterface_request& e);
-    static bool checkIntegrityConst(const UnregisterAppInterface_request& e);
-  
-    static bool fromString(const std::string& s,UnregisterAppInterface_request& e);
-    static const std::string toString(const UnregisterAppInterface_request& e);
-  
-    static bool fromJSON(const Json::Value& s,UnregisterAppInterface_request& e);
-    static Json::Value toJSON(const UnregisterAppInterface_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_response.cpp
deleted file mode 100644
index d9806e3c6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_response.h"
-#include "UnregisterAppInterface_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-UnregisterAppInterface_response& UnregisterAppInterface_response::operator =(const UnregisterAppInterface_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-UnregisterAppInterface_response::~UnregisterAppInterface_response(void)
-{}
-
-UnregisterAppInterface_response::UnregisterAppInterface_response(const UnregisterAppInterface_response& c)
-{
-    *this = c;
-}
-
-bool UnregisterAppInterface_response::checkIntegrity(void)
-{
-    return UnregisterAppInterface_responseMarshaller::checkIntegrity(*this);
-}
-
-UnregisterAppInterface_response::UnregisterAppInterface_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_UNREGISTERAPPINTERFACE_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_responseMarshaller.cpp
deleted file mode 100644
index 8232e9d76..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_response.h"
-#include "ResultMarshaller.h"
-
-#include "UnregisterAppInterface_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool UnregisterAppInterface_responseMarshaller::checkIntegrity(UnregisterAppInterface_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UnregisterAppInterface_responseMarshaller::fromString(const std::string& s,UnregisterAppInterface_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UnregisterAppInterface_responseMarshaller::toString(const UnregisterAppInterface_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnregisterAppInterface_responseMarshaller::checkIntegrityConst(const UnregisterAppInterface_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value UnregisterAppInterface_responseMarshaller::toJSON(const UnregisterAppInterface_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("UnregisterAppInterface");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool UnregisterAppInterface_responseMarshaller::fromJSON(const Json::Value& js,UnregisterAppInterface_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("UnregisterAppInterface"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_responseMarshaller.h
deleted file mode 100644
index 794a2d4e0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnregisterAppInterface_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_UNREGISTERAPPINTERFACE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_UNREGISTERAPPINTERFACE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnregisterAppInterface_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct UnregisterAppInterface_responseMarshaller
-  {
-    static bool checkIntegrity(UnregisterAppInterface_response& e);
-    static bool checkIntegrityConst(const UnregisterAppInterface_response& e);
-  
-    static bool fromString(const std::string& s,UnregisterAppInterface_response& e);
-    static const std::string toString(const UnregisterAppInterface_response& e);
-  
-    static bool fromJSON(const Json::Value& s,UnregisterAppInterface_response& e);
-    static Json::Value toJSON(const UnregisterAppInterface_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_request.cpp
deleted file mode 100644
index 93ca7a7e8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_request.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_request.h"
-#include "UnsubscribeButton_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-#include "ButtonNameMarshaller.h"
-
-#define PROTOCOL_VERSION	1
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-UnsubscribeButton_request::~UnsubscribeButton_request(void)
-{
-}
-
-
-UnsubscribeButton_request::UnsubscribeButton_request(const UnsubscribeButton_request& c)
-{
-  *this=c;
-}
-
-
-bool UnsubscribeButton_request::checkIntegrity(void)
-{
-  return UnsubscribeButton_requestMarshaller::checkIntegrity(*this);
-}
-
-
-UnsubscribeButton_request::UnsubscribeButton_request(void) : SDLRPCRequest(PROTOCOL_VERSION,Marshaller::METHOD_UNSUBSCRIBEBUTTON_REQUEST)
-{
-}
-
-
-
-bool UnsubscribeButton_request::set_buttonName(const ButtonName& buttonName_)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(buttonName_))   return false;
-  buttonName=buttonName_;
-  return true;
-}
-
-
-
-
-const ButtonName& UnsubscribeButton_request::get_buttonName(void) const 
-{
-  return buttonName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_requestMarshaller.cpp
deleted file mode 100644
index 9b5145877..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_requestMarshaller.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_request.h"
-#include "ButtonNameMarshaller.h"
-
-#include "UnsubscribeButton_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool UnsubscribeButton_requestMarshaller::checkIntegrity(UnsubscribeButton_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UnsubscribeButton_requestMarshaller::fromString(const std::string& s,UnsubscribeButton_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UnsubscribeButton_requestMarshaller::toString(const UnsubscribeButton_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnsubscribeButton_requestMarshaller::checkIntegrityConst(const UnsubscribeButton_request& s)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(s.buttonName))  return false;
-  return true;
-}
-
-Json::Value UnsubscribeButton_requestMarshaller::toJSON(const UnsubscribeButton_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["request"]=Json::Value(Json::objectValue);
-  json["request"]["name"]=Json::Value("UnsubscribeButton");
-  json["request"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["buttonName"]=ButtonNameMarshaller::toJSON(e.buttonName);
-
-  json["request"]["parameters"]=j;
-  return json;
-}
-
-
-bool UnsubscribeButton_requestMarshaller::fromJSON(const Json::Value& js,UnsubscribeButton_request& c)
-{
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("request"))  return false;
-
-    if(!js["request"].isObject())  return false;
-    const Json::Value& j2=js["request"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("UnsubscribeButton"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("buttonName"))  return false;
-    {
-      const Json::Value& j=json["buttonName"];
-      if(!ButtonNameMarshaller::fromJSON(j,c.buttonName))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_requestMarshaller.h
deleted file mode 100644
index b79b9486e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_UNSUBSCRIBEBUTTON_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_UNSUBSCRIBEBUTTON_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct UnsubscribeButton_requestMarshaller
-  {
-    static bool checkIntegrity(UnsubscribeButton_request& e);
-    static bool checkIntegrityConst(const UnsubscribeButton_request& e);
-  
-    static bool fromString(const std::string& s,UnsubscribeButton_request& e);
-    static const std::string toString(const UnsubscribeButton_request& e);
-  
-    static bool fromJSON(const Json::Value& s,UnsubscribeButton_request& e);
-    static Json::Value toJSON(const UnsubscribeButton_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_response.cpp
deleted file mode 100644
index 22d8b3553..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_response.h"
-#include "UnsubscribeButton_responseMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V1/Marshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   1.2
-  date      2011-05-17
-  generated at  Thu Jan 24 06:36:21 2013
-  source stamp  Thu Jan 24 06:35:34 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-UnsubscribeButton_response& UnsubscribeButton_response::operator =(const UnsubscribeButton_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-UnsubscribeButton_response::~UnsubscribeButton_response(void)
-{}
-
-UnsubscribeButton_response::UnsubscribeButton_response(const UnsubscribeButton_response& c)
-{
-    *this = c;
-}
-
-bool UnsubscribeButton_response::checkIntegrity(void)
-{
-    return UnsubscribeButton_responseMarshaller::checkIntegrity(*this);
-}
-
-UnsubscribeButton_response::UnsubscribeButton_response(void)
-    : SDLRPCResponse(PROTOCOL_VERSION, Marshaller::METHOD_UNSUBSCRIBEBUTTON_RESPONSE)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_responseMarshaller.cpp
deleted file mode 100644
index 01bd77002..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_responseMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_response.h"
-#include "ResultMarshaller.h"
-
-#include "UnsubscribeButton_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-bool UnsubscribeButton_responseMarshaller::checkIntegrity(UnsubscribeButton_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UnsubscribeButton_responseMarshaller::fromString(const std::string& s,UnsubscribeButton_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UnsubscribeButton_responseMarshaller::toString(const UnsubscribeButton_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnsubscribeButton_responseMarshaller::checkIntegrityConst(const UnsubscribeButton_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(static_cast<NsSmartDeviceLinkRPCV2::Result>(s.resultCode)))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value UnsubscribeButton_responseMarshaller::toJSON(const UnsubscribeButton_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["response"]=Json::Value(Json::objectValue);
-  json["response"]["name"]=Json::Value("UnsubscribeButton");
-  json["response"]["correlationID"]=Json::Value(e.getCorrelationID());
-
-  Json::Value j=Json::Value(Json::objectValue);
-
-  j["success"]=Json::Value(e.success);
-
-  j["resultCode"]=ResultMarshaller::toJSON(static_cast<NsSmartDeviceLinkRPCV2::Result>(e.resultCode));
-
-  if(e.info)
-    j["info"]=Json::Value(*e.info);
-
-  json["response"]["parameters"]=j;
-  return json;
-}
-
-
-bool UnsubscribeButton_responseMarshaller::fromJSON(const Json::Value& js,UnsubscribeButton_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!js.isObject())  return false;
-
-    if(!js.isMember("response"))  return false;
-
-    if(!js["response"].isObject())  return false;
-    const Json::Value& j2=js["response"];
-
-    if(!j2.isMember("name") || !j2["name"].isString() || j2["name"].asString().compare("UnsubscribeButton"))  return false;
-    if(!j2.isMember("correlationID") || !j2["correlationID"].isInt())  return false;
-    c.setCorrelationID(j2["correlationID"].asInt());
-
-    if(!j2.isMember("parameters"))  return false;
-    const Json::Value& json=j2["parameters"];
-    if(!json.isObject())  return false;
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      NsSmartDeviceLinkRPC::Result result = static_cast<NsSmartDeviceLinkRPC::Result>(c.resultCode);
-      if(!ResultMarshaller::fromJSON(j, result))
-        return false;
-      c.resultCode = static_cast<NsSmartDeviceLinkRPCV2::Result>(result);
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_responseMarshaller.h
deleted file mode 100644
index 7d620850d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UnsubscribeButton_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_UNSUBSCRIBEBUTTON_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_UNSUBSCRIBEBUTTON_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UnsubscribeButton_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-  struct UnsubscribeButton_responseMarshaller
-  {
-    static bool checkIntegrity(UnsubscribeButton_response& e);
-    static bool checkIntegrityConst(const UnsubscribeButton_response& e);
-  
-    static bool fromString(const std::string& s,UnsubscribeButton_response& e);
-    static const std::string toString(const UnsubscribeButton_response& e);
-  
-    static bool fromJSON(const Json::Value& s,UnsubscribeButton_response& e);
-    static Json::Value toJSON(const UnsubscribeButton_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.cpp
deleted file mode 100644
index 564b9f833..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/UpdateMode.h"
-#include "UpdateModeMarshaller.h"
-#include "UpdateModeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const UpdateMode::UpdateModeInternal UpdateModeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return UpdateMode::INVALID_ENUM;
-  const struct PerfectHashTable* p=UpdateMode_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<UpdateMode::UpdateModeInternal>(p->idx) : UpdateMode::INVALID_ENUM;
-}
-
-
-bool UpdateModeMarshaller::fromJSON(const Json::Value& s,UpdateMode& e)
-{
-  e.mInternal=UpdateMode::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=UpdateMode::INVALID_ENUM);
-}
-
-
-Json::Value UpdateModeMarshaller::toJSON(const UpdateMode& e)
-{
-  if(e.mInternal==UpdateMode::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool UpdateModeMarshaller::fromString(const std::string& s,UpdateMode& e)
-{
-  e.mInternal=UpdateMode::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string UpdateModeMarshaller::toString(const UpdateMode& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==UpdateMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable UpdateModeMarshaller::mHashTable[4]=
-{
-  {"COUNTUP",0},
-  {"COUNTDOWN",1},
-  {"PAUSE",2},
-  {"RESUME",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.gp
deleted file mode 100644
index 2e2a2b5b6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name UpdateMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-COUNTUP,0
-COUNTDOWN,1
-PAUSE,2
-RESUME,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.h
deleted file mode 100644
index 4b8c39c79..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_UPDATEMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_UPDATEMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/UpdateMode.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for UpdateMode
-
-  class UpdateModeMarshaller
-  {
-  public:
-  
-    static std::string toName(const UpdateMode& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(UpdateMode& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=UpdateMode::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(UpdateMode& e)		{ return e.mInternal!=UpdateMode::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const UpdateMode& e)	{ return e.mInternal!=UpdateMode::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,UpdateMode& e);
-    static const std::string toString(const UpdateMode& e);
-  
-    static bool fromJSON(const Json::Value& s,UpdateMode& e);
-    static Json::Value toJSON(const UpdateMode& e);
-  
-    static const char* getName(UpdateMode::UpdateModeInternal e)
-    {
-       return (e>=0 && e<4) ? mHashTable[e].name : NULL;
-    }
-  
-    static const UpdateMode::UpdateModeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[4];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.inc
deleted file mode 100644
index 0a329801b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.inc
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 9
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 9
-/* maximum key range = 5, duplicates = 0 */
-
-class UpdateMode_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-UpdateMode_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-UpdateMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  5,  6,  7,  0,  9
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.gp"
-      {"PAUSE",2},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.gp"
-      {"RESUME",3},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.gp"
-      {"COUNTUP",0},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/UpdateModeMarshaller.gp"
-      {"COUNTDOWN",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.cpp
deleted file mode 100644
index 46f92708b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V1/VrCapabilities.h"
-#include "VrCapabilitiesMarshaller.h"
-#include "VrCapabilitiesMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPC;
-
-
-const VrCapabilities::VrCapabilitiesInternal VrCapabilitiesMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return VrCapabilities::INVALID_ENUM;
-  const struct PerfectHashTable* p=VrCapabilities_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<VrCapabilities::VrCapabilitiesInternal>(p->idx) : VrCapabilities::INVALID_ENUM;
-}
-
-
-bool VrCapabilitiesMarshaller::fromJSON(const Json::Value& s,VrCapabilities& e)
-{
-  e.mInternal=VrCapabilities::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=VrCapabilities::INVALID_ENUM);
-}
-
-
-Json::Value VrCapabilitiesMarshaller::toJSON(const VrCapabilities& e)
-{
-  if(e.mInternal==VrCapabilities::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool VrCapabilitiesMarshaller::fromString(const std::string& s,VrCapabilities& e)
-{
-  e.mInternal=VrCapabilities::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string VrCapabilitiesMarshaller::toString(const VrCapabilities& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==VrCapabilities::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable VrCapabilitiesMarshaller::mHashTable[1]=
-{
-  {"Text",0}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.gp
deleted file mode 100644
index 056f672de..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.gp
+++ /dev/null
@@ -1,17 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name VrCapabilities_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPC::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-Text,0
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.h
deleted file mode 100644
index a6d7d265c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPC_VRCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPC_VRCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V1/VrCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	1.2
-  date		2011-05-17
-  generated at	Thu Jan 24 06:36:21 2013
-  source stamp	Thu Jan 24 06:35:34 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPC
-{
-
-//! marshalling class for VrCapabilities
-
-  class VrCapabilitiesMarshaller
-  {
-  public:
-  
-    static std::string toName(const VrCapabilities& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(VrCapabilities& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=VrCapabilities::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(VrCapabilities& e)		{ return e.mInternal!=VrCapabilities::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const VrCapabilities& e)	{ return e.mInternal!=VrCapabilities::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,VrCapabilities& e);
-    static const std::string toString(const VrCapabilities& e);
-  
-    static bool fromJSON(const Json::Value& s,VrCapabilities& e);
-    static Json::Value toJSON(const VrCapabilities& e);
-  
-    static const char* getName(VrCapabilities::VrCapabilitiesInternal e)
-    {
-       return (e>=0 && e<1) ? mHashTable[e].name : NULL;
-    }
-  
-    static const VrCapabilities::VrCapabilitiesInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[1];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.inc
deleted file mode 100644
index 43c3287dd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 1
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 4
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 4
-/* maximum key range = 1, duplicates = 0 */
-
-class VrCapabilities_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-VrCapabilities_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPC::PerfectHashTable *
-VrCapabilities_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4
-    };
-  static const struct NsSmartDeviceLinkRPC::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V1/VrCapabilitiesMarshaller.gp"
-      {"Text",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_request.cpp
deleted file mode 100644
index d7ceff755..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_request.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h"
-#include "AddCommand_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ImageMarshaller.h"
-#include "MenuParamsMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-AddCommand_request& AddCommand_request::operator =(const AddCommand_request& c)
-{
-  cmdID= c.cmdID;
-  menuParams= c.menuParams ? new MenuParams(c.menuParams[0]) : 0;
-  vrCommands= c.vrCommands ? new std::vector<std::string>(c.vrCommands[0]) : 0;
-  cmdIcon= c.cmdIcon ? new Image(c.cmdIcon[0]) : 0;
-
-  return *this;
-}
-
-
-AddCommand_request::~AddCommand_request(void)
-{
-  if(menuParams)
-    delete menuParams;
-  if(vrCommands)
-    delete vrCommands;
-  if(cmdIcon)
-    delete cmdIcon;
-}
-
-
-AddCommand_request::AddCommand_request(const AddCommand_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool AddCommand_request::checkIntegrity(void)
-{
-  return AddCommand_requestMarshaller::checkIntegrity(*this);
-}
-
-
-AddCommand_request::AddCommand_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      menuParams(0),
-    vrCommands(0),
-    cmdIcon(0)
-{
-}
-
-
-
-bool AddCommand_request::set_cmdID(unsigned int cmdID_)
-{
-  if(cmdID_>2000000000)  return false;
-  cmdID=cmdID_;
-  return true;
-}
-
-bool AddCommand_request::set_menuParams(const MenuParams& menuParams_)
-{
-  if(!MenuParamsMarshaller::checkIntegrityConst(menuParams_))   return false;
-  delete menuParams;
-  menuParams=0;
-
-  menuParams=new MenuParams(menuParams_);
-  return true;
-}
-
-void AddCommand_request::reset_menuParams(void)
-{
-  if(menuParams)
-    delete menuParams;
-  menuParams=0;
-}
-
-bool AddCommand_request::set_vrCommands(const std::vector<std::string>& vrCommands_)
-{
-  unsigned int i=vrCommands_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(vrCommands_[i].length()>99)  return false;
-  }
-  delete vrCommands;
-  vrCommands=0;
-
-  vrCommands=new std::vector<std::string>(vrCommands_);
-  return true;
-}
-
-void AddCommand_request::reset_vrCommands(void)
-{
-  if(vrCommands)
-    delete vrCommands;
-  vrCommands=0;
-}
-
-bool AddCommand_request::set_cmdIcon(const Image& cmdIcon_)
-{
-  if(!ImageMarshaller::checkIntegrityConst(cmdIcon_))   return false;
-  delete cmdIcon;
-  cmdIcon=0;
-
-  cmdIcon=new Image(cmdIcon_);
-  return true;
-}
-
-void AddCommand_request::reset_cmdIcon(void)
-{
-  if(cmdIcon)
-    delete cmdIcon;
-  cmdIcon=0;
-}
-
-
-
-
-unsigned int AddCommand_request::get_cmdID(void) const
-{
-  return cmdID;
-}
-
-const MenuParams* AddCommand_request::get_menuParams(void) const 
-{
-  return menuParams;
-}
-
-const std::vector<std::string>* AddCommand_request::get_vrCommands(void) const 
-{
-  return vrCommands;
-}
-
-const Image* AddCommand_request::get_cmdIcon(void) const 
-{
-  return cmdIcon;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.cpp
deleted file mode 100644
index c7bbbe2b8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h"
-#include "ImageMarshaller.h"
-#include "MenuParamsMarshaller.h"
-
-#include "AddCommand_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool AddCommand_requestMarshaller::checkIntegrity(AddCommand_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddCommand_requestMarshaller::fromString(const std::string& s,AddCommand_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddCommand_requestMarshaller::toString(const AddCommand_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddCommand_requestMarshaller::checkIntegrityConst(const AddCommand_request& s)
-{
-  if(s.cmdID>2000000000)  return false;
-  if(s.menuParams && !MenuParamsMarshaller::checkIntegrityConst(*s.menuParams))  return false;
-  if(s.vrCommands)
-  {
-    unsigned int i=s.vrCommands[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.vrCommands[0][i].length()>99)  return false;
-    }
-  }
-  if(s.cmdIcon && !ImageMarshaller::checkIntegrityConst(*s.cmdIcon))  return false;
-  return true;
-}
-
-Json::Value AddCommand_requestMarshaller::toJSON(const AddCommand_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["cmdID"]=Json::Value(e.cmdID);
-
-  if(e.menuParams)
-    json["menuParams"]=MenuParamsMarshaller::toJSON(*e.menuParams);
-
-  if(e.vrCommands)
-  {
-    unsigned int sz=e.vrCommands->size();
-    json["vrCommands"]=Json::Value(Json::arrayValue);
-    json["vrCommands"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["vrCommands"][i]=Json::Value(e.vrCommands[0][i]);
-  }
-
-  if(e.cmdIcon)
-    json["cmdIcon"]=ImageMarshaller::toJSON(*e.cmdIcon);
-
-  return json;
-}
-
-
-bool AddCommand_requestMarshaller::fromJSON(const Json::Value& json,AddCommand_request& c)
-{
-  if(c.menuParams)  delete c.menuParams;
-  c.menuParams=0;
-
-  if(c.vrCommands)  delete c.vrCommands;
-  c.vrCommands=0;
-
-  if(c.cmdIcon)  delete c.cmdIcon;
-  c.cmdIcon=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("cmdID"))  return false;
-    {
-      const Json::Value& j=json["cmdID"];
-      if(!j.isInt())  return false;
-      c.cmdID=j.asInt();
-    }
-    if(json.isMember("menuParams"))
-    {
-      const Json::Value& j=json["menuParams"];
-      c.menuParams=new MenuParams();
-      if(!MenuParamsMarshaller::fromJSON(j,c.menuParams[0]))
-        return false;
-    }
-    if(json.isMember("vrCommands"))
-    {
-      const Json::Value& j=json["vrCommands"];
-      if(!j.isArray())  return false;
-      c.vrCommands=new std::vector<std::string>();
-      c.vrCommands->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.vrCommands[0][i]=j[i].asString();
-    }
-    if(json.isMember("cmdIcon"))
-    {
-      const Json::Value& j=json["cmdIcon"];
-      c.cmdIcon=new Image();
-      if(!ImageMarshaller::fromJSON(j,c.cmdIcon[0]))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.h
deleted file mode 100644
index 699c5a922..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ADDCOMMAND_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ADDCOMMAND_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct AddCommand_requestMarshaller
-  {
-    static bool checkIntegrity(AddCommand_request& e);
-    static bool checkIntegrityConst(const AddCommand_request& e);
-  
-    static bool fromString(const std::string& s,AddCommand_request& e);
-    static const std::string toString(const AddCommand_request& e);
-  
-    static bool fromJSON(const Json::Value& s,AddCommand_request& e);
-    static Json::Value toJSON(const AddCommand_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_response.cpp
deleted file mode 100644
index 69111bee5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h"
-#include "AddCommand_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-AddCommand_response& AddCommand_response::operator =(const AddCommand_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-AddCommand_response::~AddCommand_response(void)
-{}
-
-AddCommand_response::AddCommand_response(const AddCommand_response& c)
-{
-    *this = c;
-}
-
-
-bool AddCommand_response::checkIntegrity(void)
-{
-    return AddCommand_responseMarshaller::checkIntegrity(*this);
-}
-
-AddCommand_response::AddCommand_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.cpp
deleted file mode 100644
index d37a912eb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h"
-#include "ResultMarshaller.h"
-
-#include "AddCommand_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool AddCommand_responseMarshaller::checkIntegrity(AddCommand_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddCommand_responseMarshaller::fromString(const std::string& s,AddCommand_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddCommand_responseMarshaller::toString(const AddCommand_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddCommand_responseMarshaller::checkIntegrityConst(const AddCommand_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value AddCommand_responseMarshaller::toJSON(const AddCommand_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool AddCommand_responseMarshaller::fromJSON(const Json::Value& json,AddCommand_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.h
deleted file mode 100644
index 1354ed558..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ADDCOMMAND_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ADDCOMMAND_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct AddCommand_responseMarshaller
-  {
-    static bool checkIntegrity(AddCommand_response& e);
-    static bool checkIntegrityConst(const AddCommand_response& e);
-  
-    static bool fromString(const std::string& s,AddCommand_response& e);
-    static const std::string toString(const AddCommand_response& e);
-  
-    static bool fromJSON(const Json::Value& s,AddCommand_response& e);
-    static Json::Value toJSON(const AddCommand_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_request.cpp
deleted file mode 100644
index f74a7a45f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_request.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h"
-#include "AddSubMenu_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-AddSubMenu_request& AddSubMenu_request::operator =(const AddSubMenu_request& c)
-{
-  menuID= c.menuID;
-  position= c.position ? new unsigned int(c.position[0]) : 0;
-  menuName= c.menuName;
-
-  return *this;
-}
-
-
-AddSubMenu_request::~AddSubMenu_request(void)
-{
-  if(position)
-    delete position;
-}
-
-
-AddSubMenu_request::AddSubMenu_request(const AddSubMenu_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool AddSubMenu_request::checkIntegrity(void)
-{
-  return AddSubMenu_requestMarshaller::checkIntegrity(*this);
-}
-
-
-AddSubMenu_request::AddSubMenu_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      position(0)
-{
-}
-
-
-
-bool AddSubMenu_request::set_menuID(unsigned int menuID_)
-{
-  if(menuID_>2000000000)  return false;
-  menuID=menuID_;
-  return true;
-}
-
-bool AddSubMenu_request::set_position(unsigned int position_)
-{
-  if(position_>1000)  return false;
-  delete position;
-  position=0;
-
-  position=new unsigned int(position_);
-  return true;
-}
-
-void AddSubMenu_request::reset_position(void)
-{
-  if(position)
-    delete position;
-  position=0;
-}
-
-bool AddSubMenu_request::set_menuName(const std::string& menuName_)
-{
-  if(menuName_.length()>500)  return false;
-  menuName=menuName_;
-  return true;
-}
-
-
-
-
-unsigned int AddSubMenu_request::get_menuID(void) const
-{
-  return menuID;
-}
-
-const unsigned int* AddSubMenu_request::get_position(void) const 
-{
-  return position;
-}
-
-const std::string& AddSubMenu_request::get_menuName(void) const 
-{
-  return menuName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.cpp
deleted file mode 100644
index be12c3c34..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h"
-
-
-#include "AddSubMenu_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool AddSubMenu_requestMarshaller::checkIntegrity(AddSubMenu_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddSubMenu_requestMarshaller::fromString(const std::string& s,AddSubMenu_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddSubMenu_requestMarshaller::toString(const AddSubMenu_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddSubMenu_requestMarshaller::checkIntegrityConst(const AddSubMenu_request& s)
-{
-  if(s.menuID>2000000000)  return false;
-  if(s.position && *s.position>1000)  return false;
-  if(s.menuName.length()>500)  return false;
-  return true;
-}
-
-Json::Value AddSubMenu_requestMarshaller::toJSON(const AddSubMenu_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["menuID"]=Json::Value(e.menuID);
-
-  if(e.position)
-    json["position"]=Json::Value(*e.position);
-
-  json["menuName"]=Json::Value(e.menuName);
-
-  return json;
-}
-
-
-bool AddSubMenu_requestMarshaller::fromJSON(const Json::Value& json,AddSubMenu_request& c)
-{
-  if(c.position)  delete c.position;
-  c.position=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("menuID"))  return false;
-    {
-      const Json::Value& j=json["menuID"];
-      if(!j.isInt())  return false;
-      c.menuID=j.asInt();
-    }
-    if(json.isMember("position"))
-    {
-      const Json::Value& j=json["position"];
-      if(!j.isInt())  return false;
-      c.position=new unsigned int(j.asInt());
-    }
-    if(!json.isMember("menuName"))  return false;
-    {
-      const Json::Value& j=json["menuName"];
-      if(!j.isString())  return false;
-      c.menuName=j.asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.h
deleted file mode 100644
index be0cb7608..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ADDSUBMENU_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ADDSUBMENU_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct AddSubMenu_requestMarshaller
-  {
-    static bool checkIntegrity(AddSubMenu_request& e);
-    static bool checkIntegrityConst(const AddSubMenu_request& e);
-  
-    static bool fromString(const std::string& s,AddSubMenu_request& e);
-    static const std::string toString(const AddSubMenu_request& e);
-  
-    static bool fromJSON(const Json::Value& s,AddSubMenu_request& e);
-    static Json::Value toJSON(const AddSubMenu_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_response.cpp
deleted file mode 100644
index 560b0727d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h"
-#include "AddSubMenu_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-AddSubMenu_response& AddSubMenu_response::operator =(const AddSubMenu_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-AddSubMenu_response::~AddSubMenu_response(void)
-{}
-
-AddSubMenu_response::AddSubMenu_response(const AddSubMenu_response& c)
-{
-    *this = c;
-}
-
-
-bool AddSubMenu_response::checkIntegrity(void)
-{
-    return AddSubMenu_responseMarshaller::checkIntegrity(*this);
-}
-
-AddSubMenu_response::AddSubMenu_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.cpp
deleted file mode 100644
index ea75481ca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h"
-#include "ResultMarshaller.h"
-
-#include "AddSubMenu_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool AddSubMenu_responseMarshaller::checkIntegrity(AddSubMenu_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AddSubMenu_responseMarshaller::fromString(const std::string& s,AddSubMenu_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AddSubMenu_responseMarshaller::toString(const AddSubMenu_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AddSubMenu_responseMarshaller::checkIntegrityConst(const AddSubMenu_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value AddSubMenu_responseMarshaller::toJSON(const AddSubMenu_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool AddSubMenu_responseMarshaller::fromJSON(const Json::Value& json,AddSubMenu_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.h
deleted file mode 100644
index ae04a3d02..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ADDSUBMENU_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ADDSUBMENU_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct AddSubMenu_responseMarshaller
-  {
-    static bool checkIntegrity(AddSubMenu_response& e);
-    static bool checkIntegrityConst(const AddSubMenu_response& e);
-  
-    static bool fromString(const std::string& s,AddSubMenu_response& e);
-    static const std::string toString(const AddSubMenu_response& e);
-  
-    static bool fromJSON(const Json::Value& s,AddSubMenu_response& e);
-    static Json::Value toJSON(const AddSubMenu_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_request.cpp
deleted file mode 100644
index bc4955ad9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_request.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h"
-#include "AlertManeuver_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "SoftButtonMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-AlertManeuver_request::~AlertManeuver_request(void)
-{
-}
-
-
-AlertManeuver_request::AlertManeuver_request(const AlertManeuver_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool AlertManeuver_request::checkIntegrity(void)
-{
-  return AlertManeuver_requestMarshaller::checkIntegrity(*this);
-}
-
-
-AlertManeuver_request::AlertManeuver_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool AlertManeuver_request::set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_)
-{
-  unsigned int i=ttsChunks_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(ttsChunks_[i]))   return false;
-  }
-  ttsChunks=ttsChunks_;
-  return true;
-}
-
-bool AlertManeuver_request::set_softButtons(const std::vector<SoftButton>& softButtons_)
-{
-  unsigned int i=softButtons_.size();
-  if(i>3 || i<0)  return false;
-  while(i--)
-  {
-    if(!SoftButtonMarshaller::checkIntegrityConst(softButtons_[i]))   return false;
-  }
-  softButtons=softButtons_;
-  return true;
-}
-
-
-
-
-const std::vector<TTSChunk>& AlertManeuver_request::get_ttsChunks(void) const 
-{
-  return ttsChunks;
-}
-
-const std::vector<SoftButton>& AlertManeuver_request::get_softButtons(void) const 
-{
-  return softButtons;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.cpp
deleted file mode 100644
index 55cf7e96b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h"
-#include "SoftButtonMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#include "AlertManeuver_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool AlertManeuver_requestMarshaller::checkIntegrity(AlertManeuver_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AlertManeuver_requestMarshaller::fromString(const std::string& s,AlertManeuver_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AlertManeuver_requestMarshaller::toString(const AlertManeuver_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AlertManeuver_requestMarshaller::checkIntegrityConst(const AlertManeuver_request& s)
-{
-  {
-    unsigned int i=s.ttsChunks.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.ttsChunks[i]))   return false;
-    }
-  }
-  {
-    unsigned int i=s.softButtons.size();
-    if(i>3 || i<0)  return false;
-    while(i--)
-    {
-    if(!SoftButtonMarshaller::checkIntegrityConst(s.softButtons[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value AlertManeuver_requestMarshaller::toJSON(const AlertManeuver_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["ttsChunks"]=Json::Value(Json::arrayValue);
-  json["ttsChunks"].resize(e.ttsChunks.size());
-  for(unsigned int i=0;i<e.ttsChunks.size();i++)
-    json["ttsChunks"][i]=TTSChunkMarshaller::toJSON(e.ttsChunks[i]);
-
-  json["softButtons"]=Json::Value(Json::arrayValue);
-  json["softButtons"].resize(e.softButtons.size());
-  for(unsigned int i=0;i<e.softButtons.size();i++)
-    json["softButtons"][i]=SoftButtonMarshaller::toJSON(e.softButtons[i]);
-
-  return json;
-}
-
-
-bool AlertManeuver_requestMarshaller::fromJSON(const Json::Value& json,AlertManeuver_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("ttsChunks"))  return false;
-    {
-      const Json::Value& j=json["ttsChunks"];
-      if(!j.isArray())  return false;
-      c.ttsChunks.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          TTSChunk t;
-          if(!TTSChunkMarshaller::fromJSON(j[i],t))
-            return false;
-          c.ttsChunks[i]=t;
-        }
-
-    }
-    if(!json.isMember("softButtons"))  return false;
-    {
-      const Json::Value& j=json["softButtons"];
-      if(!j.isArray())  return false;
-      c.softButtons.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          SoftButton t;
-          if(!SoftButtonMarshaller::fromJSON(j[i],t))
-            return false;
-          c.softButtons[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.h
deleted file mode 100644
index f4427ea0b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ALERTMANEUVER_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ALERTMANEUVER_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct AlertManeuver_requestMarshaller
-  {
-    static bool checkIntegrity(AlertManeuver_request& e);
-    static bool checkIntegrityConst(const AlertManeuver_request& e);
-  
-    static bool fromString(const std::string& s,AlertManeuver_request& e);
-    static const std::string toString(const AlertManeuver_request& e);
-  
-    static bool fromJSON(const Json::Value& s,AlertManeuver_request& e);
-    static Json::Value toJSON(const AlertManeuver_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_response.cpp
deleted file mode 100644
index b3483e233..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h"
-#include "AlertManeuver_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-AlertManeuver_response& AlertManeuver_response::operator =(const AlertManeuver_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-AlertManeuver_response::~AlertManeuver_response(void)
-{}
-
-
-AlertManeuver_response::AlertManeuver_response(const AlertManeuver_response& c)
-{
-    *this = c;
-}
-
-bool AlertManeuver_response::checkIntegrity(void)
-{
-    return AlertManeuver_responseMarshaller::checkIntegrity(*this);
-}
-
-AlertManeuver_response::AlertManeuver_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.cpp
deleted file mode 100644
index 98ad0a837..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h"
-#include "ResultMarshaller.h"
-
-#include "AlertManeuver_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool AlertManeuver_responseMarshaller::checkIntegrity(AlertManeuver_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool AlertManeuver_responseMarshaller::fromString(const std::string& s,AlertManeuver_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string AlertManeuver_responseMarshaller::toString(const AlertManeuver_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool AlertManeuver_responseMarshaller::checkIntegrityConst(const AlertManeuver_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value AlertManeuver_responseMarshaller::toJSON(const AlertManeuver_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool AlertManeuver_responseMarshaller::fromJSON(const Json::Value& json,AlertManeuver_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.h
deleted file mode 100644
index 36bfe0104..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ALERTMANEUVER_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ALERTMANEUVER_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct AlertManeuver_responseMarshaller
-  {
-    static bool checkIntegrity(AlertManeuver_response& e);
-    static bool checkIntegrityConst(const AlertManeuver_response& e);
-  
-    static bool fromString(const std::string& s,AlertManeuver_response& e);
-    static const std::string toString(const AlertManeuver_response& e);
-  
-    static bool fromJSON(const Json::Value& s,AlertManeuver_response& e);
-    static Json::Value toJSON(const AlertManeuver_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_request.cpp
deleted file mode 100644
index a8fd50361..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_request.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_request.h"
-#include "Alert_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "SoftButtonMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Alert_request& Alert_request::operator =(const Alert_request& c)
-{
-  alertText1= c.alertText1 ? new std::string(c.alertText1[0]) : 0;
-  alertText2= c.alertText2 ? new std::string(c.alertText2[0]) : 0;
-  alertText3= c.alertText3 ? new std::string(c.alertText3[0]) : 0;
-  ttsChunks= c.ttsChunks ? new std::vector<TTSChunk>(c.ttsChunks[0]) : 0;
-  duration= c.duration ? new unsigned int(c.duration[0]) : 0;
-  playTone= c.playTone ? new bool(c.playTone[0]) : 0;
-  softButtons= c.softButtons ? new std::vector<SoftButton>(c.softButtons[0]) : 0;
-
-  return *this;
-}
-
-
-Alert_request::~Alert_request(void)
-{
-  if(alertText1)
-    delete alertText1;
-  if(alertText2)
-    delete alertText2;
-  if(alertText3)
-    delete alertText3;
-  if(ttsChunks)
-    delete ttsChunks;
-  if(duration)
-    delete duration;
-  if(playTone)
-    delete playTone;
-  if(softButtons)
-    delete softButtons;
-}
-
-
-Alert_request::Alert_request(const Alert_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool Alert_request::checkIntegrity(void)
-{
-  return Alert_requestMarshaller::checkIntegrity(*this);
-}
-
-
-Alert_request::Alert_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      alertText1(0),
-    alertText2(0),
-    alertText3(0),
-    ttsChunks(0),
-    duration(0),
-    playTone(0),
-    softButtons(0)
-{
-}
-
-
-
-bool Alert_request::set_alertText1(const std::string& alertText1_)
-{
-  if(alertText1_.length()>500)  return false;
-  delete alertText1;
-  alertText1=0;
-
-  alertText1=new std::string(alertText1_);
-  return true;
-}
-
-void Alert_request::reset_alertText1(void)
-{
-  if(alertText1)
-    delete alertText1;
-  alertText1=0;
-}
-
-bool Alert_request::set_alertText2(const std::string& alertText2_)
-{
-  if(alertText2_.length()>500)  return false;
-  delete alertText2;
-  alertText2=0;
-
-  alertText2=new std::string(alertText2_);
-  return true;
-}
-
-void Alert_request::reset_alertText2(void)
-{
-  if(alertText2)
-    delete alertText2;
-  alertText2=0;
-}
-
-bool Alert_request::set_alertText3(const std::string& alertText3_)
-{
-  if(alertText3_.length()>500)  return false;
-  delete alertText3;
-  alertText3=0;
-
-  alertText3=new std::string(alertText3_);
-  return true;
-}
-
-void Alert_request::reset_alertText3(void)
-{
-  if(alertText3)
-    delete alertText3;
-  alertText3=0;
-}
-
-bool Alert_request::set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_)
-{
-  unsigned int i=ttsChunks_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(ttsChunks_[i]))   return false;
-  }
-  delete ttsChunks;
-  ttsChunks=0;
-
-  ttsChunks=new std::vector<TTSChunk>(ttsChunks_);
-  return true;
-}
-
-void Alert_request::reset_ttsChunks(void)
-{
-  if(ttsChunks)
-    delete ttsChunks;
-  ttsChunks=0;
-}
-
-bool Alert_request::set_duration(unsigned int duration_)
-{
-  if(duration_>10000)  return false;
-  if(duration_<3000)  return false;
-  delete duration;
-  duration=0;
-
-  duration=new unsigned int(duration_);
-  return true;
-}
-
-void Alert_request::reset_duration(void)
-{
-  if(duration)
-    delete duration;
-  duration=0;
-}
-
-bool Alert_request::set_playTone(bool playTone_)
-{
-  delete playTone;
-  playTone=0;
-
-  playTone=new bool(playTone_);
-  return true;
-}
-
-void Alert_request::reset_playTone(void)
-{
-  if(playTone)
-    delete playTone;
-  playTone=0;
-}
-
-bool Alert_request::set_softButtons(const std::vector<SoftButton>& softButtons_)
-{
-  unsigned int i=softButtons_.size();
-  if(i>4 || i<0)  return false;
-  while(i--)
-  {
-    if(!SoftButtonMarshaller::checkIntegrityConst(softButtons_[i]))   return false;
-  }
-  delete softButtons;
-  softButtons=0;
-
-  softButtons=new std::vector<SoftButton>(softButtons_);
-  return true;
-}
-
-void Alert_request::reset_softButtons(void)
-{
-  if(softButtons)
-    delete softButtons;
-  softButtons=0;
-}
-
-
-
-
-const std::string* Alert_request::get_alertText1(void) const 
-{
-  return alertText1;
-}
-
-const std::string* Alert_request::get_alertText2(void) const 
-{
-  return alertText2;
-}
-
-const std::string* Alert_request::get_alertText3(void) const 
-{
-  return alertText3;
-}
-
-const std::vector<TTSChunk>* Alert_request::get_ttsChunks(void) const 
-{
-  return ttsChunks;
-}
-
-const unsigned int* Alert_request::get_duration(void) const 
-{
-  return duration;
-}
-
-const bool* Alert_request::get_playTone(void) const 
-{
-  return playTone;
-}
-
-const std::vector<SoftButton>* Alert_request::get_softButtons(void) const 
-{
-  return softButtons;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.cpp
deleted file mode 100644
index 55f0f7372..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_request.h"
-#include "SoftButtonMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#include "Alert_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Alert_requestMarshaller::checkIntegrity(Alert_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Alert_requestMarshaller::fromString(const std::string& s,Alert_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Alert_requestMarshaller::toString(const Alert_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Alert_requestMarshaller::checkIntegrityConst(const Alert_request& s)
-{
-  if(s.alertText1 && s.alertText1->length()>500)  return false;
-  if(s.alertText2 && s.alertText2->length()>500)  return false;
-  if(s.alertText3 && s.alertText3->length()>500)  return false;
-  if(s.ttsChunks)
-  {
-    unsigned int i=s.ttsChunks[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.ttsChunks[0][i]))   return false;
-    }
-  }
-  if(s.duration && *s.duration>10000)  return false;
-  if(s.duration && *s.duration<3000)  return false;
-  if(s.softButtons)
-  {
-    unsigned int i=s.softButtons[0].size();
-    if(i>4 || i<0)  return false;
-    while(i--)
-    {
-    if(!SoftButtonMarshaller::checkIntegrityConst(s.softButtons[0][i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value Alert_requestMarshaller::toJSON(const Alert_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  if(e.alertText1)
-    json["alertText1"]=Json::Value(*e.alertText1);
-
-  if(e.alertText2)
-    json["alertText2"]=Json::Value(*e.alertText2);
-
-  if(e.alertText3)
-    json["alertText3"]=Json::Value(*e.alertText3);
-
-  if(e.ttsChunks)
-  {
-    unsigned int sz=e.ttsChunks->size();
-    json["ttsChunks"]=Json::Value(Json::arrayValue);
-    json["ttsChunks"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["ttsChunks"][i]=TTSChunkMarshaller::toJSON(e.ttsChunks[0][i]);
-  }
-
-  if(e.duration)
-    json["duration"]=Json::Value(*e.duration);
-
-  if(e.playTone)
-    json["playTone"]=Json::Value(*e.playTone);
-
-  if(e.softButtons)
-  {
-    unsigned int sz=e.softButtons->size();
-    json["softButtons"]=Json::Value(Json::arrayValue);
-    json["softButtons"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["softButtons"][i]=SoftButtonMarshaller::toJSON(e.softButtons[0][i]);
-  }
-
-  return json;
-}
-
-
-bool Alert_requestMarshaller::fromJSON(const Json::Value& json,Alert_request& c)
-{
-  if(c.alertText1)  delete c.alertText1;
-  c.alertText1=0;
-
-  if(c.alertText2)  delete c.alertText2;
-  c.alertText2=0;
-
-  if(c.alertText3)  delete c.alertText3;
-  c.alertText3=0;
-
-  if(c.ttsChunks)  delete c.ttsChunks;
-  c.ttsChunks=0;
-
-  if(c.duration)  delete c.duration;
-  c.duration=0;
-
-  if(c.playTone)  delete c.playTone;
-  c.playTone=0;
-
-  if(c.softButtons)  delete c.softButtons;
-  c.softButtons=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(json.isMember("alertText1"))
-    {
-      const Json::Value& j=json["alertText1"];
-      if(!j.isString())  return false;
-      c.alertText1=new std::string(j.asString());
-    }
-    if(json.isMember("alertText2"))
-    {
-      const Json::Value& j=json["alertText2"];
-      if(!j.isString())  return false;
-      c.alertText2=new std::string(j.asString());
-    }
-    if(json.isMember("alertText3"))
-    {
-      const Json::Value& j=json["alertText3"];
-      if(!j.isString())  return false;
-      c.alertText3=new std::string(j.asString());
-    }
-    if(json.isMember("ttsChunks"))
-    {
-      const Json::Value& j=json["ttsChunks"];
-      if(!j.isArray())  return false;
-      c.ttsChunks=new std::vector<TTSChunk>();
-      c.ttsChunks->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        TTSChunk t;
-        if(!TTSChunkMarshaller::fromJSON(j[i],t))
-          return false;
-        c.ttsChunks[0][i]=t;
-      }
-
-    }
-    if(json.isMember("duration"))
-    {
-      const Json::Value& j=json["duration"];
-      if(!j.isInt())  return false;
-      c.duration=new unsigned int(j.asInt());
-    }
-    if(json.isMember("playTone"))
-    {
-      const Json::Value& j=json["playTone"];
-      if(!j.isBool())  return false;
-      c.playTone=new bool(j.asBool());
-    }
-    if(json.isMember("softButtons"))
-    {
-      const Json::Value& j=json["softButtons"];
-      if(!j.isArray())  return false;
-      c.softButtons=new std::vector<SoftButton>();
-      c.softButtons->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        SoftButton t;
-        if(!SoftButtonMarshaller::fromJSON(j[i],t))
-          return false;
-        c.softButtons[0][i]=t;
-      }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.h
deleted file mode 100644
index f70f90e51..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ALERT_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ALERT_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct Alert_requestMarshaller
-  {
-    static bool checkIntegrity(Alert_request& e);
-    static bool checkIntegrityConst(const Alert_request& e);
-  
-    static bool fromString(const std::string& s,Alert_request& e);
-    static const std::string toString(const Alert_request& e);
-  
-    static bool fromJSON(const Json::Value& s,Alert_request& e);
-    static Json::Value toJSON(const Alert_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_response.cpp
deleted file mode 100644
index 95d887510..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_response.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_response.h"
-#include "Alert_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Alert_response& Alert_response::operator =(const Alert_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-    tryAgainTime = c.tryAgainTime;
-
-    return *this;
-}
-
-
-Alert_response::~Alert_response(void)
-{}
-
-Alert_response::Alert_response(const Alert_response& c)
-{
-    *this = c;
-}
-
-bool Alert_response::checkIntegrity(void)
-{
-    return Alert_responseMarshaller::checkIntegrity(*this);
-}
-
-Alert_response::Alert_response(void)
-    : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-    , tryAgainTime(0)
-{}
-
-bool Alert_response::set_tryAgainTime(unsigned int tryAgainTime_)
-{
-    if (tryAgainTime_ > 2000000000)
-    {
-        return false;
-    }
-
-    tryAgainTime = tryAgainTime_;
-    return true;
-}
-
-unsigned int Alert_response::get_tryAgainTime(void) const
-{
-    return tryAgainTime;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.cpp
deleted file mode 100644
index 47e550eee..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_response.h"
-#include "ResultMarshaller.h"
-
-#include "Alert_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Alert_responseMarshaller::checkIntegrity(Alert_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Alert_responseMarshaller::fromString(const std::string& s,Alert_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Alert_responseMarshaller::toString(const Alert_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Alert_responseMarshaller::checkIntegrityConst(const Alert_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  if(s.tryAgainTime>2000000000)  return false;
-  return true;
-}
-
-Json::Value Alert_responseMarshaller::toJSON(const Alert_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  json["tryAgainTime"]=Json::Value(e.tryAgainTime);
-
-  return json;
-}
-
-
-bool Alert_responseMarshaller::fromJSON(const Json::Value& json,Alert_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-    if(!json.isMember("tryAgainTime"))  return false;
-    {
-      const Json::Value& j=json["tryAgainTime"];
-      if(!j.isInt())  return false;
-      c.tryAgainTime=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.h
deleted file mode 100644
index 8aa098fa3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ALERT_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ALERT_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct Alert_responseMarshaller
-  {
-    static bool checkIntegrity(Alert_response& e);
-    static bool checkIntegrityConst(const Alert_response& e);
-  
-    static bool fromString(const std::string& s,Alert_response& e);
-    static const std::string toString(const Alert_response& e);
-  
-    static bool fromJSON(const Json::Value& s,Alert_response& e);
-    static Json::Value toJSON(const Alert_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.cpp
deleted file mode 100644
index 57392d18e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/AppInterfaceUnregisteredReason.h"
-#include "AppInterfaceUnregisteredReasonMarshaller.h"
-#include "AppInterfaceUnregisteredReasonMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const AppInterfaceUnregisteredReason::AppInterfaceUnregisteredReasonInternal AppInterfaceUnregisteredReasonMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return AppInterfaceUnregisteredReason::INVALID_ENUM;
-  const struct PerfectHashTable* p=AppInterfaceUnregisteredReason_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<AppInterfaceUnregisteredReason::AppInterfaceUnregisteredReasonInternal>(p->idx) : AppInterfaceUnregisteredReason::INVALID_ENUM;
-}
-
-
-bool AppInterfaceUnregisteredReasonMarshaller::fromJSON(const Json::Value& s,AppInterfaceUnregisteredReason& e)
-{
-  e.mInternal=AppInterfaceUnregisteredReason::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=AppInterfaceUnregisteredReason::INVALID_ENUM);
-}
-
-
-Json::Value AppInterfaceUnregisteredReasonMarshaller::toJSON(const AppInterfaceUnregisteredReason& e)
-{
-  if(e.mInternal==AppInterfaceUnregisteredReason::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AppInterfaceUnregisteredReasonMarshaller::fromString(const std::string& s,AppInterfaceUnregisteredReason& e)
-{
-  e.mInternal=AppInterfaceUnregisteredReason::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string AppInterfaceUnregisteredReasonMarshaller::toString(const AppInterfaceUnregisteredReason& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==AppInterfaceUnregisteredReason::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AppInterfaceUnregisteredReasonMarshaller::mHashTable[11]=
-{
-  {"USER_EXIT",0},
-  {"IGNITION_OFF",1},
-  {"BLUETOOTH_OFF",2},
-  {"USB_DISCONNECTED",3},
-  {"REQUEST_WHILE_IN_NONE_HMI_LEVEL",4},
-  {"TOO_MANY_REQUESTS",5},
-  {"DRIVER_DISTRACTION_VIOLATION",6},
-  {"LANGUAGE_CHANGE",7},
-  {"MASTER_RESET",8},
-  {"FACTORY_DEFAULTS",9},
-  {"APP_UNAUTHORIZED",10}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp
deleted file mode 100644
index 773da9a20..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp
+++ /dev/null
@@ -1,27 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AppInterfaceUnregisteredReason_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-USER_EXIT,0
-IGNITION_OFF,1
-BLUETOOTH_OFF,2
-USB_DISCONNECTED,3
-REQUEST_WHILE_IN_NONE_HMI_LEVEL,4
-TOO_MANY_REQUESTS,5
-DRIVER_DISTRACTION_VIOLATION,6
-LANGUAGE_CHANGE,7
-MASTER_RESET,8
-FACTORY_DEFAULTS,9
-APP_UNAUTHORIZED,10
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.h
deleted file mode 100644
index 8c3976bed..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_APPINTERFACEUNREGISTEREDREASONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_APPINTERFACEUNREGISTEREDREASONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AppInterfaceUnregisteredReason.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for AppInterfaceUnregisteredReason
-
-  class AppInterfaceUnregisteredReasonMarshaller
-  {
-  public:
-  
-    static std::string toName(const AppInterfaceUnregisteredReason& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(AppInterfaceUnregisteredReason& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=AppInterfaceUnregisteredReason::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(AppInterfaceUnregisteredReason& e)		{ return e.mInternal!=AppInterfaceUnregisteredReason::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const AppInterfaceUnregisteredReason& e)	{ return e.mInternal!=AppInterfaceUnregisteredReason::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,AppInterfaceUnregisteredReason& e);
-    static const std::string toString(const AppInterfaceUnregisteredReason& e);
-  
-    static bool fromJSON(const Json::Value& s,AppInterfaceUnregisteredReason& e);
-    static Json::Value toJSON(const AppInterfaceUnregisteredReason& e);
-  
-    static const char* getName(AppInterfaceUnregisteredReason::AppInterfaceUnregisteredReasonInternal e)
-    {
-       return (e>=0 && e<11) ? mHashTable[e].name : NULL;
-    }
-  
-    static const AppInterfaceUnregisteredReason::AppInterfaceUnregisteredReasonInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[11];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.inc
deleted file mode 100644
index 591e51a9e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.inc
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp  */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 11
-#define MIN_WORD_LENGTH 9
-#define MAX_WORD_LENGTH 31
-#define MIN_HASH_VALUE 9
-#define MAX_HASH_VALUE 31
-/* maximum key range = 23, duplicates = 0 */
-
-class AppInterfaceUnregisteredReason_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-AppInterfaceUnregisteredReason_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 10,  0, 32,  0, 32,
-       5, 32, 32, 10, 32, 32,  0,  0, 32, 32,
-      32, 32,  0, 32,  0,  0, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-AppInterfaceUnregisteredReason_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0, 12, 13,
-       0, 15, 16, 17,  0,  0,  0, 16, 12,  0,  0,  0, 16,  0,
-      28,  0,  0, 31
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"USER_EXIT",0},
-      {""}, {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"MASTER_RESET",8},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"BLUETOOTH_OFF",2},
-      {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"LANGUAGE_CHANGE",7},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"USB_DISCONNECTED",3},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"TOO_MANY_REQUESTS",5},
-      {""}, {""}, {""},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"FACTORY_DEFAULTS",9},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"IGNITION_OFF",1},
-      {""}, {""}, {""},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"APP_UNAUTHORIZED",10},
-      {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"DRIVER_DISTRACTION_VIOLATION",6},
-      {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppInterfaceUnregisteredReasonMarshaller.gp"
-      {"REQUEST_WHILE_IN_NONE_HMI_LEVEL",4}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.cpp
deleted file mode 100644
index 6171f6330..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/AppType.h"
-#include "AppTypeMarshaller.h"
-#include "AppTypeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const AppType::AppTypeInternal AppTypeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return AppType::INVALID_ENUM;
-  const struct PerfectHashTable* p=AppType_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<AppType::AppTypeInternal>(p->idx) : AppType::INVALID_ENUM;
-}
-
-
-bool AppTypeMarshaller::fromJSON(const Json::Value& s,AppType& e)
-{
-  e.mInternal=AppType::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=AppType::INVALID_ENUM);
-}
-
-
-Json::Value AppTypeMarshaller::toJSON(const AppType& e)
-{
-  if(e.mInternal==AppType::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AppTypeMarshaller::fromString(const std::string& s,AppType& e)
-{
-  e.mInternal=AppType::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string AppTypeMarshaller::toString(const AppType& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==AppType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AppTypeMarshaller::mHashTable[10]=
-{
-  {"DEFAULT",0},
-  {"COMMUNICATION",1},
-  {"MEDIA",2},
-  {"MESSAGING",3},
-  {"NAVIGATION",4},
-  {"INFORMATION",5},
-  {"SOCIAL",6},
-  {"BACKGROUND_PROCESS",7},
-  {"TESTING",8},
-  {"SYSTEM",9}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp
deleted file mode 100644
index 84f7cc1c3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp
+++ /dev/null
@@ -1,26 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AppType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-DEFAULT,0
-COMMUNICATION,1
-MEDIA,2
-MESSAGING,3
-NAVIGATION,4
-INFORMATION,5
-SOCIAL,6
-BACKGROUND_PROCESS,7
-TESTING,8
-SYSTEM,9
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.h
deleted file mode 100644
index 7c5f8c31c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_APPTYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_APPTYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AppType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for AppType
-
-  class AppTypeMarshaller
-  {
-  public:
-  
-    static std::string toName(const AppType& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(AppType& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=AppType::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(AppType& e)		{ return e.mInternal!=AppType::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const AppType& e)	{ return e.mInternal!=AppType::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,AppType& e);
-    static const std::string toString(const AppType& e);
-  
-    static bool fromJSON(const Json::Value& s,AppType& e);
-    static Json::Value toJSON(const AppType& e);
-  
-    static const char* getName(AppType::AppTypeInternal e)
-    {
-       return (e>=0 && e<10) ? mHashTable[e].name : NULL;
-    }
-  
-    static const AppType::AppTypeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[10];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.inc
deleted file mode 100644
index 6aa9c19b1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.inc
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp  */
-/* Computed positions: -k'3' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 10
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 18
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 23
-/* maximum key range = 19, duplicates = 0 */
-
-class AppType_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-AppType_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24,  5,  0, 24,
-       5, 24, 24, 24, 24, 24, 24,  0, 24, 24,
-      24, 24, 24,  0, 24, 24,  0, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24
-    };
-  return len + asso_values[(unsigned char)str[2]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-AppType_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  5,  6,  7,  0,  9, 10,  6,  7, 13,
-       0,  0, 11,  0,  0,  0,  0,  0,  0, 18
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
-      {"MEDIA",2},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
-      {"SYSTEM",9},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
-      {"TESTING",8},
-      {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
-      {"MESSAGING",3},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
-      {"NAVIGATION",4},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
-      {"SOCIAL",6},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
-      {"DEFAULT",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
-      {"COMMUNICATION",1},
-      {""}, {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
-      {"INFORMATION",5},
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AppTypeMarshaller.gp"
-      {"BACKGROUND_PROCESS",7}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp
deleted file mode 100644
index d52185f72..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioCaptureQuality.h"
-#include "AudioCaptureQualityMarshaller.h"
-#include "AudioCaptureQualityMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const AudioCaptureQuality::AudioCaptureQualityInternal AudioCaptureQualityMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return AudioCaptureQuality::INVALID_ENUM;
-  const struct PerfectHashTable* p=AudioCaptureQualityV2_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<AudioCaptureQuality::AudioCaptureQualityInternal>(p->idx) : AudioCaptureQuality::INVALID_ENUM;
-}
-
-
-bool AudioCaptureQualityMarshaller::fromJSON(const Json::Value& s,AudioCaptureQuality& e)
-{
-  e.mInternal=AudioCaptureQuality::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=AudioCaptureQuality::INVALID_ENUM);
-}
-
-
-Json::Value AudioCaptureQualityMarshaller::toJSON(const AudioCaptureQuality& e)
-{
-  if(e.mInternal==AudioCaptureQuality::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AudioCaptureQualityMarshaller::fromString(const std::string& s,AudioCaptureQuality& e)
-{
-  e.mInternal=AudioCaptureQuality::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string AudioCaptureQualityMarshaller::toString(const AudioCaptureQuality& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==AudioCaptureQuality::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AudioCaptureQualityMarshaller::mHashTable[2]=
-{
-  {"8_BIT",0},
-  {"16_BIT",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp
deleted file mode 100644
index 1e1a7c7b4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AudioCaptureQualityV2_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-8_BIT,0
-16_BIT,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.h
deleted file mode 100644
index ee803355c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_AUDIOCAPTUREQUALITYMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_AUDIOCAPTUREQUALITYMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioCaptureQuality.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for AudioCaptureQuality
-
-  class AudioCaptureQualityMarshaller
-  {
-  public:
-  
-    static std::string toName(const AudioCaptureQuality& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(AudioCaptureQuality& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=AudioCaptureQuality::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(AudioCaptureQuality& e)		{ return e.mInternal!=AudioCaptureQuality::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const AudioCaptureQuality& e)	{ return e.mInternal!=AudioCaptureQuality::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,AudioCaptureQuality& e);
-    static const std::string toString(const AudioCaptureQuality& e);
-  
-    static bool fromJSON(const Json::Value& s,AudioCaptureQuality& e);
-    static Json::Value toJSON(const AudioCaptureQuality& e);
-  
-    static const char* getName(AudioCaptureQuality::AudioCaptureQualityInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const AudioCaptureQuality::AudioCaptureQualityInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc
deleted file mode 100644
index 2a9f3e04f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 6
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 6
-/* maximum key range = 2, duplicates = 0 */
-
-class AudioCaptureQualityV2_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-AudioCaptureQualityV2_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-AudioCaptureQualityV2_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  5,  6
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp"
-      {"8_BIT",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp"
-      {"16_BIT",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.cpp
deleted file mode 100644
index 84c74723f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioStreamingState.h"
-#include "AudioStreamingStateMarshaller.h"
-#include "AudioStreamingStateMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const AudioStreamingState::AudioStreamingStateInternal AudioStreamingStateMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return AudioStreamingState::INVALID_ENUM;
-  const struct PerfectHashTable* p=AudioStreamingState_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<AudioStreamingState::AudioStreamingStateInternal>(p->idx) : AudioStreamingState::INVALID_ENUM;
-}
-
-
-bool AudioStreamingStateMarshaller::fromJSON(const Json::Value& s,AudioStreamingState& e)
-{
-  e.mInternal=AudioStreamingState::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=AudioStreamingState::INVALID_ENUM);
-}
-
-
-Json::Value AudioStreamingStateMarshaller::toJSON(const AudioStreamingState& e)
-{
-  if(e.mInternal==AudioStreamingState::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AudioStreamingStateMarshaller::fromString(const std::string& s,AudioStreamingState& e)
-{
-  e.mInternal=AudioStreamingState::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string AudioStreamingStateMarshaller::toString(const AudioStreamingState& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==AudioStreamingState::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AudioStreamingStateMarshaller::mHashTable[3]=
-{
-  {"AUDIBLE",0},
-  {"NOT_AUDIBLE",1},
-  {"ATTENUATED",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp
deleted file mode 100644
index 175b6a2f6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AudioStreamingState_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-AUDIBLE,0
-ATTENUATED,2
-NOT_AUDIBLE,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.h
deleted file mode 100644
index c1db08d98..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_AUDIOSTREAMINGSTATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_AUDIOSTREAMINGSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioStreamingState.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for AudioStreamingState
-
-  class AudioStreamingStateMarshaller
-  {
-  public:
-  
-    static std::string toName(const AudioStreamingState& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(AudioStreamingState& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=AudioStreamingState::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(AudioStreamingState& e)		{ return e.mInternal!=AudioStreamingState::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const AudioStreamingState& e)	{ return e.mInternal!=AudioStreamingState::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,AudioStreamingState& e);
-    static const std::string toString(const AudioStreamingState& e);
-  
-    static bool fromJSON(const Json::Value& s,AudioStreamingState& e);
-    static Json::Value toJSON(const AudioStreamingState& e);
-  
-    static const char* getName(AudioStreamingState::AudioStreamingStateInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const AudioStreamingState::AudioStreamingStateInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.inc
deleted file mode 100644
index 0037e3852..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.inc
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 11
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 11
-/* maximum key range = 5, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class AudioStreamingState_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-AudioStreamingState_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-AudioStreamingState_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  7,  0,  0, 10, 11
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp"
-      {"AUDIBLE",0},
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp"
-      {"ATTENUATED",2},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioStreamingStateMarshaller.gp"
-      {"NOT_AUDIBLE",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.cpp
deleted file mode 100644
index 5dc5f63d9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioType.h"
-#include "AudioTypeMarshaller.h"
-#include "AudioTypeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const AudioType::AudioTypeInternal AudioTypeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return AudioType::INVALID_ENUM;
-  const struct PerfectHashTable* p=AudioType_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<AudioType::AudioTypeInternal>(p->idx) : AudioType::INVALID_ENUM;
-}
-
-
-bool AudioTypeMarshaller::fromJSON(const Json::Value& s,AudioType& e)
-{
-  e.mInternal=AudioType::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=AudioType::INVALID_ENUM);
-}
-
-
-Json::Value AudioTypeMarshaller::toJSON(const AudioType& e)
-{
-  if(e.mInternal==AudioType::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool AudioTypeMarshaller::fromString(const std::string& s,AudioType& e)
-{
-  e.mInternal=AudioType::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string AudioTypeMarshaller::toString(const AudioType& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==AudioType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable AudioTypeMarshaller::mHashTable[1]=
-{
-  {"PCM",0}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.gp
deleted file mode 100644
index e65f88028..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.gp
+++ /dev/null
@@ -1,17 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name AudioType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-PCM,0
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.h
deleted file mode 100644
index c2859b36c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_AUDIOTYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_AUDIOTYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/AudioType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for AudioType
-
-  class AudioTypeMarshaller
-  {
-  public:
-  
-    static std::string toName(const AudioType& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(AudioType& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=AudioType::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(AudioType& e)		{ return e.mInternal!=AudioType::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const AudioType& e)	{ return e.mInternal!=AudioType::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,AudioType& e);
-    static const std::string toString(const AudioType& e);
-  
-    static bool fromJSON(const Json::Value& s,AudioType& e);
-    static Json::Value toJSON(const AudioType& e);
-  
-    static const char* getName(AudioType::AudioTypeInternal e)
-    {
-       return (e>=0 && e<1) ? mHashTable[e].name : NULL;
-    }
-  
-    static const AudioType::AudioTypeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[1];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.inc
deleted file mode 100644
index d998476d0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 1
-#define MIN_WORD_LENGTH 3
-#define MAX_WORD_LENGTH 3
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 3
-/* maximum key range = 1, duplicates = 0 */
-
-class AudioType_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-AudioType_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-AudioType_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  3
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioTypeMarshaller.gp"
-      {"PCM",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilities.cpp
deleted file mode 100644
index 032b91ddd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilities.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h"
-#include "ButtonCapabilitiesMarshaller.h"
-#include "ButtonNameMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-ButtonCapabilities::ButtonCapabilities(const ButtonCapabilities& c)
-{
-  *this=c;
-}
-
-
-bool ButtonCapabilities::checkIntegrity(void)
-{
-  return ButtonCapabilitiesMarshaller::checkIntegrity(*this);
-}
-
-
-ButtonCapabilities::ButtonCapabilities(void)
-{
-}
-
-
-
-bool ButtonCapabilities::set_longPressAvailable(bool longPressAvailable_)
-{
-  longPressAvailable=longPressAvailable_;
-  return true;
-}
-
-bool ButtonCapabilities::set_name(const ButtonName& name_)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(name_))   return false;
-  name=name_;
-  return true;
-}
-
-bool ButtonCapabilities::set_shortPressAvailable(bool shortPressAvailable_)
-{
-  shortPressAvailable=shortPressAvailable_;
-  return true;
-}
-
-bool ButtonCapabilities::set_upDownAvailable(bool upDownAvailable_)
-{
-  upDownAvailable=upDownAvailable_;
-  return true;
-}
-
-
-
-
-bool ButtonCapabilities::get_longPressAvailable(void) const
-{
-  return longPressAvailable;
-}
-
-
-const ButtonName& ButtonCapabilities::get_name(void) const 
-{
-  return name;
-}
-
-
-bool ButtonCapabilities::get_shortPressAvailable(void) const
-{
-  return shortPressAvailable;
-}
-
-
-bool ButtonCapabilities::get_upDownAvailable(void) const
-{
-  return upDownAvailable;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.cpp
deleted file mode 100644
index 3b6c4f1e6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h"
-#include "ButtonNameMarshaller.h"
-
-#include "ButtonCapabilitiesMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ButtonCapabilitiesMarshaller::checkIntegrity(ButtonCapabilities& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ButtonCapabilitiesMarshaller::fromString(const std::string& s,ButtonCapabilities& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ButtonCapabilitiesMarshaller::toString(const ButtonCapabilities& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ButtonCapabilitiesMarshaller::checkIntegrityConst(const ButtonCapabilities& s)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(s.name))  return false;
-  return true;
-}
-
-Json::Value ButtonCapabilitiesMarshaller::toJSON(const ButtonCapabilities& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["longPressAvailable"]=Json::Value(e.longPressAvailable);
-
-  json["name"]=ButtonNameMarshaller::toJSON(e.name);
-
-  json["shortPressAvailable"]=Json::Value(e.shortPressAvailable);
-
-  json["upDownAvailable"]=Json::Value(e.upDownAvailable);
-
-
-  return json;
-}
-
-
-bool ButtonCapabilitiesMarshaller::fromJSON(const Json::Value& json,ButtonCapabilities& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("longPressAvailable"))  return false;
-    {
-      const Json::Value& j=json["longPressAvailable"];
-      if(!j.isBool())  return false;
-      c.longPressAvailable=j.asBool();
-    }
-    if(!json.isMember("name"))  return false;
-    {
-      const Json::Value& j=json["name"];
-      if(!ButtonNameMarshaller::fromJSON(j,c.name))
-        return false;
-    }
-    if(!json.isMember("shortPressAvailable"))  return false;
-    {
-      const Json::Value& j=json["shortPressAvailable"];
-      if(!j.isBool())  return false;
-      c.shortPressAvailable=j.asBool();
-    }
-    if(!json.isMember("upDownAvailable"))  return false;
-    {
-      const Json::Value& j=json["upDownAvailable"];
-      if(!j.isBool())  return false;
-      c.upDownAvailable=j.asBool();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.h
deleted file mode 100644
index aed736b62..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_BUTTONCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_BUTTONCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ButtonCapabilitiesMarshaller
-  {
-    static bool checkIntegrity(ButtonCapabilities& e);
-    static bool checkIntegrityConst(const ButtonCapabilities& e);
-  
-    static bool fromString(const std::string& s,ButtonCapabilities& e);
-    static const std::string toString(const ButtonCapabilities& e);
-  
-    static bool fromJSON(const Json::Value& s,ButtonCapabilities& e);
-    static Json::Value toJSON(const ButtonCapabilities& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.cpp
deleted file mode 100644
index 164fb3e28..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonEventMode.h"
-#include "ButtonEventModeMarshaller.h"
-#include "ButtonEventModeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const ButtonEventMode::ButtonEventModeInternal ButtonEventModeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return ButtonEventMode::INVALID_ENUM;
-  const struct PerfectHashTable* p=ButtonEventMode_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<ButtonEventMode::ButtonEventModeInternal>(p->idx) : ButtonEventMode::INVALID_ENUM;
-}
-
-
-bool ButtonEventModeMarshaller::fromJSON(const Json::Value& s,ButtonEventMode& e)
-{
-  e.mInternal=ButtonEventMode::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=ButtonEventMode::INVALID_ENUM);
-}
-
-
-Json::Value ButtonEventModeMarshaller::toJSON(const ButtonEventMode& e)
-{
-  if(e.mInternal==ButtonEventMode::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ButtonEventModeMarshaller::fromString(const std::string& s,ButtonEventMode& e)
-{
-  e.mInternal=ButtonEventMode::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string ButtonEventModeMarshaller::toString(const ButtonEventMode& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==ButtonEventMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ButtonEventModeMarshaller::mHashTable[2]=
-{
-  {"BUTTONUP",0},
-  {"BUTTONDOWN",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp
deleted file mode 100644
index 4c9dd25f4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name ButtonEventMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-BUTTONUP,0
-BUTTONDOWN,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.h
deleted file mode 100644
index ff64b4be5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_BUTTONEVENTMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_BUTTONEVENTMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonEventMode.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for ButtonEventMode
-
-  class ButtonEventModeMarshaller
-  {
-  public:
-  
-    static std::string toName(const ButtonEventMode& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(ButtonEventMode& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=ButtonEventMode::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(ButtonEventMode& e)		{ return e.mInternal!=ButtonEventMode::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const ButtonEventMode& e)	{ return e.mInternal!=ButtonEventMode::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,ButtonEventMode& e);
-    static const std::string toString(const ButtonEventMode& e);
-  
-    static bool fromJSON(const Json::Value& s,ButtonEventMode& e);
-    static Json::Value toJSON(const ButtonEventMode& e);
-  
-    static const char* getName(ButtonEventMode::ButtonEventModeInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const ButtonEventMode::ButtonEventModeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.inc
deleted file mode 100644
index 36bc9f63b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.inc
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 8
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 8
-#define MAX_HASH_VALUE 10
-/* maximum key range = 3, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class ButtonEventMode_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-ButtonEventMode_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-ButtonEventMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  8,  0, 10
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp"
-      {"BUTTONUP",0},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonEventModeMarshaller.gp"
-      {"BUTTONDOWN",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.cpp
deleted file mode 100644
index 2d2113fb9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonName.h"
-#include "ButtonNameMarshaller.h"
-#include "ButtonNameMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const ButtonName::ButtonNameInternal ButtonNameMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return ButtonName::INVALID_ENUM;
-  const struct PerfectHashTable* p=ButtonName_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<ButtonName::ButtonNameInternal>(p->idx) : ButtonName::INVALID_ENUM;
-}
-
-
-bool ButtonNameMarshaller::fromJSON(const Json::Value& s,ButtonName& e)
-{
-  e.mInternal=ButtonName::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=ButtonName::INVALID_ENUM);
-}
-
-
-Json::Value ButtonNameMarshaller::toJSON(const ButtonName& e)
-{
-  if(e.mInternal==ButtonName::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ButtonNameMarshaller::fromString(const std::string& s,ButtonName& e)
-{
-  e.mInternal=ButtonName::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string ButtonNameMarshaller::toString(const ButtonName& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==ButtonName::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ButtonNameMarshaller::mHashTable[16]=
-{
-  {"OK",0},
-  {"SEEKLEFT",1},
-  {"SEEKRIGHT",2},
-  {"TUNEUP",3},
-  {"TUNEDOWN",4},
-  {"PRESET_0",5},
-  {"PRESET_1",6},
-  {"PRESET_2",7},
-  {"PRESET_3",8},
-  {"PRESET_4",9},
-  {"PRESET_5",10},
-  {"PRESET_6",11},
-  {"PRESET_7",12},
-  {"PRESET_8",13},
-  {"PRESET_9",14},
-  {"CUSTOM_BUTTON",15}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp
deleted file mode 100644
index 69f1aee66..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp
+++ /dev/null
@@ -1,32 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name ButtonName_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-OK,0
-SEEKLEFT,1
-SEEKRIGHT,2
-TUNEUP,3
-TUNEDOWN,4
-PRESET_0,5
-PRESET_1,6
-PRESET_2,7
-PRESET_3,8
-PRESET_4,9
-PRESET_5,10
-PRESET_6,11
-PRESET_7,12
-PRESET_8,13
-PRESET_9,14
-CUSTOM_BUTTON,15
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.h
deleted file mode 100644
index 698516e3f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_BUTTONNAMEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_BUTTONNAMEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonName.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for ButtonName
-
-  class ButtonNameMarshaller
-  {
-  public:
-  
-    static std::string toName(const ButtonName& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(ButtonName& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=ButtonName::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(ButtonName& e)		{ return e.mInternal!=ButtonName::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const ButtonName& e)	{ return e.mInternal!=ButtonName::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,ButtonName& e);
-    static const std::string toString(const ButtonName& e);
-  
-    static bool fromJSON(const Json::Value& s,ButtonName& e);
-    static Json::Value toJSON(const ButtonName& e);
-  
-    static const char* getName(ButtonName::ButtonNameInternal e)
-    {
-       return (e>=0 && e<16) ? mHashTable[e].name : NULL;
-    }
-  
-    static const ButtonName::ButtonNameInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[16];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.inc
deleted file mode 100644
index 64074a14d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.inc
+++ /dev/null
@@ -1,207 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp  */
-/* Computed positions: -k'8' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 16
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 13
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 38
-/* maximum key range = 37, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class ButtonName_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-ButtonName_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 28, 23,
-      18, 13,  8,  3, 30, 25, 20, 15, 39, 39,
-      39, 39, 39, 39, 39, 39,  5, 39, 39, 39,
-      39, 39,  0, 39, 39, 39, 39, 39,  5, 39,
-      39, 39, 39, 39,  0, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-      39, 39, 39, 39, 39, 39
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[7]];
-      /*FALLTHROUGH*/
-      case 7:
-      case 6:
-      case 5:
-      case 4:
-      case 3:
-      case 2:
-        break;
-    }
-  return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-ButtonName_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  2,  0,  0,  0,  6,  0,  8,  9,  0,  8,  0,  8,
-       0,  0,  8,  0, 13,  0,  0,  8,  0,  8,  0,  0,  8,  0,
-       8,  0,  0,  8,  0,  8,  0,  0,  8,  0,  8
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"OK",0},
-      {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"TUNEUP",3},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"SEEKLEFT",1},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"SEEKRIGHT",2},
-      {""},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"PRESET_5",10},
-      {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"TUNEDOWN",4},
-      {""}, {""},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"PRESET_4",9},
-      {""},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"CUSTOM_BUTTON",15},
-      {""}, {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"PRESET_3",8},
-      {""},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"PRESET_9",14},
-      {""}, {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"PRESET_2",7},
-      {""},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"PRESET_8",13},
-      {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"PRESET_1",6},
-      {""},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"PRESET_7",12},
-      {""}, {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"PRESET_0",5},
-      {""},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonNameMarshaller.gp"
-      {"PRESET_6",11}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.cpp
deleted file mode 100644
index d2eb048aa..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonPressMode.h"
-#include "ButtonPressModeMarshaller.h"
-#include "ButtonPressModeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const ButtonPressMode::ButtonPressModeInternal ButtonPressModeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return ButtonPressMode::INVALID_ENUM;
-  const struct PerfectHashTable* p=ButtonPressMode_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<ButtonPressMode::ButtonPressModeInternal>(p->idx) : ButtonPressMode::INVALID_ENUM;
-}
-
-
-bool ButtonPressModeMarshaller::fromJSON(const Json::Value& s,ButtonPressMode& e)
-{
-  e.mInternal=ButtonPressMode::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=ButtonPressMode::INVALID_ENUM);
-}
-
-
-Json::Value ButtonPressModeMarshaller::toJSON(const ButtonPressMode& e)
-{
-  if(e.mInternal==ButtonPressMode::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ButtonPressModeMarshaller::fromString(const std::string& s,ButtonPressMode& e)
-{
-  e.mInternal=ButtonPressMode::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string ButtonPressModeMarshaller::toString(const ButtonPressMode& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==ButtonPressMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ButtonPressModeMarshaller::mHashTable[2]=
-{
-  {"LONG",0},
-  {"SHORT",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp
deleted file mode 100644
index 0565b94ce..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name ButtonPressMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-LONG,0
-SHORT,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.h
deleted file mode 100644
index 9931b8d95..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_BUTTONPRESSMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_BUTTONPRESSMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ButtonPressMode.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for ButtonPressMode
-
-  class ButtonPressModeMarshaller
-  {
-  public:
-  
-    static std::string toName(const ButtonPressMode& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(ButtonPressMode& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=ButtonPressMode::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(ButtonPressMode& e)		{ return e.mInternal!=ButtonPressMode::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const ButtonPressMode& e)	{ return e.mInternal!=ButtonPressMode::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,ButtonPressMode& e);
-    static const std::string toString(const ButtonPressMode& e);
-  
-    static bool fromJSON(const Json::Value& s,ButtonPressMode& e);
-    static Json::Value toJSON(const ButtonPressMode& e);
-  
-    static const char* getName(ButtonPressMode::ButtonPressModeInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const ButtonPressMode::ButtonPressModeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.inc
deleted file mode 100644
index 89938400d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 5
-/* maximum key range = 2, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class ButtonPressMode_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-ButtonPressMode_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-ButtonPressMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  5
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp"
-      {"LONG",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ButtonPressModeMarshaller.gp"
-      {"SHORT",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_request.cpp
deleted file mode 100644
index b857cdcfe..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_request.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h"
-#include "ChangeRegistration_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "LanguageMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-ChangeRegistration_request::~ChangeRegistration_request(void)
-{
-}
-
-
-ChangeRegistration_request::ChangeRegistration_request(const ChangeRegistration_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool ChangeRegistration_request::checkIntegrity(void)
-{
-  return ChangeRegistration_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ChangeRegistration_request::ChangeRegistration_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool ChangeRegistration_request::set_language(const Language& language_)
-{
-  if(!LanguageMarshaller::checkIntegrityConst(language_))   return false;
-  language=language_;
-  return true;
-}
-
-bool ChangeRegistration_request::set_hmiDisplayLanguage(const Language& hmiDisplayLanguage_)
-{
-  if(!LanguageMarshaller::checkIntegrityConst(hmiDisplayLanguage_))   return false;
-  hmiDisplayLanguage=hmiDisplayLanguage_;
-  return true;
-}
-
-
-
-
-const Language& ChangeRegistration_request::get_language(void) const 
-{
-  return language;
-}
-
-const Language& ChangeRegistration_request::get_hmiDisplayLanguage(void) const 
-{
-  return hmiDisplayLanguage;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.cpp
deleted file mode 100644
index 9e1375964..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h"
-#include "LanguageMarshaller.h"
-
-#include "ChangeRegistration_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ChangeRegistration_requestMarshaller::checkIntegrity(ChangeRegistration_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ChangeRegistration_requestMarshaller::fromString(const std::string& s,ChangeRegistration_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ChangeRegistration_requestMarshaller::toString(const ChangeRegistration_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChangeRegistration_requestMarshaller::checkIntegrityConst(const ChangeRegistration_request& s)
-{
-  if(!LanguageMarshaller::checkIntegrityConst(s.language))  return false;
-  if(!LanguageMarshaller::checkIntegrityConst(s.hmiDisplayLanguage))  return false;
-  return true;
-}
-
-Json::Value ChangeRegistration_requestMarshaller::toJSON(const ChangeRegistration_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["language"]=LanguageMarshaller::toJSON(e.language);
-
-  json["hmiDisplayLanguage"]=LanguageMarshaller::toJSON(e.hmiDisplayLanguage);
-
-  return json;
-}
-
-
-bool ChangeRegistration_requestMarshaller::fromJSON(const Json::Value& json,ChangeRegistration_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("language"))  return false;
-    {
-      const Json::Value& j=json["language"];
-      if(!LanguageMarshaller::fromJSON(j,c.language))
-        return false;
-    }
-    if(!json.isMember("hmiDisplayLanguage"))  return false;
-    {
-      const Json::Value& j=json["hmiDisplayLanguage"];
-      if(!LanguageMarshaller::fromJSON(j,c.hmiDisplayLanguage))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.h
deleted file mode 100644
index 4daa19232..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_CHANGEREGISTRATION_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_CHANGEREGISTRATION_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ChangeRegistration_requestMarshaller
-  {
-    static bool checkIntegrity(ChangeRegistration_request& e);
-    static bool checkIntegrityConst(const ChangeRegistration_request& e);
-  
-    static bool fromString(const std::string& s,ChangeRegistration_request& e);
-    static const std::string toString(const ChangeRegistration_request& e);
-  
-    static bool fromJSON(const Json::Value& s,ChangeRegistration_request& e);
-    static Json::Value toJSON(const ChangeRegistration_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_response.cpp
deleted file mode 100644
index 0d4568df7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h"
-#include "ChangeRegistration_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ChangeRegistration_response& ChangeRegistration_response::operator =(const ChangeRegistration_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-ChangeRegistration_response::~ChangeRegistration_response(void)
-{}
-
-ChangeRegistration_response::ChangeRegistration_response(const ChangeRegistration_response& c)
-{
-    *this = c;
-}
-
-bool ChangeRegistration_response::checkIntegrity(void)
-{
-    return ChangeRegistration_responseMarshaller::checkIntegrity(*this);
-}
-
-
-ChangeRegistration_response::ChangeRegistration_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.cpp
deleted file mode 100644
index 411bae61a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h"
-#include "ResultMarshaller.h"
-
-#include "ChangeRegistration_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ChangeRegistration_responseMarshaller::checkIntegrity(ChangeRegistration_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ChangeRegistration_responseMarshaller::fromString(const std::string& s,ChangeRegistration_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ChangeRegistration_responseMarshaller::toString(const ChangeRegistration_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChangeRegistration_responseMarshaller::checkIntegrityConst(const ChangeRegistration_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value ChangeRegistration_responseMarshaller::toJSON(const ChangeRegistration_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool ChangeRegistration_responseMarshaller::fromJSON(const Json::Value& json,ChangeRegistration_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.h
deleted file mode 100644
index ff7ff058e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_CHANGEREGISTRATION_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_CHANGEREGISTRATION_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ChangeRegistration_responseMarshaller
-  {
-    static bool checkIntegrity(ChangeRegistration_response& e);
-    static bool checkIntegrityConst(const ChangeRegistration_response& e);
-  
-    static bool fromString(const std::string& s,ChangeRegistration_response& e);
-    static const std::string toString(const ChangeRegistration_response& e);
-  
-    static bool fromJSON(const Json::Value& s,ChangeRegistration_response& e);
-    static Json::Value toJSON(const ChangeRegistration_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.cpp
deleted file mode 100644
index 4d25806ea..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/CharacterSet.h"
-#include "CharacterSetMarshaller.h"
-#include "CharacterSetMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const CharacterSet::CharacterSetInternal CharacterSetMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return CharacterSet::INVALID_ENUM;
-  const struct PerfectHashTable* p=CharacterSet_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<CharacterSet::CharacterSetInternal>(p->idx) : CharacterSet::INVALID_ENUM;
-}
-
-
-bool CharacterSetMarshaller::fromJSON(const Json::Value& s,CharacterSet& e)
-{
-  e.mInternal=CharacterSet::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=CharacterSet::INVALID_ENUM);
-}
-
-
-Json::Value CharacterSetMarshaller::toJSON(const CharacterSet& e)
-{
-  if(e.mInternal==CharacterSet::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool CharacterSetMarshaller::fromString(const std::string& s,CharacterSet& e)
-{
-  e.mInternal=CharacterSet::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string CharacterSetMarshaller::toString(const CharacterSet& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==CharacterSet::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable CharacterSetMarshaller::mHashTable[4]=
-{
-  {"TYPE2SET",0},
-  {"TYPE5SET",1},
-  {"CID1SET",2},
-  {"CID2SET",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp
deleted file mode 100644
index 5fad412bf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name CharacterSet_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-TYPE2SET,0
-TYPE5SET,1
-CID1SET,2
-CID2SET,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.h
deleted file mode 100644
index 913e093a1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_CHARACTERSETMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_CHARACTERSETMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CharacterSet.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for CharacterSet
-
-  class CharacterSetMarshaller
-  {
-  public:
-  
-    static std::string toName(const CharacterSet& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(CharacterSet& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=CharacterSet::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(CharacterSet& e)		{ return e.mInternal!=CharacterSet::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const CharacterSet& e)	{ return e.mInternal!=CharacterSet::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,CharacterSet& e);
-    static const std::string toString(const CharacterSet& e);
-  
-    static bool fromJSON(const Json::Value& s,CharacterSet& e);
-    static Json::Value toJSON(const CharacterSet& e);
-  
-    static const char* getName(CharacterSet::CharacterSetInternal e)
-    {
-       return (e>=0 && e<4) ? mHashTable[e].name : NULL;
-    }
-  
-    static const CharacterSet::CharacterSetInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[4];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.inc
deleted file mode 100644
index 7e80c4e12..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.inc
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp  */
-/* Computed positions: -k'4-5' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 8
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 13
-/* maximum key range = 7, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class CharacterSet_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-CharacterSet_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-       5, 14, 14,  0, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14,  0,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14,  0, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14
-    };
-  return len + asso_values[(unsigned char)str[4]] + asso_values[(unsigned char)str[3]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-CharacterSet_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  7,  8,  0,  0,  0,  7,  8
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp"
-      {"CID1SET",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp"
-      {"TYPE5SET",1},
-      {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp"
-      {"CID2SET",3},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CharacterSetMarshaller.gp"
-      {"TYPE2SET",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Choice.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Choice.cpp
deleted file mode 100644
index 29d5258b5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Choice.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Choice.h"
-#include "ChoiceMarshaller.h"
-#include "ImageMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-Choice::Choice(const Choice& c)
-{
-  *this=c;
-}
-
-
-bool Choice::checkIntegrity(void)
-{
-  return ChoiceMarshaller::checkIntegrity(*this);
-}
-
-
-Choice::Choice(void)
-{
-}
-
-
-
-bool Choice::set_choiceID(unsigned int choiceID_)
-{
-  if(choiceID_>65535)  return false;
-  choiceID=choiceID_;
-  return true;
-}
-
-bool Choice::set_image(const Image& image_)
-{
-  if(!ImageMarshaller::checkIntegrityConst(image_))   return false;
-  image=image_;
-  return true;
-}
-
-bool Choice::set_menuName(const std::string& menuName_)
-{
-  if(menuName_.length()>500)  return false;
-  menuName=menuName_;
-  return true;
-}
-
-bool Choice::set_vrCommands(const std::vector<std::string>& vrCommands_)
-{
-  unsigned int i=vrCommands_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(vrCommands_[i].length()>99)  return false;
-  }
-  vrCommands=vrCommands_;
-  return true;
-}
-
-
-
-
-unsigned int Choice::get_choiceID(void) const
-{
-  return choiceID;
-}
-
-
-const Image& Choice::get_image(void) const 
-{
-  return image;
-}
-
-
-const std::string& Choice::get_menuName(void) const 
-{
-  return menuName;
-}
-
-
-const std::vector<std::string>& Choice::get_vrCommands(void) const 
-{
-  return vrCommands;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.cpp
deleted file mode 100644
index 6ebb3eb25..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Choice.h"
-#include "ImageMarshaller.h"
-
-#include "ChoiceMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ChoiceMarshaller::checkIntegrity(Choice& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ChoiceMarshaller::fromString(const std::string& s,Choice& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ChoiceMarshaller::toString(const Choice& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ChoiceMarshaller::checkIntegrityConst(const Choice& s)
-{
-  if(s.choiceID>65535)  return false;
-
-  // TODO(AK): Quick fix for HMI communication with app(v1)
-  if (s.image.get_imageType().get() != NsSmartDeviceLinkRPCV2::ImageType::INVALID_ENUM)
-    if(!ImageMarshaller::checkIntegrityConst(s.image))  return false;
-
-  if(s.menuName.length()>500)  return false;
-  {
-    unsigned int i=s.vrCommands.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.vrCommands[i].length()>99)  return false;
-    }
-  }
-  return true;
-}
-
-Json::Value ChoiceMarshaller::toJSON(const Choice& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["choiceID"]=Json::Value(e.choiceID);
-
-  // TODO(AK): Quick fix for HMI communication with app(v1)
-  if (e.image.get_imageType().get() != NsSmartDeviceLinkRPCV2::ImageType::INVALID_ENUM)
-    json["image"]=ImageMarshaller::toJSON(e.image);
-
-  json["menuName"]=Json::Value(e.menuName);
-
-  json["vrCommands"]=Json::Value(Json::arrayValue);
-  json["vrCommands"].resize(e.vrCommands.size());
-  for(unsigned int i=0;i<e.vrCommands.size();i++)
-    json["vrCommands"][i]=Json::Value(e.vrCommands[i]);
-
-
-  return json;
-}
-
-
-bool ChoiceMarshaller::fromJSON(const Json::Value& json,Choice& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("choiceID"))  return false;
-    {
-      const Json::Value& j=json["choiceID"];
-      if(!j.isInt())  return false;
-      c.choiceID=j.asInt();
-    }
-    if(json.isMember("image"))
-    {
-      const Json::Value& j=json["image"];
-      if(!ImageMarshaller::fromJSON(j,c.image))
-        return false;
-    }
-    if(!json.isMember("menuName"))  return false;
-    {
-      const Json::Value& j=json["menuName"];
-      if(!j.isString())  return false;
-      c.menuName=j.asString();
-    }
-    if(!json.isMember("vrCommands"))  return false;
-    {
-      const Json::Value& j=json["vrCommands"];
-      if(!j.isArray())  return false;
-      c.vrCommands.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.vrCommands[i]=j[i].asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.h
deleted file mode 100644
index 3dc23e125..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ChoiceMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_CHOICEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_CHOICEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Choice.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ChoiceMarshaller
-  {
-    static bool checkIntegrity(Choice& e);
-    static bool checkIntegrityConst(const Choice& e);
-  
-    static bool fromString(const std::string& s,Choice& e);
-    static const std::string toString(const Choice& e);
-  
-    static bool fromJSON(const Json::Value& s,Choice& e);
-    static Json::Value toJSON(const Choice& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.cpp
deleted file mode 100644
index dcf17a129..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/CompassDirection.h"
-#include "CompassDirectionMarshaller.h"
-#include "CompassDirectionMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const CompassDirection::CompassDirectionInternal CompassDirectionMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return CompassDirection::INVALID_ENUM;
-  const struct PerfectHashTable* p=CompassDirection_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<CompassDirection::CompassDirectionInternal>(p->idx) : CompassDirection::INVALID_ENUM;
-}
-
-
-bool CompassDirectionMarshaller::fromJSON(const Json::Value& s,CompassDirection& e)
-{
-  e.mInternal=CompassDirection::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=CompassDirection::INVALID_ENUM);
-}
-
-
-Json::Value CompassDirectionMarshaller::toJSON(const CompassDirection& e)
-{
-  if(e.mInternal==CompassDirection::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool CompassDirectionMarshaller::fromString(const std::string& s,CompassDirection& e)
-{
-  e.mInternal=CompassDirection::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string CompassDirectionMarshaller::toString(const CompassDirection& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==CompassDirection::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable CompassDirectionMarshaller::mHashTable[8]=
-{
-  {"NORTH",0},
-  {"NORTHWEST",1},
-  {"WEST",2},
-  {"SOUTHWEST",3},
-  {"SOUTH",4},
-  {"SOUTHEAST",5},
-  {"EAST",6},
-  {"NORTHEAST",7}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp
deleted file mode 100644
index bdd04c86f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp
+++ /dev/null
@@ -1,24 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name CompassDirection_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-NORTH,0
-NORTHWEST,1
-WEST,2
-SOUTHWEST,3
-SOUTH,4
-SOUTHEAST,5
-EAST,6
-NORTHEAST,7
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.h
deleted file mode 100644
index 67907eb47..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_COMPASSDIRECTIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_COMPASSDIRECTIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CompassDirection.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for CompassDirection
-
-  class CompassDirectionMarshaller
-  {
-  public:
-  
-    static std::string toName(const CompassDirection& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(CompassDirection& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=CompassDirection::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(CompassDirection& e)		{ return e.mInternal!=CompassDirection::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const CompassDirection& e)	{ return e.mInternal!=CompassDirection::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,CompassDirection& e);
-    static const std::string toString(const CompassDirection& e);
-  
-    static bool fromJSON(const Json::Value& s,CompassDirection& e);
-    static Json::Value toJSON(const CompassDirection& e);
-  
-    static const char* getName(CompassDirection::CompassDirectionInternal e)
-    {
-       return (e>=0 && e<8) ? mHashTable[e].name : NULL;
-    }
-  
-    static const CompassDirection::CompassDirectionInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[8];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.inc
deleted file mode 100644
index 33e2c9b86..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.inc
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp  */
-/* Computed positions: -k'1,6' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 8
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 9
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 29
-/* maximum key range = 26, duplicates = 0 */
-
-class CompassDirection_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-CompassDirection_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 15,
-      30, 30, 30, 30, 30, 30, 30, 30,  5, 30,
-      30, 30, 30,  0, 30, 30, 30,  0, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-      30, 30, 30, 30, 30, 30
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[5]];
-      /*FALLTHROUGH*/
-      case 5:
-      case 4:
-      case 3:
-      case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-CompassDirection_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  5,  0,  0,  0,  9,  5,  0,  0,  0,
-       9,  0,  0,  0,  0,  4,  0,  0,  0,  0,  9,  0,  0,  0,
-       0,  9
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
-      {"WEST",2},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
-      {"SOUTH",4},
-      {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
-      {"SOUTHWEST",3},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
-      {"NORTH",0},
-      {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
-      {"NORTHWEST",1},
-      {""}, {""}, {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
-      {"EAST",6},
-      {""}, {""}, {""}, {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
-      {"SOUTHEAST",5},
-      {""}, {""}, {""}, {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CompassDirectionMarshaller.gp"
-      {"NORTHEAST",7}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_request.cpp
deleted file mode 100644
index 6f062cc80..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_request.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h"
-#include "CreateInteractionChoiceSet_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ChoiceMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-CreateInteractionChoiceSet_request::~CreateInteractionChoiceSet_request(void)
-{
-}
-
-
-CreateInteractionChoiceSet_request::CreateInteractionChoiceSet_request(const CreateInteractionChoiceSet_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool CreateInteractionChoiceSet_request::checkIntegrity(void)
-{
-  return CreateInteractionChoiceSet_requestMarshaller::checkIntegrity(*this);
-}
-
-
-CreateInteractionChoiceSet_request::CreateInteractionChoiceSet_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool CreateInteractionChoiceSet_request::set_interactionChoiceSetID(unsigned int interactionChoiceSetID_)
-{
-  if(interactionChoiceSetID_>2000000000)  return false;
-  interactionChoiceSetID=interactionChoiceSetID_;
-  return true;
-}
-
-bool CreateInteractionChoiceSet_request::set_choiceSet(const std::vector<Choice>& choiceSet_)
-{
-  unsigned int i=choiceSet_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!ChoiceMarshaller::checkIntegrityConst(choiceSet_[i]))   return false;
-  }
-  choiceSet=choiceSet_;
-  return true;
-}
-
-
-
-
-unsigned int CreateInteractionChoiceSet_request::get_interactionChoiceSetID(void) const
-{
-  return interactionChoiceSetID;
-}
-
-const std::vector<Choice>& CreateInteractionChoiceSet_request::get_choiceSet(void) const 
-{
-  return choiceSet;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.cpp
deleted file mode 100644
index 1cc31d412..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h"
-#include "ChoiceMarshaller.h"
-
-#include "CreateInteractionChoiceSet_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool CreateInteractionChoiceSet_requestMarshaller::checkIntegrity(CreateInteractionChoiceSet_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool CreateInteractionChoiceSet_requestMarshaller::fromString(const std::string& s,CreateInteractionChoiceSet_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string CreateInteractionChoiceSet_requestMarshaller::toString(const CreateInteractionChoiceSet_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool CreateInteractionChoiceSet_requestMarshaller::checkIntegrityConst(const CreateInteractionChoiceSet_request& s)
-{
-  if(s.interactionChoiceSetID>2000000000)  return false;
-  {
-    unsigned int i=s.choiceSet.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!ChoiceMarshaller::checkIntegrityConst(s.choiceSet[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value CreateInteractionChoiceSet_requestMarshaller::toJSON(const CreateInteractionChoiceSet_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["interactionChoiceSetID"]=Json::Value(e.interactionChoiceSetID);
-
-  json["choiceSet"]=Json::Value(Json::arrayValue);
-  json["choiceSet"].resize(e.choiceSet.size());
-  for(unsigned int i=0;i<e.choiceSet.size();i++)
-    json["choiceSet"][i]=ChoiceMarshaller::toJSON(e.choiceSet[i]);
-
-  return json;
-}
-
-
-bool CreateInteractionChoiceSet_requestMarshaller::fromJSON(const Json::Value& json,CreateInteractionChoiceSet_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("interactionChoiceSetID"))  return false;
-    {
-      const Json::Value& j=json["interactionChoiceSetID"];
-      if(!j.isInt())  return false;
-      c.interactionChoiceSetID=j.asInt();
-    }
-    if(!json.isMember("choiceSet"))  return false;
-    {
-      const Json::Value& j=json["choiceSet"];
-      if(!j.isArray())  return false;
-      c.choiceSet.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          Choice t;
-          if(!ChoiceMarshaller::fromJSON(j[i],t))
-            return false;
-          c.choiceSet[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.h
deleted file mode 100644
index e139dd36f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_CREATEINTERACTIONCHOICESET_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_CREATEINTERACTIONCHOICESET_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct CreateInteractionChoiceSet_requestMarshaller
-  {
-    static bool checkIntegrity(CreateInteractionChoiceSet_request& e);
-    static bool checkIntegrityConst(const CreateInteractionChoiceSet_request& e);
-  
-    static bool fromString(const std::string& s,CreateInteractionChoiceSet_request& e);
-    static const std::string toString(const CreateInteractionChoiceSet_request& e);
-  
-    static bool fromJSON(const Json::Value& s,CreateInteractionChoiceSet_request& e);
-    static Json::Value toJSON(const CreateInteractionChoiceSet_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_response.cpp
deleted file mode 100644
index 978551fac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_response.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h"
-#include "CreateInteractionChoiceSet_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-CreateInteractionChoiceSet_response& CreateInteractionChoiceSet_response::operator =(
-    const CreateInteractionChoiceSet_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-CreateInteractionChoiceSet_response::~CreateInteractionChoiceSet_response(void)
-{}
-
-CreateInteractionChoiceSet_response::CreateInteractionChoiceSet_response(
-    const CreateInteractionChoiceSet_response& c)
-{
-    *this = c;
-}
-
-bool CreateInteractionChoiceSet_response::checkIntegrity(void)
-{
-    return CreateInteractionChoiceSet_responseMarshaller::checkIntegrity(*this);
-}
-
-CreateInteractionChoiceSet_response::CreateInteractionChoiceSet_response(void)
-    : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.cpp
deleted file mode 100644
index 5279dee7c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h"
-#include "ResultMarshaller.h"
-
-#include "CreateInteractionChoiceSet_responseMarshaller.h"
-
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool CreateInteractionChoiceSet_responseMarshaller::checkIntegrity(CreateInteractionChoiceSet_response& s)
-{
-    return checkIntegrityConst(s);
-}
-
-
-bool CreateInteractionChoiceSet_responseMarshaller::fromString(const std::string& s, CreateInteractionChoiceSet_response& e)
-{
-    try
-    {
-        Json::Reader reader;
-        Json::Value json;
-        if (!reader.parse(s, json, false))
-        {
-            return false;
-        }
-        if (!fromJSON(json, e))
-        {
-            return false;
-        }
-    }
-    catch (...)
-    {
-        return false;
-    }
-    return true;
-}
-
-
-const std::string CreateInteractionChoiceSet_responseMarshaller::toString(const CreateInteractionChoiceSet_response& e)
-{
-    Json::FastWriter writer;
-    return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool CreateInteractionChoiceSet_responseMarshaller::checkIntegrityConst(const CreateInteractionChoiceSet_response& s)
-{
-    if (!ResultMarshaller::checkIntegrityConst(s.resultCode))
-    {
-        return false;
-    }
-    if (s.info && s.info->length() > 1000)
-    {
-        return false;
-    }
-    return true;
-}
-
-Json::Value CreateInteractionChoiceSet_responseMarshaller::toJSON(const CreateInteractionChoiceSet_response& e)
-{
-    Json::Value json(Json::objectValue);
-    if (!checkIntegrityConst(e))
-    {
-        return Json::Value(Json::nullValue);
-    }
-
-    json["success"] = Json::Value(e.success);
-    json["resultCode"] = ResultMarshaller::toJSON(e.resultCode);
-
-    if (e.info)
-    {
-        json["info"] = Json::Value(*e.info);
-    }
-
-    return json;
-}
-
-
-bool CreateInteractionChoiceSet_responseMarshaller::fromJSON(const Json::Value& json, CreateInteractionChoiceSet_response& c)
-{
-    if (c.info)
-    {
-        delete c.info;
-    }
-    c.info = 0;
-
-    try
-    {
-        if (!json.isObject())
-        {
-            return false;
-        }
-
-        if (!json.isMember("success"))
-        {
-            return false;
-        }
-        {
-            const Json::Value& j = json["success"];
-            if (!j.isBool())
-            {
-                return false;
-            }
-            c.success = j.asBool();
-        }
-        if (!json.isMember("resultCode"))
-        {
-            return false;
-        }
-        {
-            const Json::Value& j = json["resultCode"];
-            if (!ResultMarshaller::fromJSON(j, c.resultCode))
-            {
-                return false;
-            }
-        }
-        if (json.isMember("info"))
-        {
-            const Json::Value& j = json["info"];
-            if (!j.isString())
-            {
-                return false;
-            }
-            c.info = new std::string(j.asString());
-        }
-
-    }
-    catch (...)
-    {
-        return false;
-    }
-    return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.h
deleted file mode 100644
index 94911ce75..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_CREATEINTERACTIONCHOICESET_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_CREATEINTERACTIONCHOICESET_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct CreateInteractionChoiceSet_responseMarshaller
-  {
-    static bool checkIntegrity(CreateInteractionChoiceSet_response& e);
-    static bool checkIntegrityConst(const CreateInteractionChoiceSet_response& e);
-  
-    static bool fromString(const std::string& s,CreateInteractionChoiceSet_response& e);
-    static const std::string toString(const CreateInteractionChoiceSet_response& e);
-  
-    static bool fromJSON(const Json::Value& s,CreateInteractionChoiceSet_response& e);
-    static Json::Value toJSON(const CreateInteractionChoiceSet_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTC.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTC.cpp
deleted file mode 100644
index b9f141b83..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTC.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DTC.h"
-#include "DTCMarshaller.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DTC::DTC(const DTC& c)
-{
-  *this=c;
-}
-
-
-bool DTC::checkIntegrity(void)
-{
-  return DTCMarshaller::checkIntegrity(*this);
-}
-
-
-DTC::DTC(void)
-{
-}
-
-
-
-bool DTC::set_identifier(const std::string& identifier_)
-{
-  if(identifier_.length()>500)  return false;
-  identifier=identifier_;
-  return true;
-}
-
-bool DTC::set_statusByte(const std::string& statusByte_)
-{
-  if(statusByte_.length()>500)  return false;
-  statusByte=statusByte_;
-  return true;
-}
-
-
-
-
-const std::string& DTC::get_identifier(void) const 
-{
-  return identifier;
-}
-
-
-const std::string& DTC::get_statusByte(void) const 
-{
-  return statusByte;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.cpp
deleted file mode 100644
index 20b0fb7a7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DTC.h"
-
-
-#include "DTCMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DTCMarshaller::checkIntegrity(DTC& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DTCMarshaller::fromString(const std::string& s,DTC& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DTCMarshaller::toString(const DTC& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DTCMarshaller::checkIntegrityConst(const DTC& s)
-{
-  if(s.identifier.length()>500)  return false;
-  if(s.statusByte.length()>500)  return false;
-  return true;
-}
-
-Json::Value DTCMarshaller::toJSON(const DTC& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["identifier"]=Json::Value(e.identifier);
-
-  json["statusByte"]=Json::Value(e.statusByte);
-
-
-  return json;
-}
-
-
-bool DTCMarshaller::fromJSON(const Json::Value& json,DTC& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("identifier"))  return false;
-    {
-      const Json::Value& j=json["identifier"];
-      if(!j.isString())  return false;
-      c.identifier=j.asString();
-    }
-    if(!json.isMember("statusByte"))  return false;
-    {
-      const Json::Value& j=json["statusByte"];
-      if(!j.isString())  return false;
-      c.statusByte=j.asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.h
deleted file mode 100644
index 58f9266f3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DTCMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DTCMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DTCMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DTC.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct DTCMarshaller
-  {
-    static bool checkIntegrity(DTC& e);
-    static bool checkIntegrityConst(const DTC& e);
-  
-    static bool fromString(const std::string& s,DTC& e);
-    static const std::string toString(const DTC& e);
-  
-    static bool fromJSON(const Json::Value& s,DTC& e);
-    static Json::Value toJSON(const DTC& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.cpp
deleted file mode 100644
index 5dc89f0a4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeactivateReason.h"
-#include "DeactivateReasonMarshaller.h"
-#include "DeactivateReasonMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const DeactivateReason::DeactivateReasonInternal DeactivateReasonMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return DeactivateReason::INVALID_ENUM;
-  const struct PerfectHashTable* p=DeactivateReason_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<DeactivateReason::DeactivateReasonInternal>(p->idx) : DeactivateReason::INVALID_ENUM;
-}
-
-
-bool DeactivateReasonMarshaller::fromJSON(const Json::Value& s,DeactivateReason& e)
-{
-  e.mInternal=DeactivateReason::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=DeactivateReason::INVALID_ENUM);
-}
-
-
-Json::Value DeactivateReasonMarshaller::toJSON(const DeactivateReason& e)
-{
-  if(e.mInternal==DeactivateReason::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool DeactivateReasonMarshaller::fromString(const std::string& s,DeactivateReason& e)
-{
-  e.mInternal=DeactivateReason::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string DeactivateReasonMarshaller::toString(const DeactivateReason& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==DeactivateReason::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable DeactivateReasonMarshaller::mHashTable[6]=
-{
-  {"AUDIO",0},
-  {"PHONECALL",1},
-  {"NAVIGATIONMAP",2},
-  {"PHONEMENU",3},
-  {"SYNCSETTINGS",4},
-  {"GENERAL",5}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp
deleted file mode 100644
index c7ff845a9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp
+++ /dev/null
@@ -1,22 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name DeactivateReason_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-AUDIO,0
-PHONECALL,1
-NAVIGATIONMAP,2
-PHONEMENU,3
-SYNCSETTINGS,4
-GENERAL,5
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.h
deleted file mode 100644
index 8a5a4ecaf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DEACTIVATEREASONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DEACTIVATEREASONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeactivateReason.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for DeactivateReason
-
-  class DeactivateReasonMarshaller
-  {
-  public:
-  
-    static std::string toName(const DeactivateReason& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(DeactivateReason& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=DeactivateReason::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(DeactivateReason& e)		{ return e.mInternal!=DeactivateReason::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const DeactivateReason& e)	{ return e.mInternal!=DeactivateReason::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,DeactivateReason& e);
-    static const std::string toString(const DeactivateReason& e);
-  
-    static bool fromJSON(const Json::Value& s,DeactivateReason& e);
-    static Json::Value toJSON(const DeactivateReason& e);
-  
-    static const char* getName(DeactivateReason::DeactivateReasonInternal e)
-    {
-       return (e>=0 && e<6) ? mHashTable[e].name : NULL;
-    }
-  
-    static const DeactivateReason::DeactivateReasonInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[6];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.inc
deleted file mode 100644
index 7d629bf3e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.inc
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp  */
-/* Computed positions: -k'6' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 6
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 13
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 14
-/* maximum key range = 10, duplicates = 0 */
-
-class DeactivateReason_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-DeactivateReason_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15,  0, 15,  5, 15,  0,
-      15, 15, 15, 15, 15, 15, 15,  0, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[5]];
-      /*FALLTHROUGH*/
-      case 5:
-        break;
-    }
-  return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-DeactivateReason_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  5,  0,  7,  0,  9,  0,  0, 12, 13,
-       9
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp"
-      {"AUDIO",0},
-      {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp"
-      {"GENERAL",5},
-      {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp"
-      {"PHONEMENU",3},
-      {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp"
-      {"SYNCSETTINGS",4},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp"
-      {"NAVIGATIONMAP",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeactivateReasonMarshaller.gp"
-      {"PHONECALL",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_request.cpp
deleted file mode 100644
index b1962c00b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h"
-#include "DeleteCommand_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DeleteCommand_request::~DeleteCommand_request(void)
-{
-}
-
-
-DeleteCommand_request::DeleteCommand_request(const DeleteCommand_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool DeleteCommand_request::checkIntegrity(void)
-{
-  return DeleteCommand_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DeleteCommand_request::DeleteCommand_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool DeleteCommand_request::set_cmdID(unsigned int cmdID_)
-{
-  if(cmdID_>2000000000)  return false;
-  cmdID=cmdID_;
-  return true;
-}
-
-
-
-
-unsigned int DeleteCommand_request::get_cmdID(void) const
-{
-  return cmdID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.cpp
deleted file mode 100644
index 7def6904f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h"
-
-
-#include "DeleteCommand_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteCommand_requestMarshaller::checkIntegrity(DeleteCommand_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteCommand_requestMarshaller::fromString(const std::string& s,DeleteCommand_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteCommand_requestMarshaller::toString(const DeleteCommand_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteCommand_requestMarshaller::checkIntegrityConst(const DeleteCommand_request& s)
-{
-  if(s.cmdID>2000000000)  return false;
-  return true;
-}
-
-Json::Value DeleteCommand_requestMarshaller::toJSON(const DeleteCommand_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["cmdID"]=Json::Value(e.cmdID);
-
-  return json;
-}
-
-
-bool DeleteCommand_requestMarshaller::fromJSON(const Json::Value& json,DeleteCommand_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("cmdID"))  return false;
-    {
-      const Json::Value& j=json["cmdID"];
-      if(!j.isInt())  return false;
-      c.cmdID=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.h
deleted file mode 100644
index d2fc20606..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETECOMMAND_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETECOMMAND_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct DeleteCommand_requestMarshaller
-  {
-    static bool checkIntegrity(DeleteCommand_request& e);
-    static bool checkIntegrityConst(const DeleteCommand_request& e);
-  
-    static bool fromString(const std::string& s,DeleteCommand_request& e);
-    static const std::string toString(const DeleteCommand_request& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteCommand_request& e);
-    static Json::Value toJSON(const DeleteCommand_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_response.cpp
deleted file mode 100644
index c69d324da..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h"
-#include "DeleteCommand_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-DeleteCommand_response& DeleteCommand_response::operator =(const DeleteCommand_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-DeleteCommand_response::~DeleteCommand_response(void)
-{}
-
-DeleteCommand_response::DeleteCommand_response(const DeleteCommand_response& c)
-{
-    *this = c;
-}
-
-bool DeleteCommand_response::checkIntegrity(void)
-{
-    return DeleteCommand_responseMarshaller::checkIntegrity(*this);
-}
-
-DeleteCommand_response::DeleteCommand_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.cpp
deleted file mode 100644
index 469f33a9c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h"
-#include "ResultMarshaller.h"
-
-#include "DeleteCommand_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteCommand_responseMarshaller::checkIntegrity(DeleteCommand_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteCommand_responseMarshaller::fromString(const std::string& s,DeleteCommand_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteCommand_responseMarshaller::toString(const DeleteCommand_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteCommand_responseMarshaller::checkIntegrityConst(const DeleteCommand_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value DeleteCommand_responseMarshaller::toJSON(const DeleteCommand_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool DeleteCommand_responseMarshaller::fromJSON(const Json::Value& json,DeleteCommand_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.h
deleted file mode 100644
index 64167645b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETECOMMAND_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETECOMMAND_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct DeleteCommand_responseMarshaller
-  {
-    static bool checkIntegrity(DeleteCommand_response& e);
-    static bool checkIntegrityConst(const DeleteCommand_response& e);
-  
-    static bool fromString(const std::string& s,DeleteCommand_response& e);
-    static const std::string toString(const DeleteCommand_response& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteCommand_response& e);
-    static Json::Value toJSON(const DeleteCommand_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_request.cpp
deleted file mode 100644
index d3f1b1dcf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h"
-#include "DeleteFile_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DeleteFile_request::~DeleteFile_request(void)
-{
-}
-
-
-DeleteFile_request::DeleteFile_request(const DeleteFile_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool DeleteFile_request::checkIntegrity(void)
-{
-  return DeleteFile_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DeleteFile_request::DeleteFile_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool DeleteFile_request::set_syncFileName(const std::string& syncFileName_)
-{
-  if(syncFileName_.length()>500)  return false;
-  syncFileName=syncFileName_;
-  return true;
-}
-
-
-
-
-const std::string& DeleteFile_request::get_syncFileName(void) const 
-{
-  return syncFileName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.cpp
deleted file mode 100644
index 1ff5a6202..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h"
-
-
-#include "DeleteFile_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteFile_requestMarshaller::checkIntegrity(DeleteFile_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteFile_requestMarshaller::fromString(const std::string& s,DeleteFile_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteFile_requestMarshaller::toString(const DeleteFile_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteFile_requestMarshaller::checkIntegrityConst(const DeleteFile_request& s)
-{
-  if(s.syncFileName.length()>500)  return false;
-  return true;
-}
-
-Json::Value DeleteFile_requestMarshaller::toJSON(const DeleteFile_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["syncFileName"]=Json::Value(e.syncFileName);
-
-  return json;
-}
-
-
-bool DeleteFile_requestMarshaller::fromJSON(const Json::Value& json,DeleteFile_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("syncFileName"))  return false;
-    {
-      const Json::Value& j=json["syncFileName"];
-      if(!j.isString())  return false;
-      c.syncFileName=j.asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.h
deleted file mode 100644
index 3c397a8e0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETEFILE_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETEFILE_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct DeleteFile_requestMarshaller
-  {
-    static bool checkIntegrity(DeleteFile_request& e);
-    static bool checkIntegrityConst(const DeleteFile_request& e);
-  
-    static bool fromString(const std::string& s,DeleteFile_request& e);
-    static const std::string toString(const DeleteFile_request& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteFile_request& e);
-    static Json::Value toJSON(const DeleteFile_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_response.cpp
deleted file mode 100644
index f22c0a1e7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_response.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h"
-#include "DeleteFile_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-DeleteFile_response& DeleteFile_response::operator =(const DeleteFile_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    spaceAvailable = c.spaceAvailable;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-DeleteFile_response::~DeleteFile_response(void)
-{}
-
-DeleteFile_response::DeleteFile_response(const DeleteFile_response& c)
-{
-    *this = c;
-}
-
-bool DeleteFile_response::checkIntegrity(void)
-{
-    return DeleteFile_responseMarshaller::checkIntegrity(*this);
-}
-
-DeleteFile_response::DeleteFile_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
-
-bool DeleteFile_response::set_spaceAvailable(unsigned int spaceAvailable_)
-{
-    if (spaceAvailable_ > 2000000000)
-    {
-        return false;
-    }
-    spaceAvailable = spaceAvailable_;
-    return true;
-}
-
-unsigned int DeleteFile_response::get_spaceAvailable(void) const
-{
-    return spaceAvailable;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.cpp
deleted file mode 100644
index 39f231b2c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h"
-#include "ResultMarshaller.h"
-
-#include "DeleteFile_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteFile_responseMarshaller::checkIntegrity(DeleteFile_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteFile_responseMarshaller::fromString(const std::string& s,DeleteFile_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteFile_responseMarshaller::toString(const DeleteFile_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteFile_responseMarshaller::checkIntegrityConst(const DeleteFile_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.spaceAvailable>2000000000)  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value DeleteFile_responseMarshaller::toJSON(const DeleteFile_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  json["spaceAvailable"]=Json::Value(e.spaceAvailable);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool DeleteFile_responseMarshaller::fromJSON(const Json::Value& json,DeleteFile_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(!json.isMember("spaceAvailable"))  return false;
-    {
-      const Json::Value& j=json["spaceAvailable"];
-      if(!j.isInt())  return false;
-      c.spaceAvailable=j.asInt();
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.h
deleted file mode 100644
index 0be82951c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETEFILE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETEFILE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct DeleteFile_responseMarshaller
-  {
-    static bool checkIntegrity(DeleteFile_response& e);
-    static bool checkIntegrityConst(const DeleteFile_response& e);
-  
-    static bool fromString(const std::string& s,DeleteFile_response& e);
-    static const std::string toString(const DeleteFile_response& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteFile_response& e);
-    static Json::Value toJSON(const DeleteFile_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_request.cpp
deleted file mode 100644
index 1aa41fdec..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h"
-#include "DeleteInteractionChoiceSet_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DeleteInteractionChoiceSet_request::~DeleteInteractionChoiceSet_request(void)
-{
-}
-
-
-DeleteInteractionChoiceSet_request::DeleteInteractionChoiceSet_request(const DeleteInteractionChoiceSet_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool DeleteInteractionChoiceSet_request::checkIntegrity(void)
-{
-  return DeleteInteractionChoiceSet_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DeleteInteractionChoiceSet_request::DeleteInteractionChoiceSet_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool DeleteInteractionChoiceSet_request::set_interactionChoiceSetID(unsigned int interactionChoiceSetID_)
-{
-  if(interactionChoiceSetID_>2000000000)  return false;
-  interactionChoiceSetID=interactionChoiceSetID_;
-  return true;
-}
-
-
-
-
-unsigned int DeleteInteractionChoiceSet_request::get_interactionChoiceSetID(void) const
-{
-  return interactionChoiceSetID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.cpp
deleted file mode 100644
index d34370443..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h"
-
-
-#include "DeleteInteractionChoiceSet_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteInteractionChoiceSet_requestMarshaller::checkIntegrity(DeleteInteractionChoiceSet_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteInteractionChoiceSet_requestMarshaller::fromString(const std::string& s,DeleteInteractionChoiceSet_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteInteractionChoiceSet_requestMarshaller::toString(const DeleteInteractionChoiceSet_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteInteractionChoiceSet_requestMarshaller::checkIntegrityConst(const DeleteInteractionChoiceSet_request& s)
-{
-  if(s.interactionChoiceSetID>2000000000)  return false;
-  return true;
-}
-
-Json::Value DeleteInteractionChoiceSet_requestMarshaller::toJSON(const DeleteInteractionChoiceSet_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["interactionChoiceSetID"]=Json::Value(e.interactionChoiceSetID);
-
-  return json;
-}
-
-
-bool DeleteInteractionChoiceSet_requestMarshaller::fromJSON(const Json::Value& json,DeleteInteractionChoiceSet_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("interactionChoiceSetID"))  return false;
-    {
-      const Json::Value& j=json["interactionChoiceSetID"];
-      if(!j.isInt())  return false;
-      c.interactionChoiceSetID=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.h
deleted file mode 100644
index 353036deb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETEINTERACTIONCHOICESET_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETEINTERACTIONCHOICESET_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct DeleteInteractionChoiceSet_requestMarshaller
-  {
-    static bool checkIntegrity(DeleteInteractionChoiceSet_request& e);
-    static bool checkIntegrityConst(const DeleteInteractionChoiceSet_request& e);
-  
-    static bool fromString(const std::string& s,DeleteInteractionChoiceSet_request& e);
-    static const std::string toString(const DeleteInteractionChoiceSet_request& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteInteractionChoiceSet_request& e);
-    static Json::Value toJSON(const DeleteInteractionChoiceSet_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_response.cpp
deleted file mode 100644
index ee1ace74e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h"
-#include "DeleteInteractionChoiceSet_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-DeleteInteractionChoiceSet_response& DeleteInteractionChoiceSet_response::operator =(
-    const DeleteInteractionChoiceSet_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-DeleteInteractionChoiceSet_response::~DeleteInteractionChoiceSet_response(void)
-{}
-
-DeleteInteractionChoiceSet_response::DeleteInteractionChoiceSet_response(const DeleteInteractionChoiceSet_response& c)
-{
-    *this = c;
-}
-
-bool DeleteInteractionChoiceSet_response::checkIntegrity(void)
-{
-    return DeleteInteractionChoiceSet_responseMarshaller::checkIntegrity(*this);
-}
-
-DeleteInteractionChoiceSet_response::DeleteInteractionChoiceSet_response(void)
-    : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.cpp
deleted file mode 100644
index 3ed44d9fd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h"
-#include "ResultMarshaller.h"
-
-#include "DeleteInteractionChoiceSet_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteInteractionChoiceSet_responseMarshaller::checkIntegrity(DeleteInteractionChoiceSet_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteInteractionChoiceSet_responseMarshaller::fromString(const std::string& s,DeleteInteractionChoiceSet_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteInteractionChoiceSet_responseMarshaller::toString(const DeleteInteractionChoiceSet_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteInteractionChoiceSet_responseMarshaller::checkIntegrityConst(const DeleteInteractionChoiceSet_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value DeleteInteractionChoiceSet_responseMarshaller::toJSON(const DeleteInteractionChoiceSet_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool DeleteInteractionChoiceSet_responseMarshaller::fromJSON(const Json::Value& json,DeleteInteractionChoiceSet_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.h
deleted file mode 100644
index 4c83768c5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETEINTERACTIONCHOICESET_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETEINTERACTIONCHOICESET_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct DeleteInteractionChoiceSet_responseMarshaller
-  {
-    static bool checkIntegrity(DeleteInteractionChoiceSet_response& e);
-    static bool checkIntegrityConst(const DeleteInteractionChoiceSet_response& e);
-  
-    static bool fromString(const std::string& s,DeleteInteractionChoiceSet_response& e);
-    static const std::string toString(const DeleteInteractionChoiceSet_response& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteInteractionChoiceSet_response& e);
-    static Json::Value toJSON(const DeleteInteractionChoiceSet_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_request.cpp
deleted file mode 100644
index d9b54acdd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h"
-#include "DeleteSubMenu_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DeleteSubMenu_request::~DeleteSubMenu_request(void)
-{
-}
-
-
-DeleteSubMenu_request::DeleteSubMenu_request(const DeleteSubMenu_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool DeleteSubMenu_request::checkIntegrity(void)
-{
-  return DeleteSubMenu_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DeleteSubMenu_request::DeleteSubMenu_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool DeleteSubMenu_request::set_menuID(unsigned int menuID_)
-{
-  if(menuID_>2000000000)  return false;
-  menuID=menuID_;
-  return true;
-}
-
-
-
-
-unsigned int DeleteSubMenu_request::get_menuID(void) const
-{
-  return menuID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.cpp
deleted file mode 100644
index f6500beaa..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h"
-
-
-#include "DeleteSubMenu_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteSubMenu_requestMarshaller::checkIntegrity(DeleteSubMenu_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteSubMenu_requestMarshaller::fromString(const std::string& s,DeleteSubMenu_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteSubMenu_requestMarshaller::toString(const DeleteSubMenu_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteSubMenu_requestMarshaller::checkIntegrityConst(const DeleteSubMenu_request& s)
-{
-  if(s.menuID>2000000000)  return false;
-  return true;
-}
-
-Json::Value DeleteSubMenu_requestMarshaller::toJSON(const DeleteSubMenu_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["menuID"]=Json::Value(e.menuID);
-
-  return json;
-}
-
-
-bool DeleteSubMenu_requestMarshaller::fromJSON(const Json::Value& json,DeleteSubMenu_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("menuID"))  return false;
-    {
-      const Json::Value& j=json["menuID"];
-      if(!j.isInt())  return false;
-      c.menuID=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.h
deleted file mode 100644
index 8b3159d8f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETESUBMENU_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETESUBMENU_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct DeleteSubMenu_requestMarshaller
-  {
-    static bool checkIntegrity(DeleteSubMenu_request& e);
-    static bool checkIntegrityConst(const DeleteSubMenu_request& e);
-  
-    static bool fromString(const std::string& s,DeleteSubMenu_request& e);
-    static const std::string toString(const DeleteSubMenu_request& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteSubMenu_request& e);
-    static Json::Value toJSON(const DeleteSubMenu_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_response.cpp
deleted file mode 100644
index 87b81d2c8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h"
-#include "DeleteSubMenu_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-DeleteSubMenu_response& DeleteSubMenu_response::operator =(const DeleteSubMenu_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-DeleteSubMenu_response::~DeleteSubMenu_response(void)
-{}
-
-DeleteSubMenu_response::DeleteSubMenu_response(const DeleteSubMenu_response& c)
-{
-    *this = c;
-}
-
-bool DeleteSubMenu_response::checkIntegrity(void)
-{
-    return DeleteSubMenu_responseMarshaller::checkIntegrity(*this);
-}
-
-DeleteSubMenu_response::DeleteSubMenu_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.cpp
deleted file mode 100644
index 293cc153d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h"
-#include "ResultMarshaller.h"
-
-#include "DeleteSubMenu_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DeleteSubMenu_responseMarshaller::checkIntegrity(DeleteSubMenu_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DeleteSubMenu_responseMarshaller::fromString(const std::string& s,DeleteSubMenu_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DeleteSubMenu_responseMarshaller::toString(const DeleteSubMenu_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DeleteSubMenu_responseMarshaller::checkIntegrityConst(const DeleteSubMenu_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value DeleteSubMenu_responseMarshaller::toJSON(const DeleteSubMenu_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool DeleteSubMenu_responseMarshaller::fromJSON(const Json::Value& json,DeleteSubMenu_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.h
deleted file mode 100644
index 2495f3bfa..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DELETESUBMENU_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DELETESUBMENU_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct DeleteSubMenu_responseMarshaller
-  {
-    static bool checkIntegrity(DeleteSubMenu_response& e);
-    static bool checkIntegrityConst(const DeleteSubMenu_response& e);
-  
-    static bool fromString(const std::string& s,DeleteSubMenu_response& e);
-    static const std::string toString(const DeleteSubMenu_response& e);
-  
-    static bool fromJSON(const Json::Value& s,DeleteSubMenu_response& e);
-    static Json::Value toJSON(const DeleteSubMenu_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_request.cpp
deleted file mode 100644
index ea1f50c08..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h"
-#include "DialNumber_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DialNumber_request::~DialNumber_request(void)
-{
-}
-
-
-DialNumber_request::DialNumber_request(const DialNumber_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool DialNumber_request::checkIntegrity(void)
-{
-  return DialNumber_requestMarshaller::checkIntegrity(*this);
-}
-
-
-DialNumber_request::DialNumber_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool DialNumber_request::set_number(const std::string& number_)
-{
-  if(number_.length()>500)  return false;
-  number=number_;
-  return true;
-}
-
-
-
-
-const std::string& DialNumber_request::get_number(void) const 
-{
-  return number;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.cpp
deleted file mode 100644
index 8e12e2096..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h"
-
-
-#include "DialNumber_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DialNumber_requestMarshaller::checkIntegrity(DialNumber_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DialNumber_requestMarshaller::fromString(const std::string& s,DialNumber_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DialNumber_requestMarshaller::toString(const DialNumber_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DialNumber_requestMarshaller::checkIntegrityConst(const DialNumber_request& s)
-{
-  if(s.number.length()>500)  return false;
-  return true;
-}
-
-Json::Value DialNumber_requestMarshaller::toJSON(const DialNumber_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["number"]=Json::Value(e.number);
-
-  return json;
-}
-
-
-bool DialNumber_requestMarshaller::fromJSON(const Json::Value& json,DialNumber_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("number"))  return false;
-    {
-      const Json::Value& j=json["number"];
-      if(!j.isString())  return false;
-      c.number=j.asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.h
deleted file mode 100644
index 2b35bf566..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DIALNUMBER_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DIALNUMBER_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct DialNumber_requestMarshaller
-  {
-    static bool checkIntegrity(DialNumber_request& e);
-    static bool checkIntegrityConst(const DialNumber_request& e);
-  
-    static bool fromString(const std::string& s,DialNumber_request& e);
-    static const std::string toString(const DialNumber_request& e);
-  
-    static bool fromJSON(const Json::Value& s,DialNumber_request& e);
-    static Json::Value toJSON(const DialNumber_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_response.cpp
deleted file mode 100644
index ef8422e16..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h"
-#include "DialNumber_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-DialNumber_response& DialNumber_response::operator =(const DialNumber_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-DialNumber_response::~DialNumber_response(void)
-{}
-
-DialNumber_response::DialNumber_response(const DialNumber_response& c)
-{
-    *this = c;
-}
-
-bool DialNumber_response::checkIntegrity(void)
-{
-    return DialNumber_responseMarshaller::checkIntegrity(*this);
-}
-
-DialNumber_response::DialNumber_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.cpp
deleted file mode 100644
index b8a0e8c27..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h"
-#include "ResultMarshaller.h"
-
-#include "DialNumber_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DialNumber_responseMarshaller::checkIntegrity(DialNumber_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DialNumber_responseMarshaller::fromString(const std::string& s,DialNumber_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DialNumber_responseMarshaller::toString(const DialNumber_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DialNumber_responseMarshaller::checkIntegrityConst(const DialNumber_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value DialNumber_responseMarshaller::toJSON(const DialNumber_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool DialNumber_responseMarshaller::fromJSON(const Json::Value& json,DialNumber_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.h
deleted file mode 100644
index ae7839828..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DIALNUMBER_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DIALNUMBER_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct DialNumber_responseMarshaller
-  {
-    static bool checkIntegrity(DialNumber_response& e);
-    static bool checkIntegrityConst(const DialNumber_response& e);
-  
-    static bool fromString(const std::string& s,DialNumber_response& e);
-    static const std::string toString(const DialNumber_response& e);
-  
-    static bool fromJSON(const Json::Value& s,DialNumber_response& e);
-    static Json::Value toJSON(const DialNumber_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.cpp
deleted file mode 100644
index 5f18ffbc4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/Dimension.h"
-#include "DimensionMarshaller.h"
-#include "DimensionMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const Dimension::DimensionInternal DimensionMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return Dimension::INVALID_ENUM;
-  const struct PerfectHashTable* p=Dimension_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<Dimension::DimensionInternal>(p->idx) : Dimension::INVALID_ENUM;
-}
-
-
-bool DimensionMarshaller::fromJSON(const Json::Value& s,Dimension& e)
-{
-  e.mInternal=Dimension::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=Dimension::INVALID_ENUM);
-}
-
-
-Json::Value DimensionMarshaller::toJSON(const Dimension& e)
-{
-  if(e.mInternal==Dimension::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool DimensionMarshaller::fromString(const std::string& s,Dimension& e)
-{
-  e.mInternal=Dimension::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string DimensionMarshaller::toString(const Dimension& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==Dimension::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable DimensionMarshaller::mHashTable[3]=
-{
-  {"NO_FIX",0},
-  {"2D",1},
-  {"3D",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp
deleted file mode 100644
index 2227e5fb8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name Dimension_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-NO_FIX,0
-2D,1
-3D,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.h
deleted file mode 100644
index 5db7336b2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DIMENSIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DIMENSIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Dimension.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for Dimension
-
-  class DimensionMarshaller
-  {
-  public:
-  
-    static std::string toName(const Dimension& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(Dimension& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=Dimension::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(Dimension& e)		{ return e.mInternal!=Dimension::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const Dimension& e)	{ return e.mInternal!=Dimension::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,Dimension& e);
-    static const std::string toString(const Dimension& e);
-  
-    static bool fromJSON(const Json::Value& s,Dimension& e);
-    static Json::Value toJSON(const Dimension& e);
-  
-    static const char* getName(Dimension::DimensionInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const Dimension::DimensionInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.inc
deleted file mode 100644
index fec0eb519..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.inc
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp  */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 6
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 6
-/* maximum key range = 5, duplicates = 0 */
-
-class Dimension_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Dimension_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      1, 0, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 0, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-Dimension_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  2,  2,  0,  0,  6
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp"
-      {"3D",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp"
-      {"2D",1},
-      {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DimensionMarshaller.gp"
-      {"NO_FIX",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilities.cpp
deleted file mode 100644
index a236b3d0a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilities.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h"
-#include "DisplayCapabilitiesMarshaller.h"
-#include "DisplayTypeMarshaller.h"
-#include "MediaClockFormatMarshaller.h"
-#include "TextFieldMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-DisplayCapabilities::DisplayCapabilities(const DisplayCapabilities& c)
-{
-  *this=c;
-}
-
-
-bool DisplayCapabilities::checkIntegrity(void)
-{
-  return DisplayCapabilitiesMarshaller::checkIntegrity(*this);
-}
-
-
-DisplayCapabilities::DisplayCapabilities(void)
-{
-}
-
-
-
-bool DisplayCapabilities::set_displayType(const DisplayType& displayType_)
-{
-  if(!DisplayTypeMarshaller::checkIntegrityConst(displayType_))   return false;
-  displayType=displayType_;
-  return true;
-}
-
-bool DisplayCapabilities::set_mediaClockFormats(const std::vector<MediaClockFormat>& mediaClockFormats_)
-{
-  unsigned int i=mediaClockFormats_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!MediaClockFormatMarshaller::checkIntegrityConst(mediaClockFormats_[i]))   return false;
-  }
-  mediaClockFormats=mediaClockFormats_;
-  return true;
-}
-
-bool DisplayCapabilities::set_textFields(const std::vector<TextField>& textFields_)
-{
-  unsigned int i=textFields_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TextFieldMarshaller::checkIntegrityConst(textFields_[i]))   return false;
-  }
-  textFields=textFields_;
-  return true;
-}
-
-
-
-
-const DisplayType& DisplayCapabilities::get_displayType(void) const 
-{
-  return displayType;
-}
-
-
-const std::vector<MediaClockFormat>& DisplayCapabilities::get_mediaClockFormats(void) const 
-{
-  return mediaClockFormats;
-}
-
-
-const std::vector<TextField>& DisplayCapabilities::get_textFields(void) const 
-{
-  return textFields;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.cpp
deleted file mode 100644
index df285bc3c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h"
-#include "DisplayTypeMarshaller.h"
-#include "MediaClockFormatMarshaller.h"
-#include "TextFieldMarshaller.h"
-
-#include "DisplayCapabilitiesMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool DisplayCapabilitiesMarshaller::checkIntegrity(DisplayCapabilities& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool DisplayCapabilitiesMarshaller::fromString(const std::string& s,DisplayCapabilities& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string DisplayCapabilitiesMarshaller::toString(const DisplayCapabilities& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool DisplayCapabilitiesMarshaller::checkIntegrityConst(const DisplayCapabilities& s)
-{
-  if(!DisplayTypeMarshaller::checkIntegrityConst(s.displayType))  return false;
-  {
-    unsigned int i=s.mediaClockFormats.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!MediaClockFormatMarshaller::checkIntegrityConst(s.mediaClockFormats[i]))   return false;
-    }
-  }
-  {
-    unsigned int i=s.textFields.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TextFieldMarshaller::checkIntegrityConst(s.textFields[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value DisplayCapabilitiesMarshaller::toJSON(const DisplayCapabilities& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["displayType"]=DisplayTypeMarshaller::toJSON(e.displayType);
-
-  json["mediaClockFormats"]=Json::Value(Json::arrayValue);
-  json["mediaClockFormats"].resize(e.mediaClockFormats.size());
-  for(unsigned int i=0;i<e.mediaClockFormats.size();i++)
-    json["mediaClockFormats"][i]=MediaClockFormatMarshaller::toJSON(e.mediaClockFormats[i]);
-
-  json["textFields"]=Json::Value(Json::arrayValue);
-  json["textFields"].resize(e.textFields.size());
-  for(unsigned int i=0;i<e.textFields.size();i++)
-    json["textFields"][i]=TextFieldMarshaller::toJSON(e.textFields[i]);
-
-
-  return json;
-}
-
-
-bool DisplayCapabilitiesMarshaller::fromJSON(const Json::Value& json,DisplayCapabilities& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("displayType"))  return false;
-    {
-      const Json::Value& j=json["displayType"];
-      if(!DisplayTypeMarshaller::fromJSON(j,c.displayType))
-        return false;
-    }
-    if(!json.isMember("mediaClockFormats"))  return false;
-    {
-      const Json::Value& j=json["mediaClockFormats"];
-      if(!j.isArray())  return false;
-      c.mediaClockFormats.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          MediaClockFormat t;
-          if(!MediaClockFormatMarshaller::fromJSON(j[i],t))
-            return false;
-          c.mediaClockFormats[i]=t;
-        }
-
-    }
-    if(!json.isMember("textFields"))  return false;
-    {
-      const Json::Value& j=json["textFields"];
-      if(!j.isArray())  return false;
-      c.textFields.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          TextField t;
-          if(!TextFieldMarshaller::fromJSON(j[i],t))
-            return false;
-          c.textFields[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.h
deleted file mode 100644
index c33c6fdd0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DISPLAYCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DISPLAYCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct DisplayCapabilitiesMarshaller
-  {
-    static bool checkIntegrity(DisplayCapabilities& e);
-    static bool checkIntegrityConst(const DisplayCapabilities& e);
-  
-    static bool fromString(const std::string& s,DisplayCapabilities& e);
-    static const std::string toString(const DisplayCapabilities& e);
-  
-    static bool fromJSON(const Json::Value& s,DisplayCapabilities& e);
-    static Json::Value toJSON(const DisplayCapabilities& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.cpp
deleted file mode 100644
index c7bcf0f3d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/DisplayType.h"
-#include "DisplayTypeMarshaller.h"
-#include "DisplayTypeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const DisplayType::DisplayTypeInternal DisplayTypeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return DisplayType::INVALID_ENUM;
-  const struct PerfectHashTable* p=DisplayType_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<DisplayType::DisplayTypeInternal>(p->idx) : DisplayType::INVALID_ENUM;
-}
-
-
-bool DisplayTypeMarshaller::fromJSON(const Json::Value& s,DisplayType& e)
-{
-  e.mInternal=DisplayType::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=DisplayType::INVALID_ENUM);
-}
-
-
-Json::Value DisplayTypeMarshaller::toJSON(const DisplayType& e)
-{
-  if(e.mInternal==DisplayType::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool DisplayTypeMarshaller::fromString(const std::string& s,DisplayType& e)
-{
-  e.mInternal=DisplayType::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string DisplayTypeMarshaller::toString(const DisplayType& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==DisplayType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable DisplayTypeMarshaller::mHashTable[9]=
-{
-  {"CID",0},
-  {"TYPE2",1},
-  {"TYPE5",2},
-  {"NGN",3},
-  {"GEN2_8_DMA",4},
-  {"GEN2_6_DMA",5},
-  {"MFD3",6},
-  {"MFD4",7},
-  {"MFD5",8}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp
deleted file mode 100644
index e2ba9124a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp
+++ /dev/null
@@ -1,25 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name DisplayType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-CID,0
-TYPE2,1
-TYPE5,2
-NGN,3
-GEN2_8_DMA,4
-GEN2_6_DMA,5
-MFD3,6
-MFD4,7
-MFD5,8
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.h
deleted file mode 100644
index 993e3ee5a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DISPLAYTYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DISPLAYTYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DisplayType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for DisplayType
-
-  class DisplayTypeMarshaller
-  {
-  public:
-  
-    static std::string toName(const DisplayType& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(DisplayType& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=DisplayType::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(DisplayType& e)		{ return e.mInternal!=DisplayType::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const DisplayType& e)	{ return e.mInternal!=DisplayType::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,DisplayType& e);
-    static const std::string toString(const DisplayType& e);
-  
-    static bool fromJSON(const Json::Value& s,DisplayType& e);
-    static Json::Value toJSON(const DisplayType& e);
-  
-    static const char* getName(DisplayType::DisplayTypeInternal e)
-    {
-       return (e>=0 && e<9) ? mHashTable[e].name : NULL;
-    }
-  
-    static const DisplayType::DisplayTypeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[9];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.inc
deleted file mode 100644
index feab4a103..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.inc
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp  */
-/* Computed positions: -k'6,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 9
-#define MIN_WORD_LENGTH 3
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 20
-/* maximum key range = 18, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class DisplayType_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-DisplayType_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      15, 10,  5,  0,  5, 21,  0, 21, 21, 21,
-      21, 21, 21, 21, 21,  0, 21, 21,  5, 21,
-      21, 21, 21, 21, 21, 21, 21, 21,  0, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-      21, 21, 21, 21, 21, 21
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[5]];
-      /*FALLTHROUGH*/
-      case 5:
-      case 4:
-      case 3:
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-DisplayType_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  3,  4,  5,  0,  0,  3,  4, 10,  0,  0,  0,
-       4, 10,  0,  0,  0,  0,  5
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
-      {"NGN",3},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
-      {"MFD5",8},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
-      {"TYPE5",2},
-      {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
-      {"CID",0},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
-      {"MFD4",7},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
-      {"GEN2_8_DMA",4},
-      {""}, {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
-      {"MFD3",6},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
-      {"GEN2_6_DMA",5},
-      {""}, {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DisplayTypeMarshaller.gp"
-      {"TYPE2",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.cpp
deleted file mode 100644
index e1386d46a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/DriverDistractionState.h"
-#include "DriverDistractionStateMarshaller.h"
-#include "DriverDistractionStateMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const DriverDistractionState::DriverDistractionStateInternal DriverDistractionStateMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return DriverDistractionState::INVALID_ENUM;
-  const struct PerfectHashTable* p=DriverDistractionState_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<DriverDistractionState::DriverDistractionStateInternal>(p->idx) : DriverDistractionState::INVALID_ENUM;
-}
-
-
-bool DriverDistractionStateMarshaller::fromJSON(const Json::Value& s,DriverDistractionState& e)
-{
-  e.mInternal=DriverDistractionState::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=DriverDistractionState::INVALID_ENUM);
-}
-
-
-Json::Value DriverDistractionStateMarshaller::toJSON(const DriverDistractionState& e)
-{
-  if(e.mInternal==DriverDistractionState::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool DriverDistractionStateMarshaller::fromString(const std::string& s,DriverDistractionState& e)
-{
-  e.mInternal=DriverDistractionState::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string DriverDistractionStateMarshaller::toString(const DriverDistractionState& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==DriverDistractionState::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable DriverDistractionStateMarshaller::mHashTable[2]=
-{
-  {"DD_ON",0},
-  {"DD_OFF",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp
deleted file mode 100644
index c0b6849cd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name DriverDistractionState_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-DD_ON,0
-DD_OFF,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.h
deleted file mode 100644
index 61e3c4bfd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_DRIVERDISTRACTIONSTATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_DRIVERDISTRACTIONSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/DriverDistractionState.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for DriverDistractionState
-
-  class DriverDistractionStateMarshaller
-  {
-  public:
-  
-    static std::string toName(const DriverDistractionState& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(DriverDistractionState& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=DriverDistractionState::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(DriverDistractionState& e)		{ return e.mInternal!=DriverDistractionState::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const DriverDistractionState& e)	{ return e.mInternal!=DriverDistractionState::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,DriverDistractionState& e);
-    static const std::string toString(const DriverDistractionState& e);
-  
-    static bool fromJSON(const Json::Value& s,DriverDistractionState& e);
-    static Json::Value toJSON(const DriverDistractionState& e);
-  
-    static const char* getName(DriverDistractionState::DriverDistractionStateInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const DriverDistractionState::DriverDistractionStateInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.inc
deleted file mode 100644
index 122d4837e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 6
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 6
-/* maximum key range = 2, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class DriverDistractionState_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-DriverDistractionState_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-DriverDistractionState_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  5,  6
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp"
-      {"DD_ON",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/DriverDistractionStateMarshaller.gp"
-      {"DD_OFF",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_request.cpp
deleted file mode 100644
index 7ae78baa3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_request.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h"
-#include "EncodedSyncPData_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-EncodedSyncPData_request::~EncodedSyncPData_request(void)
-{
-}
-
-
-EncodedSyncPData_request::EncodedSyncPData_request(const EncodedSyncPData_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool EncodedSyncPData_request::checkIntegrity(void)
-{
-  return EncodedSyncPData_requestMarshaller::checkIntegrity(*this);
-}
-
-
-EncodedSyncPData_request::EncodedSyncPData_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool EncodedSyncPData_request::set_data(const std::vector<std::string>& data_)
-{
-  unsigned int i=data_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(data_[i].length()>10000)  return false;
-  }
-  data=data_;
-  return true;
-}
-
-
-
-
-const std::vector<std::string>& EncodedSyncPData_request::get_data(void) const 
-{
-  return data;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.cpp
deleted file mode 100644
index 7d94b0404..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h"
-
-
-#include "EncodedSyncPData_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool EncodedSyncPData_requestMarshaller::checkIntegrity(EncodedSyncPData_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool EncodedSyncPData_requestMarshaller::fromString(const std::string& s,EncodedSyncPData_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string EncodedSyncPData_requestMarshaller::toString(const EncodedSyncPData_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool EncodedSyncPData_requestMarshaller::checkIntegrityConst(const EncodedSyncPData_request& s)
-{
-  {
-    unsigned int i=s.data.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.data[i].length()>10000)  return false;
-    }
-  }
-  return true;
-}
-
-Json::Value EncodedSyncPData_requestMarshaller::toJSON(const EncodedSyncPData_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["data"]=Json::Value(Json::arrayValue);
-  json["data"].resize(e.data.size());
-  for(unsigned int i=0;i<e.data.size();i++)
-    json["data"][i]=Json::Value(e.data[i]);
-
-  return json;
-}
-
-
-bool EncodedSyncPData_requestMarshaller::fromJSON(const Json::Value& json,EncodedSyncPData_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("data"))  return false;
-    {
-      const Json::Value& j=json["data"];
-      if(!j.isArray())  return false;
-      c.data.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.data[i]=j[i].asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.h
deleted file mode 100644
index a8b37e8f6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ENCODEDSYNCPDATA_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ENCODEDSYNCPDATA_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct EncodedSyncPData_requestMarshaller
-  {
-    static bool checkIntegrity(EncodedSyncPData_request& e);
-    static bool checkIntegrityConst(const EncodedSyncPData_request& e);
-  
-    static bool fromString(const std::string& s,EncodedSyncPData_request& e);
-    static const std::string toString(const EncodedSyncPData_request& e);
-  
-    static bool fromJSON(const Json::Value& s,EncodedSyncPData_request& e);
-    static Json::Value toJSON(const EncodedSyncPData_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_response.cpp
deleted file mode 100644
index 2c748c718..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h"
-#include "EncodedSyncPData_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-EncodedSyncPData_response& EncodedSyncPData_response::operator =(const EncodedSyncPData_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-EncodedSyncPData_response::~EncodedSyncPData_response(void)
-{}
-
-
-EncodedSyncPData_response::EncodedSyncPData_response(const EncodedSyncPData_response& c)
-{
-    *this = c;
-}
-
-bool EncodedSyncPData_response::checkIntegrity(void)
-{
-    return EncodedSyncPData_responseMarshaller::checkIntegrity(*this);
-}
-
-EncodedSyncPData_response::EncodedSyncPData_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.cpp
deleted file mode 100644
index 23092f8dc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h"
-#include "ResultMarshaller.h"
-
-#include "EncodedSyncPData_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool EncodedSyncPData_responseMarshaller::checkIntegrity(EncodedSyncPData_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool EncodedSyncPData_responseMarshaller::fromString(const std::string& s,EncodedSyncPData_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string EncodedSyncPData_responseMarshaller::toString(const EncodedSyncPData_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool EncodedSyncPData_responseMarshaller::checkIntegrityConst(const EncodedSyncPData_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value EncodedSyncPData_responseMarshaller::toJSON(const EncodedSyncPData_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool EncodedSyncPData_responseMarshaller::fromJSON(const Json::Value& json,EncodedSyncPData_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.h
deleted file mode 100644
index b0298055d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ENCODEDSYNCPDATA_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ENCODEDSYNCPDATA_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct EncodedSyncPData_responseMarshaller
-  {
-    static bool checkIntegrity(EncodedSyncPData_response& e);
-    static bool checkIntegrityConst(const EncodedSyncPData_response& e);
-  
-    static bool fromString(const std::string& s,EncodedSyncPData_response& e);
-    static const std::string toString(const EncodedSyncPData_response& e);
-  
-    static bool fromJSON(const Json::Value& s,EncodedSyncPData_response& e);
-    static Json::Value toJSON(const EncodedSyncPData_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_request.cpp
deleted file mode 100644
index af0fceaac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_request.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h"
-#include "EndAudioPassThru_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-EndAudioPassThru_request::~EndAudioPassThru_request(void)
-{
-}
-
-
-EndAudioPassThru_request::EndAudioPassThru_request(const EndAudioPassThru_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool EndAudioPassThru_request::checkIntegrity(void)
-{
-  return EndAudioPassThru_requestMarshaller::checkIntegrity(*this);
-}
-
-
-EndAudioPassThru_request::EndAudioPassThru_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.cpp
deleted file mode 100644
index 02e625b33..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h"
-
-
-#include "EndAudioPassThru_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool EndAudioPassThru_requestMarshaller::checkIntegrity(EndAudioPassThru_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool EndAudioPassThru_requestMarshaller::fromString(const std::string& s,EndAudioPassThru_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string EndAudioPassThru_requestMarshaller::toString(const EndAudioPassThru_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool EndAudioPassThru_requestMarshaller::checkIntegrityConst(const EndAudioPassThru_request& s)
-{
-  return true;
-}
-
-Json::Value EndAudioPassThru_requestMarshaller::toJSON(const EndAudioPassThru_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  return json;
-}
-
-
-bool EndAudioPassThru_requestMarshaller::fromJSON(const Json::Value& json,EndAudioPassThru_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.h
deleted file mode 100644
index 15b2c7e2d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ENDAUDIOPASSTHRU_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ENDAUDIOPASSTHRU_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct EndAudioPassThru_requestMarshaller
-  {
-    static bool checkIntegrity(EndAudioPassThru_request& e);
-    static bool checkIntegrityConst(const EndAudioPassThru_request& e);
-  
-    static bool fromString(const std::string& s,EndAudioPassThru_request& e);
-    static const std::string toString(const EndAudioPassThru_request& e);
-  
-    static bool fromJSON(const Json::Value& s,EndAudioPassThru_request& e);
-    static Json::Value toJSON(const EndAudioPassThru_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_response.cpp
deleted file mode 100644
index 30b966b94..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h"
-#include "EndAudioPassThru_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-EndAudioPassThru_response& EndAudioPassThru_response::operator =(const EndAudioPassThru_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-EndAudioPassThru_response::~EndAudioPassThru_response(void)
-{}
-
-EndAudioPassThru_response::EndAudioPassThru_response(const EndAudioPassThru_response& c)
-{
-    *this = c;
-}
-
-bool EndAudioPassThru_response::checkIntegrity(void)
-{
-    return EndAudioPassThru_responseMarshaller::checkIntegrity(*this);
-}
-
-EndAudioPassThru_response::EndAudioPassThru_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.cpp
deleted file mode 100644
index 9ebee48c8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h"
-#include "ResultMarshaller.h"
-
-#include "EndAudioPassThru_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool EndAudioPassThru_responseMarshaller::checkIntegrity(EndAudioPassThru_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool EndAudioPassThru_responseMarshaller::fromString(const std::string& s,EndAudioPassThru_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string EndAudioPassThru_responseMarshaller::toString(const EndAudioPassThru_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool EndAudioPassThru_responseMarshaller::checkIntegrityConst(const EndAudioPassThru_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value EndAudioPassThru_responseMarshaller::toJSON(const EndAudioPassThru_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool EndAudioPassThru_responseMarshaller::fromJSON(const Json::Value& json,EndAudioPassThru_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.h
deleted file mode 100644
index 2f0e997b0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ENDAUDIOPASSTHRU_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ENDAUDIOPASSTHRU_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct EndAudioPassThru_responseMarshaller
-  {
-    static bool checkIntegrity(EndAudioPassThru_response& e);
-    static bool checkIntegrityConst(const EndAudioPassThru_response& e);
-  
-    static bool fromString(const std::string& s,EndAudioPassThru_response& e);
-    static const std::string toString(const EndAudioPassThru_response& e);
-  
-    static bool fromJSON(const Json::Value& s,EndAudioPassThru_response& e);
-    static Json::Value toJSON(const EndAudioPassThru_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.cpp
deleted file mode 100644
index 787108cac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/FileType.h"
-#include "FileTypeMarshaller.h"
-#include "FileTypeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const FileType::FileTypeInternal FileTypeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return FileType::INVALID_ENUM;
-  const struct PerfectHashTable* p=FileType_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<FileType::FileTypeInternal>(p->idx) : FileType::INVALID_ENUM;
-}
-
-
-bool FileTypeMarshaller::fromJSON(const Json::Value& s,FileType& e)
-{
-  e.mInternal=FileType::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=FileType::INVALID_ENUM);
-}
-
-
-Json::Value FileTypeMarshaller::toJSON(const FileType& e)
-{
-  if(e.mInternal==FileType::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool FileTypeMarshaller::fromString(const std::string& s,FileType& e)
-{
-  e.mInternal=FileType::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string FileTypeMarshaller::toString(const FileType& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==FileType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable FileTypeMarshaller::mHashTable[5]=
-{
-  {"GRAPHIC_BMP",0},
-  {"GRAPHIC_JPEG",1},
-  {"GRAPHIC_PNG",2},
-  {"AUDIO_WAVE",3},
-  {"AUDIO_MP3",4}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp
deleted file mode 100644
index b4d0f0af2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp
+++ /dev/null
@@ -1,21 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name FileType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-GRAPHIC_BMP,0
-GRAPHIC_JPEG,1
-GRAPHIC_PNG,2
-AUDIO_WAVE,3
-AUDIO_MP3,4
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.h
deleted file mode 100644
index baee50d4a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_FILETYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_FILETYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/FileType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for FileType
-
-  class FileTypeMarshaller
-  {
-  public:
-  
-    static std::string toName(const FileType& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(FileType& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=FileType::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(FileType& e)		{ return e.mInternal!=FileType::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const FileType& e)	{ return e.mInternal!=FileType::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,FileType& e);
-    static const std::string toString(const FileType& e);
-  
-    static bool fromJSON(const Json::Value& s,FileType& e);
-    static Json::Value toJSON(const FileType& e);
-  
-    static const char* getName(FileType::FileTypeInternal e)
-    {
-       return (e>=0 && e<5) ? mHashTable[e].name : NULL;
-    }
-  
-    static const FileType::FileTypeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[5];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.inc
deleted file mode 100644
index 1b8803d39..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.inc
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp  */
-/* Computed positions: -k'9' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 5
-#define MIN_WORD_LENGTH 9
-#define MAX_WORD_LENGTH 12
-#define MIN_HASH_VALUE 9
-#define MAX_HASH_VALUE 16
-/* maximum key range = 8, duplicates = 0 */
-
-class FileType_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-FileType_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17,  5, 17, 17, 17,
-      17, 17, 17, 17,  0, 17, 17, 17, 17, 17,
-       0, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17
-    };
-  return len + asso_values[(unsigned char)str[8]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-FileType_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  9, 10, 11, 12,  0,
-       0,  0, 11
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp"
-      {"AUDIO_MP3",4},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp"
-      {"AUDIO_WAVE",3},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp"
-      {"GRAPHIC_PNG",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp"
-      {"GRAPHIC_JPEG",1},
-      {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FileTypeMarshaller.gp"
-      {"GRAPHIC_BMP",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.cpp
deleted file mode 100644
index b6f59765b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/FunctionID.h"
-#include "FunctionIDMarshaller.h"
-#include "FunctionIDMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const FunctionID::FunctionIDInternal FunctionIDMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return FunctionID::INVALID_ENUM;
-  const struct PerfectHashTable* p=FunctionID_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<FunctionID::FunctionIDInternal>(p->idx) : FunctionID::INVALID_ENUM;
-}
-
-
-bool FunctionIDMarshaller::fromJSON(const Json::Value& s,FunctionID& e)
-{
-  e.mInternal=FunctionID::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=FunctionID::INVALID_ENUM);
-}
-
-
-Json::Value FunctionIDMarshaller::toJSON(const FunctionID& e)
-{
-  if(e.mInternal==FunctionID::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool FunctionIDMarshaller::fromString(const std::string& s,FunctionID& e)
-{
-  e.mInternal=FunctionID::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string FunctionIDMarshaller::toString(const FunctionID& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==FunctionID::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable FunctionIDMarshaller::mHashTable[51]=
-{
-  {"RESERVED",0},
-  {"RegisterAppInterfaceID",1},
-  {"UnregisterAppInterfaceID",2},
-  {"SetGlobalPropertiesID",3},
-  {"ResetGlobalPropertiesID",4},
-  {"AddCommandID",5},
-  {"DeleteCommandID",6},
-  {"AddSubMenuID",7},
-  {"DeleteSubMenuID",8},
-  {"CreateInteractionChoiceSetID",9},
-  {"PerformInteractionID",10},
-  {"DeleteInteractionChoiceSetID",11},
-  {"AlertID",12},
-  {"ShowID",13},
-  {"SpeakID",14},
-  {"SetMediaClockTimerID",15},
-  {"EncodedSyncPDataID",16},
-  {"DialNumberID",17},
-  {"PerformAudioPassThruID",18},
-  {"EndAudioPassThruID",19},
-  {"SubscribeButtonID",20},
-  {"UnsubscribeButtonID",21},
-  {"SubscribeVehicleDataID",22},
-  {"UnsubscribeVehicleDataID",23},
-  {"GetVehicleDataID",24},
-  {"ReadDIDID",25},
-  {"GetDTCsID",26},
-  {"ScrollableMessageID",27},
-  {"SliderID",28},
-  {"ShowConstantTBTID",29},
-  {"AlertManeuverID",30},
-  {"UpdateTurnListID",31},
-  {"ChangeRegistrationID",32},
-  {"GenericResponseID",33},
-  {"PutFileID",34},
-  {"DeleteFileID",35},
-  {"ListFilesID",36},
-  {"SetAppIconID",37},
-  {"SetDisplayLayoutID",38},
-  {"OnHMIStatusID",39},
-  {"OnAppInterfaceUnregisteredID",40},
-  {"OnButtonEventID",41},
-  {"OnButtonPressID",42},
-  {"OnVehicleDataID",43},
-  {"OnCommandID",44},
-  {"OnEncodedSyncPDataID",45},
-  {"OnTBTClientStateID",46},
-  {"OnDriverDistractionID",47},
-  {"OnPermissionsChangeID",48},
-  {"OnAudioPassThruID",49},
-  {"OnLanguageChangeID",50}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp
deleted file mode 100644
index 8b63cd618..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp
+++ /dev/null
@@ -1,67 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name FunctionID_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-RESERVED,0
-RegisterAppInterfaceID,1
-UnregisterAppInterfaceID,2
-SetGlobalPropertiesID,3
-ResetGlobalPropertiesID,4
-AddCommandID,5
-DeleteCommandID,6
-AddSubMenuID,7
-DeleteSubMenuID,8
-CreateInteractionChoiceSetID,9
-PerformInteractionID,10
-DeleteInteractionChoiceSetID,11
-AlertID,12
-ShowID,13
-SpeakID,14
-SetMediaClockTimerID,15
-EncodedSyncPDataID,16
-DialNumberID,17
-PerformAudioPassThruID,18
-EndAudioPassThruID,19
-SubscribeButtonID,20
-UnsubscribeButtonID,21
-SubscribeVehicleDataID,22
-UnsubscribeVehicleDataID,23
-GetVehicleDataID,24
-ReadDIDID,25
-GetDTCsID,26
-ScrollableMessageID,27
-SliderID,28
-ShowConstantTBTID,29
-AlertManeuverID,30
-UpdateTurnListID,31
-ChangeRegistrationID,32
-GenericResponseID,33
-PutFileID,34
-DeleteFileID,35
-ListFilesID,36
-SetAppIconID,37
-SetDisplayLayoutID,38
-OnHMIStatusID,39
-OnAppInterfaceUnregisteredID,40
-OnButtonEventID,41
-OnButtonPressID,42
-OnVehicleDataID,43
-OnCommandID,44
-OnEncodedSyncPDataID,45
-OnTBTClientStateID,46
-OnDriverDistractionID,47
-OnPermissionsChangeID,48
-OnAudioPassThruID,49
-OnLanguageChangeID,50
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.h
deleted file mode 100644
index 8886f7fa8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_FUNCTIONIDMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_FUNCTIONIDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/FunctionID.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for FunctionID
-
-  class FunctionIDMarshaller
-  {
-  public:
-  
-    static std::string toName(const FunctionID& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(FunctionID& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=FunctionID::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(FunctionID& e)		{ return e.mInternal!=FunctionID::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const FunctionID& e)	{ return e.mInternal!=FunctionID::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,FunctionID& e);
-    static const std::string toString(const FunctionID& e);
-  
-    static bool fromJSON(const Json::Value& s,FunctionID& e);
-    static Json::Value toJSON(const FunctionID& e);
-  
-    static const char* getName(FunctionID::FunctionIDInternal e)
-    {
-       return (e>=0 && e<51) ? mHashTable[e].name : NULL;
-    }
-  
-    static const FunctionID::FunctionIDInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[51];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.inc
deleted file mode 100644
index 132b431b9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.inc
+++ /dev/null
@@ -1,273 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp  */
-/* Computed positions: -k'4,9' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 51
-#define MIN_WORD_LENGTH 6
-#define MAX_WORD_LENGTH 28
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 72
-/* maximum key range = 66, duplicates = 0 */
-
-class FunctionID_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-FunctionID_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 35,  0, 45,  0,  0,
-      45, 10, 73, 73, 73, 73, 73, 10, 73, 73,
-      73,  0, 73, 35, 73, 73, 10, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73,  0, 25, 30,
-       5, 10,  0, 73, 15, 35,  0, 73, 40, 15,
-      15, 15, 20, 73,  5,  0,  0,  0, 25, 15,
-      73, 73, 25, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[8]+1];
-      /*FALLTHROUGH*/
-      case 8:
-      case 7:
-      case 6:
-      case 5:
-      case 4:
-        hval += asso_values[(unsigned char)str[3]];
-        break;
-    }
-  return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-FunctionID_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  7,  8,  9,  0, 11,  7,  8,
-       9, 15, 16, 17, 18, 19, 15,  6, 22, 13, 24, 15, 21, 17,
-      28,  0, 20, 21, 17, 18, 24, 20, 11, 12, 28,  0, 15, 16,
-      17, 18,  0, 20, 21, 22, 28, 19, 20,  0, 12, 18,  9, 15,
-       0, 22, 18,  0, 15,  0, 12, 23,  0,  0,  0, 12,  0,  0,
-       0,  0, 12
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"SpeakID",14},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"RESERVED",0},
-#line 43 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"GetDTCsID",26},
-      {""},
-#line 53 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"ListFilesID",36},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"AlertID",12},
-#line 45 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"SliderID",28},
-#line 42 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"ReadDIDID",25},
-#line 59 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"OnButtonPressID",42},
-#line 48 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"UpdateTurnListID",31},
-#line 37 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"SubscribeButtonID",20},
-#line 63 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"OnTBTClientStateID",46},
-#line 38 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"UnsubscribeButtonID",21},
-#line 47 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"AlertManeuverID",30},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"ShowID",13},
-#line 39 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"SubscribeVehicleDataID",22},
-#line 56 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"OnHMIStatusID",39},
-#line 40 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"UnsubscribeVehicleDataID",23},
-#line 60 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"OnVehicleDataID",43},
-#line 64 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"OnDriverDistractionID",47},
-#line 50 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"GenericResponseID",33},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"CreateInteractionChoiceSetID",9},
-      {""},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"SetMediaClockTimerID",15},
-#line 65 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"OnPermissionsChangeID",48},
-#line 46 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"ShowConstantTBTID",29},
-#line 67 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"OnLanguageChangeID",50},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"UnregisterAppInterfaceID",2},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"PerformInteractionID",10},
-#line 61 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"OnCommandID",44},
-#line 52 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"DeleteFileID",35},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"DeleteInteractionChoiceSetID",11},
-      {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"DeleteCommandID",6},
-#line 41 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"GetVehicleDataID",24},
-#line 66 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"OnAudioPassThruID",49},
-#line 55 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"SetDisplayLayoutID",38},
-      {""},
-#line 62 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"OnEncodedSyncPDataID",45},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"SetGlobalPropertiesID",3},
-#line 35 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"PerformAudioPassThruID",18},
-#line 57 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"OnAppInterfaceUnregisteredID",40},
-#line 44 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"ScrollableMessageID",27},
-#line 49 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"ChangeRegistrationID",32},
-      {""},
-#line 34 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"DialNumberID",17},
-#line 36 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"EndAudioPassThruID",19},
-#line 51 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"PutFileID",34},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"DeleteSubMenuID",8},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"RegisterAppInterfaceID",1},
-#line 33 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"EncodedSyncPDataID",16},
-      {""},
-#line 58 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"OnButtonEventID",41},
-      {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"AddSubMenuID",7},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"ResetGlobalPropertiesID",4},
-      {""}, {""}, {""},
-#line 54 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"SetAppIconID",37},
-      {""}, {""}, {""}, {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/FunctionIDMarshaller.gp"
-      {"AddCommandID",5}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSData.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSData.cpp
deleted file mode 100644
index c2c81057d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSData.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GPSData.h"
-#include "GPSDataMarshaller.h"
-#include "CompassDirectionMarshaller.h"
-#include "DimensionMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-GPSData::GPSData(const GPSData& c)
-{
-  *this=c;
-}
-
-
-bool GPSData::checkIntegrity(void)
-{
-  return GPSDataMarshaller::checkIntegrity(*this);
-}
-
-
-GPSData::GPSData(void)
-{
-}
-
-
-
-bool GPSData::set_actual(bool actual_)
-{
-  actual=actual_;
-  return true;
-}
-
-bool GPSData::set_altitude(int altitude_)
-{
-  if(altitude_>10000)  return false;
-  altitude=altitude_;
-  return true;
-}
-
-bool GPSData::set_compassDirection(const CompassDirection& compassDirection_)
-{
-  if(!CompassDirectionMarshaller::checkIntegrityConst(compassDirection_))   return false;
-  compassDirection=compassDirection_;
-  return true;
-}
-
-bool GPSData::set_dimension(const Dimension& dimension_)
-{
-  if(!DimensionMarshaller::checkIntegrityConst(dimension_))   return false;
-  dimension=dimension_;
-  return true;
-}
-
-bool GPSData::set_hdop(unsigned int hdop_)
-{
-  if(hdop_>31)  return false;
-  hdop=hdop_;
-  return true;
-}
-
-bool GPSData::set_heading(unsigned int heading_)
-{
-  if(heading_>360)  return false;
-  heading=heading_;
-  return true;
-}
-
-bool GPSData::set_latitudeDegrees(int latitudeDegrees_)
-{
-  if(latitudeDegrees_>1000000000)  return false;
-  latitudeDegrees=latitudeDegrees_;
-  return true;
-}
-
-bool GPSData::set_longitudeDegrees(int longitudeDegrees_)
-{
-  if(longitudeDegrees_>1000000000)  return false;
-  longitudeDegrees=longitudeDegrees_;
-  return true;
-}
-
-bool GPSData::set_pdop(unsigned int pdop_)
-{
-  if(pdop_>31)  return false;
-  pdop=pdop_;
-  return true;
-}
-
-bool GPSData::set_satellites(unsigned int satellites_)
-{
-  if(satellites_>31)  return false;
-  satellites=satellites_;
-  return true;
-}
-
-bool GPSData::set_speed(unsigned int speed_)
-{
-  if(speed_>400)  return false;
-  speed=speed_;
-  return true;
-}
-
-bool GPSData::set_utcDay(unsigned int utcDay_)
-{
-  if(utcDay_>31)  return false;
-  if(utcDay_<1)  return false;
-  utcDay=utcDay_;
-  return true;
-}
-
-bool GPSData::set_utcHours(unsigned int utcHours_)
-{
-  if(utcHours_>23)  return false;
-  utcHours=utcHours_;
-  return true;
-}
-
-bool GPSData::set_utcMinutes(unsigned int utcMinutes_)
-{
-  if(utcMinutes_>59)  return false;
-  utcMinutes=utcMinutes_;
-  return true;
-}
-
-bool GPSData::set_utcMonth(unsigned int utcMonth_)
-{
-  if(utcMonth_>12)  return false;
-  if(utcMonth_<1)  return false;
-  utcMonth=utcMonth_;
-  return true;
-}
-
-bool GPSData::set_utcSeconds(unsigned int utcSeconds_)
-{
-  if(utcSeconds_>59)  return false;
-  utcSeconds=utcSeconds_;
-  return true;
-}
-
-bool GPSData::set_utcYear(unsigned int utcYear_)
-{
-  if(utcYear_>2100)  return false;
-  if(utcYear_<2010)  return false;
-  utcYear=utcYear_;
-  return true;
-}
-
-bool GPSData::set_vdop(unsigned int vdop_)
-{
-  if(vdop_>31)  return false;
-  vdop=vdop_;
-  return true;
-}
-
-
-
-
-bool GPSData::get_actual(void) const
-{
-  return actual;
-}
-
-
-int GPSData::get_altitude(void) const
-{
-  return altitude;
-}
-
-
-const CompassDirection& GPSData::get_compassDirection(void) const 
-{
-  return compassDirection;
-}
-
-
-const Dimension& GPSData::get_dimension(void) const 
-{
-  return dimension;
-}
-
-
-unsigned int GPSData::get_hdop(void) const
-{
-  return hdop;
-}
-
-
-unsigned int GPSData::get_heading(void) const
-{
-  return heading;
-}
-
-
-int GPSData::get_latitudeDegrees(void) const
-{
-  return latitudeDegrees;
-}
-
-
-int GPSData::get_longitudeDegrees(void) const
-{
-  return longitudeDegrees;
-}
-
-
-unsigned int GPSData::get_pdop(void) const
-{
-  return pdop;
-}
-
-
-unsigned int GPSData::get_satellites(void) const
-{
-  return satellites;
-}
-
-
-unsigned int GPSData::get_speed(void) const
-{
-  return speed;
-}
-
-
-unsigned int GPSData::get_utcDay(void) const
-{
-  return utcDay;
-}
-
-
-unsigned int GPSData::get_utcHours(void) const
-{
-  return utcHours;
-}
-
-
-unsigned int GPSData::get_utcMinutes(void) const
-{
-  return utcMinutes;
-}
-
-
-unsigned int GPSData::get_utcMonth(void) const
-{
-  return utcMonth;
-}
-
-
-unsigned int GPSData::get_utcSeconds(void) const
-{
-  return utcSeconds;
-}
-
-
-unsigned int GPSData::get_utcYear(void) const
-{
-  return utcYear;
-}
-
-
-unsigned int GPSData::get_vdop(void) const
-{
-  return vdop;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.cpp
deleted file mode 100644
index 51ff8cb54..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GPSData.h"
-#include "CompassDirectionMarshaller.h"
-#include "DimensionMarshaller.h"
-
-#include "GPSDataMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool GPSDataMarshaller::checkIntegrity(GPSData& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GPSDataMarshaller::fromString(const std::string& s,GPSData& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GPSDataMarshaller::toString(const GPSData& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GPSDataMarshaller::checkIntegrityConst(const GPSData& s)
-{
-  if(s.altitude>10000)  return false;
-  if(s.altitude<-10000)  return false;
-  if(!CompassDirectionMarshaller::checkIntegrityConst(s.compassDirection))  return false;
-  if(!DimensionMarshaller::checkIntegrityConst(s.dimension))  return false;
-  if(s.hdop>31)  return false;
-  if(s.heading>360)  return false;
-  if(s.latitudeDegrees>1000000000)  return false;
-  if(s.latitudeDegrees<-1000000000)  return false;
-  if(s.longitudeDegrees>1000000000)  return false;
-  if(s.longitudeDegrees<-1000000000)  return false;
-  if(s.pdop>31)  return false;
-  if(s.satellites>31)  return false;
-  if(s.speed>400)  return false;
-  if(s.utcDay>31)  return false;
-  if(s.utcDay<1)  return false;
-  if(s.utcHours>23)  return false;
-  if(s.utcMinutes>59)  return false;
-  if(s.utcMonth>12)  return false;
-  if(s.utcMonth<1)  return false;
-  if(s.utcSeconds>59)  return false;
-  if(s.utcYear>2100)  return false;
-  if(s.utcYear<2010)  return false;
-  if(s.vdop>31)  return false;
-  return true;
-}
-
-Json::Value GPSDataMarshaller::toJSON(const GPSData& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["actual"]=Json::Value(e.actual);
-
-  json["altitude"]=Json::Value(e.altitude);
-
-  json["compassDirection"]=CompassDirectionMarshaller::toJSON(e.compassDirection);
-
-  json["dimension"]=DimensionMarshaller::toJSON(e.dimension);
-
-  json["hdop"]=Json::Value(e.hdop);
-
-  json["heading"]=Json::Value(e.heading);
-
-  json["latitudeDegrees"]=Json::Value(e.latitudeDegrees);
-
-  json["longitudeDegrees"]=Json::Value(e.longitudeDegrees);
-
-  json["pdop"]=Json::Value(e.pdop);
-
-  json["satellites"]=Json::Value(e.satellites);
-
-  json["speed"]=Json::Value(e.speed);
-
-  json["utcDay"]=Json::Value(e.utcDay);
-
-  json["utcHours"]=Json::Value(e.utcHours);
-
-  json["utcMinutes"]=Json::Value(e.utcMinutes);
-
-  json["utcMonth"]=Json::Value(e.utcMonth);
-
-  json["utcSeconds"]=Json::Value(e.utcSeconds);
-
-  json["utcYear"]=Json::Value(e.utcYear);
-
-  json["vdop"]=Json::Value(e.vdop);
-
-
-  return json;
-}
-
-
-bool GPSDataMarshaller::fromJSON(const Json::Value& json,GPSData& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("actual"))  return false;
-    {
-      const Json::Value& j=json["actual"];
-      if(!j.isBool())  return false;
-      c.actual=j.asBool();
-    }
-    if(!json.isMember("altitude"))  return false;
-    {
-      const Json::Value& j=json["altitude"];
-      if(!j.isInt())  return false;
-      c.altitude=j.asInt();
-    }
-    if(!json.isMember("compassDirection"))  return false;
-    {
-      const Json::Value& j=json["compassDirection"];
-      if(!CompassDirectionMarshaller::fromJSON(j,c.compassDirection))
-        return false;
-    }
-    if(!json.isMember("dimension"))  return false;
-    {
-      const Json::Value& j=json["dimension"];
-      if(!DimensionMarshaller::fromJSON(j,c.dimension))
-        return false;
-    }
-    if(!json.isMember("hdop"))  return false;
-    {
-      const Json::Value& j=json["hdop"];
-      if(!j.isInt())  return false;
-      c.hdop=j.asInt();
-    }
-    if(!json.isMember("heading"))  return false;
-    {
-      const Json::Value& j=json["heading"];
-      if(!j.isInt())  return false;
-      c.heading=j.asInt();
-    }
-    if(!json.isMember("latitudeDegrees"))  return false;
-    {
-      const Json::Value& j=json["latitudeDegrees"];
-      if(!j.isInt())  return false;
-      c.latitudeDegrees=j.asInt();
-    }
-    if(!json.isMember("longitudeDegrees"))  return false;
-    {
-      const Json::Value& j=json["longitudeDegrees"];
-      if(!j.isInt())  return false;
-      c.longitudeDegrees=j.asInt();
-    }
-    if(!json.isMember("pdop"))  return false;
-    {
-      const Json::Value& j=json["pdop"];
-      if(!j.isInt())  return false;
-      c.pdop=j.asInt();
-    }
-    if(!json.isMember("satellites"))  return false;
-    {
-      const Json::Value& j=json["satellites"];
-      if(!j.isInt())  return false;
-      c.satellites=j.asInt();
-    }
-    if(!json.isMember("speed"))  return false;
-    {
-      const Json::Value& j=json["speed"];
-      if(!j.isInt())  return false;
-      c.speed=j.asInt();
-    }
-    if(!json.isMember("utcDay"))  return false;
-    {
-      const Json::Value& j=json["utcDay"];
-      if(!j.isInt())  return false;
-      c.utcDay=j.asInt();
-    }
-    if(!json.isMember("utcHours"))  return false;
-    {
-      const Json::Value& j=json["utcHours"];
-      if(!j.isInt())  return false;
-      c.utcHours=j.asInt();
-    }
-    if(!json.isMember("utcMinutes"))  return false;
-    {
-      const Json::Value& j=json["utcMinutes"];
-      if(!j.isInt())  return false;
-      c.utcMinutes=j.asInt();
-    }
-    if(!json.isMember("utcMonth"))  return false;
-    {
-      const Json::Value& j=json["utcMonth"];
-      if(!j.isInt())  return false;
-      c.utcMonth=j.asInt();
-    }
-    if(!json.isMember("utcSeconds"))  return false;
-    {
-      const Json::Value& j=json["utcSeconds"];
-      if(!j.isInt())  return false;
-      c.utcSeconds=j.asInt();
-    }
-    if(!json.isMember("utcYear"))  return false;
-    {
-      const Json::Value& j=json["utcYear"];
-      if(!j.isInt())  return false;
-      c.utcYear=j.asInt();
-    }
-    if(!json.isMember("vdop"))  return false;
-    {
-      const Json::Value& j=json["vdop"];
-      if(!j.isInt())  return false;
-      c.vdop=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.h
deleted file mode 100644
index bdc6a0cf6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GPSDataMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GPSDATAMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GPSDATAMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GPSData.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct GPSDataMarshaller
-  {
-    static bool checkIntegrity(GPSData& e);
-    static bool checkIntegrityConst(const GPSData& e);
-  
-    static bool fromString(const std::string& s,GPSData& e);
-    static const std::string toString(const GPSData& e);
-  
-    static bool fromJSON(const Json::Value& s,GPSData& e);
-    static Json::Value toJSON(const GPSData& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_response.cpp
deleted file mode 100644
index 9d5e427cd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h"
-#include "GenericResponse_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-GenericResponse_response& GenericResponse_response::operator =(const GenericResponse_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-GenericResponse_response::~GenericResponse_response(void)
-{}
-
-GenericResponse_response::GenericResponse_response(const GenericResponse_response& c)
-{
-    *this = c;
-}
-
-bool GenericResponse_response::checkIntegrity(void)
-{
-    return GenericResponse_responseMarshaller::checkIntegrity(*this);
-}
-
-GenericResponse_response::GenericResponse_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.cpp
deleted file mode 100644
index 5c9e368fb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h"
-#include "ResultMarshaller.h"
-
-#include "GenericResponse_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool GenericResponse_responseMarshaller::checkIntegrity(GenericResponse_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GenericResponse_responseMarshaller::fromString(const std::string& s,GenericResponse_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GenericResponse_responseMarshaller::toString(const GenericResponse_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GenericResponse_responseMarshaller::checkIntegrityConst(const GenericResponse_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value GenericResponse_responseMarshaller::toJSON(const GenericResponse_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool GenericResponse_responseMarshaller::fromJSON(const Json::Value& json,GenericResponse_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.h
deleted file mode 100644
index c1807bec3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GENERICRESPONSE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GENERICRESPONSE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct GenericResponse_responseMarshaller
-  {
-    static bool checkIntegrity(GenericResponse_response& e);
-    static bool checkIntegrityConst(const GenericResponse_response& e);
-  
-    static bool fromString(const std::string& s,GenericResponse_response& e);
-    static const std::string toString(const GenericResponse_response& e);
-  
-    static bool fromJSON(const Json::Value& s,GenericResponse_response& e);
-    static Json::Value toJSON(const GenericResponse_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_request.cpp
deleted file mode 100644
index d4a63caed..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_request.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h"
-#include "GetDTCs_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-GetDTCs_request& GetDTCs_request::operator =(const GetDTCs_request& c)
-{
-  ecuName= c.ecuName;
-  encrypted= c.encrypted ? new bool(c.encrypted[0]) : 0;
-
-  return *this;
-}
-
-
-GetDTCs_request::~GetDTCs_request(void)
-{
-  if(encrypted)
-    delete encrypted;
-}
-
-
-GetDTCs_request::GetDTCs_request(const GetDTCs_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool GetDTCs_request::checkIntegrity(void)
-{
-  return GetDTCs_requestMarshaller::checkIntegrity(*this);
-}
-
-
-GetDTCs_request::GetDTCs_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      encrypted(0)
-{
-}
-
-
-
-bool GetDTCs_request::set_ecuName(unsigned int ecuName_)
-{
-  if(ecuName_>65535)  return false;
-  ecuName=ecuName_;
-  return true;
-}
-
-bool GetDTCs_request::set_encrypted(bool encrypted_)
-{
-  delete encrypted;
-  encrypted=0;
-
-  encrypted=new bool(encrypted_);
-  return true;
-}
-
-void GetDTCs_request::reset_encrypted(void)
-{
-  if(encrypted)
-    delete encrypted;
-  encrypted=0;
-}
-
-
-
-
-unsigned int GetDTCs_request::get_ecuName(void) const
-{
-  return ecuName;
-}
-
-const bool* GetDTCs_request::get_encrypted(void) const 
-{
-  return encrypted;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.cpp
deleted file mode 100644
index c42f45cae..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h"
-
-
-#include "GetDTCs_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool GetDTCs_requestMarshaller::checkIntegrity(GetDTCs_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetDTCs_requestMarshaller::fromString(const std::string& s,GetDTCs_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetDTCs_requestMarshaller::toString(const GetDTCs_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetDTCs_requestMarshaller::checkIntegrityConst(const GetDTCs_request& s)
-{
-  if(s.ecuName>65535)  return false;
-  return true;
-}
-
-Json::Value GetDTCs_requestMarshaller::toJSON(const GetDTCs_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["ecuName"]=Json::Value(e.ecuName);
-
-  if(e.encrypted)
-    json["encrypted"]=Json::Value(*e.encrypted);
-
-  return json;
-}
-
-
-bool GetDTCs_requestMarshaller::fromJSON(const Json::Value& json,GetDTCs_request& c)
-{
-  if(c.encrypted)  delete c.encrypted;
-  c.encrypted=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("ecuName"))  return false;
-    {
-      const Json::Value& j=json["ecuName"];
-      if(!j.isInt())  return false;
-      c.ecuName=j.asInt();
-    }
-    if(json.isMember("encrypted"))
-    {
-      const Json::Value& j=json["encrypted"];
-      if(!j.isBool())  return false;
-      c.encrypted=new bool(j.asBool());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.h
deleted file mode 100644
index b97b568b4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GETDTCS_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GETDTCS_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct GetDTCs_requestMarshaller
-  {
-    static bool checkIntegrity(GetDTCs_request& e);
-    static bool checkIntegrityConst(const GetDTCs_request& e);
-  
-    static bool fromString(const std::string& s,GetDTCs_request& e);
-    static const std::string toString(const GetDTCs_request& e);
-  
-    static bool fromJSON(const Json::Value& s,GetDTCs_request& e);
-    static Json::Value toJSON(const GetDTCs_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_response.cpp
deleted file mode 100644
index 66d209abf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_response.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h"
-#include "GetDTCs_responseMarshaller.h"
-#include "DTCMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-GetDTCs_response& GetDTCs_response::operator =(const GetDTCs_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-    dtcList = c.dtcList ? new std::vector<DTC>(c.dtcList[0]) : 0;
-
-    return *this;
-}
-
-GetDTCs_response::~GetDTCs_response(void)
-{
-    if (dtcList)
-    {
-        delete dtcList;
-    }
-}
-
-GetDTCs_response::GetDTCs_response(const GetDTCs_response& c)
-{
-    *this = c;
-}
-
-bool GetDTCs_response::checkIntegrity(void)
-{
-    return GetDTCs_responseMarshaller::checkIntegrity(*this);
-}
-
-GetDTCs_response::GetDTCs_response(void)
-    : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-    , dtcList(0)
-{}
-
-bool GetDTCs_response::set_dtcList(const std::vector<DTC>& dtcList_)
-{
-    unsigned int i = dtcList_.size();
-    if (i > 100 || i < 1)
-    {
-        return false;
-    }
-
-    while (i--)
-    {
-        if (!DTCMarshaller::checkIntegrityConst(dtcList_[i]))
-        {
-            return false;
-        }
-    }
-
-    delete dtcList;
-    dtcList = 0;
-
-    dtcList = new std::vector<DTC>(dtcList_);
-    return true;
-}
-
-void GetDTCs_response::reset_dtcList(void)
-{
-    if (dtcList)
-    {
-        delete dtcList;
-    }
-    dtcList = 0;
-}
-
-const std::vector<DTC>* GetDTCs_response::get_dtcList(void) const
-{
-    return dtcList;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.cpp
deleted file mode 100644
index b4980c1df..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h"
-#include "DTCMarshaller.h"
-#include "ResultMarshaller.h"
-
-#include "GetDTCs_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool GetDTCs_responseMarshaller::checkIntegrity(GetDTCs_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetDTCs_responseMarshaller::fromString(const std::string& s,GetDTCs_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetDTCs_responseMarshaller::toString(const GetDTCs_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetDTCs_responseMarshaller::checkIntegrityConst(const GetDTCs_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  if(s.dtcList)
-  {
-    unsigned int i=s.dtcList[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!DTCMarshaller::checkIntegrityConst(s.dtcList[0][i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value GetDTCs_responseMarshaller::toJSON(const GetDTCs_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  if(e.dtcList)
-  {
-    unsigned int sz=e.dtcList->size();
-    json["dtcList"]=Json::Value(Json::arrayValue);
-    json["dtcList"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["dtcList"][i]=DTCMarshaller::toJSON(e.dtcList[0][i]);
-  }
-
-  return json;
-}
-
-
-bool GetDTCs_responseMarshaller::fromJSON(const Json::Value& json,GetDTCs_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  if(c.dtcList)  delete c.dtcList;
-  c.dtcList=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-    if(json.isMember("dtcList"))
-    {
-      const Json::Value& j=json["dtcList"];
-      if(!j.isArray())  return false;
-      c.dtcList=new std::vector<DTC>();
-      c.dtcList->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        DTC t;
-        if(!DTCMarshaller::fromJSON(j[i],t))
-          return false;
-        c.dtcList[0][i]=t;
-      }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.h
deleted file mode 100644
index 699f44c2d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GETDTCS_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GETDTCS_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct GetDTCs_responseMarshaller
-  {
-    static bool checkIntegrity(GetDTCs_response& e);
-    static bool checkIntegrityConst(const GetDTCs_response& e);
-  
-    static bool fromString(const std::string& s,GetDTCs_response& e);
-    static const std::string toString(const GetDTCs_response& e);
-  
-    static bool fromJSON(const Json::Value& s,GetDTCs_response& e);
-    static Json::Value toJSON(const GetDTCs_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_request.cpp
deleted file mode 100644
index 6dda35120..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_request.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h"
-#include "GetVehicleData_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-GetVehicleData_request::~GetVehicleData_request(void)
-{
-}
-
-
-GetVehicleData_request::GetVehicleData_request(const GetVehicleData_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool GetVehicleData_request::checkIntegrity(void)
-{
-  return GetVehicleData_requestMarshaller::checkIntegrity(*this);
-}
-
-
-GetVehicleData_request::GetVehicleData_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool GetVehicleData_request::set_dataType(const VehicleDataType& dataType_)
-{
-  if(!VehicleDataTypeMarshaller::checkIntegrityConst(dataType_))   return false;
-  dataType=dataType_;
-  return true;
-}
-
-
-
-
-const VehicleDataType& GetVehicleData_request::get_dataType(void) const 
-{
-  return dataType;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.cpp
deleted file mode 100644
index 58b1e5b18..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#include "GetVehicleData_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool GetVehicleData_requestMarshaller::checkIntegrity(GetVehicleData_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetVehicleData_requestMarshaller::fromString(const std::string& s,GetVehicleData_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetVehicleData_requestMarshaller::toString(const GetVehicleData_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetVehicleData_requestMarshaller::checkIntegrityConst(const GetVehicleData_request& s)
-{
-  if(!VehicleDataTypeMarshaller::checkIntegrityConst(s.dataType))  return false;
-  return true;
-}
-
-Json::Value GetVehicleData_requestMarshaller::toJSON(const GetVehicleData_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["dataType"]=VehicleDataTypeMarshaller::toJSON(e.dataType);
-
-  return json;
-}
-
-
-bool GetVehicleData_requestMarshaller::fromJSON(const Json::Value& json,GetVehicleData_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("dataType"))  return false;
-    {
-      const Json::Value& j=json["dataType"];
-      if(!VehicleDataTypeMarshaller::fromJSON(j,c.dataType))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.h
deleted file mode 100644
index 556419cff..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GETVEHICLEDATA_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GETVEHICLEDATA_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct GetVehicleData_requestMarshaller
-  {
-    static bool checkIntegrity(GetVehicleData_request& e);
-    static bool checkIntegrityConst(const GetVehicleData_request& e);
-  
-    static bool fromString(const std::string& s,GetVehicleData_request& e);
-    static const std::string toString(const GetVehicleData_request& e);
-  
-    static bool fromJSON(const Json::Value& s,GetVehicleData_request& e);
-    static Json::Value toJSON(const GetVehicleData_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_response.cpp
deleted file mode 100644
index 2565bb9b6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_response.cpp
+++ /dev/null
@@ -1,670 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h"
-#include "GetVehicleData_responseMarshaller.h"
-#include "GPSDataMarshaller.h"
-#include "PRNDLMarshaller.h"
-#include "TireStatusMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-GetVehicleData_response& GetVehicleData_response::operator =(const GetVehicleData_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-    gps = c.gps ? new GPSData(c.gps[0]) : 0;
-    speed = c.speed ? new float(c.speed[0]) : 0;
-    rpm = c.rpm ? new unsigned int(c.rpm[0]) : 0;
-    fuelLevel = c.fuelLevel ? new float(c.fuelLevel[0]) : 0;
-    avgFuelEconomy = c.avgFuelEconomy ? new float(c.avgFuelEconomy[0]) : 0;
-    batteryVoltage = c.batteryVoltage ? new float(c.batteryVoltage[0]) : 0;
-    externalTemperature = c.externalTemperature ? new float(c.externalTemperature[0]) : 0;
-    vin = c.vin ? new std::string(c.vin[0]) : 0;
-    prndl = c.prndl ? new PRNDL(c.prndl[0]) : 0;
-    tirePressure = c.tirePressure ? new TireStatus(c.tirePressure[0]) : 0;
-    batteryPackVoltage = c.batteryPackVoltage ? new float(c.batteryPackVoltage[0]) : 0;
-    batteryPackCurrent = c.batteryPackCurrent ? new float(c.batteryPackCurrent[0]) : 0;
-    batteryPackTemperature = c.batteryPackTemperature ? new int(c.batteryPackTemperature[0]) : 0;
-    engineTorque = c.engineTorque ? new int(c.engineTorque[0]) : 0;
-    odometer = c.odometer ? new unsigned int(c.odometer[0]) : 0;
-    tripOdometer = c.tripOdometer ? new unsigned int(c.tripOdometer[0]) : 0;
-    satRadioESN = c.satRadioESN ? new std::string(c.satRadioESN[0]) : 0;
-
-    return *this;
-}
-
-
-GetVehicleData_response::~GetVehicleData_response(void)
-{
-    if (gps)
-    {
-        delete gps;
-    }
-    if (speed)
-    {
-        delete speed;
-    }
-    if (rpm)
-    {
-        delete rpm;
-    }
-    if (fuelLevel)
-    {
-        delete fuelLevel;
-    }
-    if (avgFuelEconomy)
-    {
-        delete avgFuelEconomy;
-    }
-    if (batteryVoltage)
-    {
-        delete batteryVoltage;
-    }
-    if (externalTemperature)
-    {
-        delete externalTemperature;
-    }
-    if (vin)
-    {
-        delete vin;
-    }
-    if (prndl)
-    {
-        delete prndl;
-    }
-    if (tirePressure)
-    {
-        delete tirePressure;
-    }
-    if (batteryPackVoltage)
-    {
-        delete batteryPackVoltage;
-    }
-    if (batteryPackCurrent)
-    {
-        delete batteryPackCurrent;
-    }
-    if (batteryPackTemperature)
-    {
-        delete batteryPackTemperature;
-    }
-    if (engineTorque)
-    {
-        delete engineTorque;
-    }
-    if (odometer)
-    {
-        delete odometer;
-    }
-    if (tripOdometer)
-    {
-        delete tripOdometer;
-    }
-    if (satRadioESN)
-    {
-        delete satRadioESN;
-    }
-}
-
-GetVehicleData_response::GetVehicleData_response(const GetVehicleData_response& c)
-{
-    *this = c;
-}
-
-bool GetVehicleData_response::checkIntegrity(void)
-{
-    return GetVehicleData_responseMarshaller::checkIntegrity(*this);
-}
-
-GetVehicleData_response::GetVehicleData_response(void)
-    : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-    , gps(0)
-    , speed(0)
-    , rpm(0)
-    , fuelLevel(0)
-    , avgFuelEconomy(0)
-    , batteryVoltage(0)
-    , externalTemperature(0)
-    , vin(0)
-    , prndl(0)
-    , tirePressure(0)
-    , batteryPackVoltage(0)
-    , batteryPackCurrent(0)
-    , batteryPackTemperature(0)
-    , engineTorque(0)
-    , odometer(0)
-    , tripOdometer(0)
-    , satRadioESN(0)
-{
-}
-
-bool GetVehicleData_response::set_gps(const GPSData& gps_)
-{
-    if (!GPSDataMarshaller::checkIntegrityConst(gps_))
-    {
-        return false;
-    }
-    delete gps;
-    gps = 0;
-
-    gps = new GPSData(gps_);
-    return true;
-}
-
-void GetVehicleData_response::reset_gps(void)
-{
-    if (gps)
-    {
-        delete gps;
-    }
-    gps = 0;
-}
-
-bool GetVehicleData_response::set_speed(float speed_)
-{
-    if (speed_ > 500)
-    {
-        return false;
-    }
-    if (speed_ < -100)
-    {
-        return false;
-    }
-    delete speed;
-    speed = 0;
-
-    speed = new float(speed_);
-    return true;
-}
-
-void GetVehicleData_response::reset_speed(void)
-{
-    if (speed)
-    {
-        delete speed;
-    }
-    speed = 0;
-}
-
-bool GetVehicleData_response::set_rpm(unsigned int rpm_)
-{
-    if (rpm_ > 20000)
-    {
-        return false;
-    }
-    delete rpm;
-    rpm = 0;
-
-    rpm = new unsigned int(rpm_);
-    return true;
-}
-
-void GetVehicleData_response::reset_rpm(void)
-{
-    if (rpm)
-    {
-        delete rpm;
-    }
-    rpm = 0;
-}
-
-bool GetVehicleData_response::set_fuelLevel(float fuelLevel_)
-{
-    if (fuelLevel_ > 100)
-    {
-        return false;
-    }
-    if (fuelLevel_ < 0)
-    {
-        return false;
-    }
-    delete fuelLevel;
-    fuelLevel = 0;
-
-    fuelLevel = new float(fuelLevel_);
-    return true;
-}
-
-void GetVehicleData_response::reset_fuelLevel(void)
-{
-    if (fuelLevel)
-    {
-        delete fuelLevel;
-    }
-    fuelLevel = 0;
-}
-
-bool GetVehicleData_response::set_avgFuelEconomy(float avgFuelEconomy_)
-{
-    if (avgFuelEconomy_ > 7000)
-    {
-        return false;
-    }
-    if (avgFuelEconomy_ < 0)
-    {
-        return false;
-    }
-    delete avgFuelEconomy;
-    avgFuelEconomy = 0;
-
-    avgFuelEconomy = new float(avgFuelEconomy_);
-    return true;
-}
-
-void GetVehicleData_response::reset_avgFuelEconomy(void)
-{
-    if (avgFuelEconomy)
-    {
-        delete avgFuelEconomy;
-    }
-    avgFuelEconomy = 0;
-}
-
-bool GetVehicleData_response::set_batteryVoltage(float batteryVoltage_)
-{
-    if (batteryVoltage_ > 26)
-    {
-        return false;
-    }
-    if (batteryVoltage_ < 0)
-    {
-        return false;
-    }
-    delete batteryVoltage;
-    batteryVoltage = 0;
-
-    batteryVoltage = new float(batteryVoltage_);
-    return true;
-}
-
-void GetVehicleData_response::reset_batteryVoltage(void)
-{
-    if (batteryVoltage)
-    {
-        delete batteryVoltage;
-    }
-    batteryVoltage = 0;
-}
-
-bool GetVehicleData_response::set_externalTemperature(float externalTemperature_)
-{
-    if (externalTemperature_ > 100)
-    {
-        return false;
-    }
-    if (externalTemperature_ < -40)
-    {
-        return false;
-    }
-    delete externalTemperature;
-    externalTemperature = 0;
-
-    externalTemperature = new float(externalTemperature_);
-    return true;
-}
-
-void GetVehicleData_response::reset_externalTemperature(void)
-{
-    if (externalTemperature)
-    {
-        delete externalTemperature;
-    }
-    externalTemperature = 0;
-}
-
-bool GetVehicleData_response::set_vin(const std::string& vin_)
-{
-    if (vin_.length() > 17)
-    {
-        return false;
-    }
-    delete vin;
-    vin = 0;
-
-    vin = new std::string(vin_);
-    return true;
-}
-
-void GetVehicleData_response::reset_vin(void)
-{
-    if (vin)
-    {
-        delete vin;
-    }
-    vin = 0;
-}
-
-bool GetVehicleData_response::set_prndl(const PRNDL& prndl_)
-{
-    if (!PRNDLMarshaller::checkIntegrityConst(prndl_))
-    {
-        return false;
-    }
-    delete prndl;
-    prndl = 0;
-
-    prndl = new PRNDL(prndl_);
-    return true;
-}
-
-void GetVehicleData_response::reset_prndl(void)
-{
-    if (prndl)
-    {
-        delete prndl;
-    }
-    prndl = 0;
-}
-
-bool GetVehicleData_response::set_tirePressure(const TireStatus& tirePressure_)
-{
-    if (!TireStatusMarshaller::checkIntegrityConst(tirePressure_))
-    {
-        return false;
-    }
-    delete tirePressure;
-    tirePressure = 0;
-
-    tirePressure = new TireStatus(tirePressure_);
-    return true;
-}
-
-void GetVehicleData_response::reset_tirePressure(void)
-{
-    if (tirePressure)
-    {
-        delete tirePressure;
-    }
-    tirePressure = 0;
-}
-
-bool GetVehicleData_response::set_batteryPackVoltage(float batteryPackVoltage_)
-{
-    if (batteryPackVoltage_ > 1000)
-    {
-        return false;
-    }
-    if (batteryPackVoltage_ < -1000)
-    {
-        return false;
-    }
-    delete batteryPackVoltage;
-    batteryPackVoltage = 0;
-
-    batteryPackVoltage = new float(batteryPackVoltage_);
-    return true;
-}
-
-void GetVehicleData_response::reset_batteryPackVoltage(void)
-{
-    if (batteryPackVoltage)
-    {
-        delete batteryPackVoltage;
-    }
-    batteryPackVoltage = 0;
-}
-
-bool GetVehicleData_response::set_batteryPackCurrent(float batteryPackCurrent_)
-{
-    if (batteryPackCurrent_ > 1000)
-    {
-        return false;
-    }
-    if (batteryPackCurrent_ < -1000)
-    {
-        return false;
-    }
-    delete batteryPackCurrent;
-    batteryPackCurrent = 0;
-
-    batteryPackCurrent = new float(batteryPackCurrent_);
-    return true;
-}
-
-void GetVehicleData_response::reset_batteryPackCurrent(void)
-{
-    if (batteryPackCurrent)
-    {
-        delete batteryPackCurrent;
-    }
-    batteryPackCurrent = 0;
-}
-
-bool GetVehicleData_response::set_batteryPackTemperature(int batteryPackTemperature_)
-{
-    if (batteryPackTemperature_ > 250)
-    {
-        return false;
-    }
-    delete batteryPackTemperature;
-    batteryPackTemperature = 0;
-
-    batteryPackTemperature = new int(batteryPackTemperature_);
-    return true;
-}
-
-void GetVehicleData_response::reset_batteryPackTemperature(void)
-{
-    if (batteryPackTemperature)
-    {
-        delete batteryPackTemperature;
-    }
-    batteryPackTemperature = 0;
-}
-
-bool GetVehicleData_response::set_engineTorque(int engineTorque_)
-{
-    if (engineTorque_ > 55000)
-    {
-        return false;
-    }
-    delete engineTorque;
-    engineTorque = 0;
-
-    engineTorque = new int(engineTorque_);
-    return true;
-}
-
-void GetVehicleData_response::reset_engineTorque(void)
-{
-    if (engineTorque)
-    {
-        delete engineTorque;
-    }
-    engineTorque = 0;
-}
-
-bool GetVehicleData_response::set_odometer(unsigned int odometer_)
-{
-    if (odometer_ > 2000000)
-    {
-        return false;
-    }
-    delete odometer;
-    odometer = 0;
-
-    odometer = new unsigned int(odometer_);
-    return true;
-}
-
-void GetVehicleData_response::reset_odometer(void)
-{
-    if (odometer)
-    {
-        delete odometer;
-    }
-    odometer = 0;
-}
-
-bool GetVehicleData_response::set_tripOdometer(unsigned int tripOdometer_)
-{
-    if (tripOdometer_ > 2000000)
-    {
-        return false;
-    }
-    delete tripOdometer;
-    tripOdometer = 0;
-
-    tripOdometer = new unsigned int(tripOdometer_);
-    return true;
-}
-
-void GetVehicleData_response::reset_tripOdometer(void)
-{
-    if (tripOdometer)
-    {
-        delete tripOdometer;
-    }
-    tripOdometer = 0;
-}
-
-bool GetVehicleData_response::set_satRadioESN(const std::string& satRadioESN_)
-{
-    if (satRadioESN_.length() > 500)
-    {
-        return false;
-    }
-    delete satRadioESN;
-    satRadioESN = 0;
-
-    satRadioESN = new std::string(satRadioESN_);
-    return true;
-}
-
-void GetVehicleData_response::reset_satRadioESN(void)
-{
-    if (satRadioESN)
-    {
-        delete satRadioESN;
-    }
-    satRadioESN = 0;
-}
-
-const GPSData* GetVehicleData_response::get_gps(void) const
-{
-    return gps;
-}
-
-const float* GetVehicleData_response::get_speed(void) const
-{
-    return speed;
-}
-
-const unsigned int* GetVehicleData_response::get_rpm(void) const
-{
-    return rpm;
-}
-
-const float* GetVehicleData_response::get_fuelLevel(void) const
-{
-    return fuelLevel;
-}
-
-const float* GetVehicleData_response::get_avgFuelEconomy(void) const
-{
-    return avgFuelEconomy;
-}
-
-const float* GetVehicleData_response::get_batteryVoltage(void) const
-{
-    return batteryVoltage;
-}
-
-const float* GetVehicleData_response::get_externalTemperature(void) const
-{
-    return externalTemperature;
-}
-
-const std::string* GetVehicleData_response::get_vin(void) const
-{
-    return vin;
-}
-
-const PRNDL* GetVehicleData_response::get_prndl(void) const
-{
-    return prndl;
-}
-
-const TireStatus* GetVehicleData_response::get_tirePressure(void) const
-{
-    return tirePressure;
-}
-
-const float* GetVehicleData_response::get_batteryPackVoltage(void) const
-{
-    return batteryPackVoltage;
-}
-
-const float* GetVehicleData_response::get_batteryPackCurrent(void) const
-{
-    return batteryPackCurrent;
-}
-
-const int* GetVehicleData_response::get_batteryPackTemperature(void) const
-{
-    return batteryPackTemperature;
-}
-
-const int* GetVehicleData_response::get_engineTorque(void) const
-{
-    return engineTorque;
-}
-
-const unsigned int* GetVehicleData_response::get_odometer(void) const
-{
-    return odometer;
-}
-
-const unsigned int* GetVehicleData_response::get_tripOdometer(void) const
-{
-    return tripOdometer;
-}
-
-const std::string* GetVehicleData_response::get_satRadioESN(void) const
-{
-    return satRadioESN;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.cpp
deleted file mode 100644
index 6a05ebcec..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h"
-#include "GPSDataMarshaller.h"
-#include "PRNDLMarshaller.h"
-#include "ResultMarshaller.h"
-#include "TireStatusMarshaller.h"
-
-#include "GetVehicleData_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool GetVehicleData_responseMarshaller::checkIntegrity(GetVehicleData_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool GetVehicleData_responseMarshaller::fromString(const std::string& s,GetVehicleData_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string GetVehicleData_responseMarshaller::toString(const GetVehicleData_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool GetVehicleData_responseMarshaller::checkIntegrityConst(const GetVehicleData_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  if(s.gps && !GPSDataMarshaller::checkIntegrityConst(*s.gps))  return false;
-  if(s.speed && *s.speed>500)  return false;
-  if(s.speed && *s.speed<-100)  return false;
-  if(s.rpm && *s.rpm>20000)  return false;
-  if(s.fuelLevel && *s.fuelLevel>100)  return false;
-  if(s.fuelLevel && *s.fuelLevel<0)  return false;
-  if(s.avgFuelEconomy && *s.avgFuelEconomy>7000)  return false;
-  if(s.avgFuelEconomy && *s.avgFuelEconomy<0)  return false;
-  if(s.batteryVoltage && *s.batteryVoltage>26)  return false;
-  if(s.batteryVoltage && *s.batteryVoltage<0)  return false;
-  if(s.externalTemperature && *s.externalTemperature>100)  return false;
-  if(s.externalTemperature && *s.externalTemperature<-40)  return false;
-  if(s.vin && s.vin->length()>17)  return false;
-  if(s.prndl && !PRNDLMarshaller::checkIntegrityConst(*s.prndl))  return false;
-  if(s.tirePressure && !TireStatusMarshaller::checkIntegrityConst(*s.tirePressure))  return false;
-  if(s.batteryPackVoltage && *s.batteryPackVoltage>1000)  return false;
-  if(s.batteryPackVoltage && *s.batteryPackVoltage<-1000)  return false;
-  if(s.batteryPackCurrent && *s.batteryPackCurrent>1000)  return false;
-  if(s.batteryPackCurrent && *s.batteryPackCurrent<-1000)  return false;
-  if(s.batteryPackTemperature && *s.batteryPackTemperature>250)  return false;
-  if(s.batteryPackTemperature && *s.batteryPackTemperature<-50)  return false;
-  if(s.engineTorque && *s.engineTorque>55000)  return false;
-  if(s.engineTorque && *s.engineTorque<-10000)  return false;
-  if(s.odometer && *s.odometer>2000000)  return false;
-  if(s.tripOdometer && *s.tripOdometer>2000000)  return false;
-  if(s.satRadioESN && s.satRadioESN->length()>500)  return false;
-  return true;
-}
-
-Json::Value GetVehicleData_responseMarshaller::toJSON(const GetVehicleData_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  if(e.gps)
-    json["gps"]=GPSDataMarshaller::toJSON(*e.gps);
-
-  if(e.speed)
-    json["speed"]=Json::Value(*e.speed);
-
-  if(e.rpm)
-    json["rpm"]=Json::Value(*e.rpm);
-
-  if(e.fuelLevel)
-    json["fuelLevel"]=Json::Value(*e.fuelLevel);
-
-  if(e.avgFuelEconomy)
-    json["avgFuelEconomy"]=Json::Value(*e.avgFuelEconomy);
-
-  if(e.batteryVoltage)
-    json["batteryVoltage"]=Json::Value(*e.batteryVoltage);
-
-  if(e.externalTemperature)
-    json["externalTemperature"]=Json::Value(*e.externalTemperature);
-
-  if(e.vin)
-    json["vin"]=Json::Value(*e.vin);
-
-  if(e.prndl)
-    json["prndl"]=PRNDLMarshaller::toJSON(*e.prndl);
-
-  if(e.tirePressure)
-    json["tirePressure"]=TireStatusMarshaller::toJSON(*e.tirePressure);
-
-  if(e.batteryPackVoltage)
-    json["batteryPackVoltage"]=Json::Value(*e.batteryPackVoltage);
-
-  if(e.batteryPackCurrent)
-    json["batteryPackCurrent"]=Json::Value(*e.batteryPackCurrent);
-
-  if(e.batteryPackTemperature)
-    json["batteryPackTemperature"]=Json::Value(*e.batteryPackTemperature);
-
-  if(e.engineTorque)
-    json["engineTorque"]=Json::Value(*e.engineTorque);
-
-  if(e.odometer)
-    json["odometer"]=Json::Value(*e.odometer);
-
-  if(e.tripOdometer)
-    json["tripOdometer"]=Json::Value(*e.tripOdometer);
-
-  if(e.satRadioESN)
-    json["satRadioESN"]=Json::Value(*e.satRadioESN);
-
-  return json;
-}
-
-
-bool GetVehicleData_responseMarshaller::fromJSON(const Json::Value& json,GetVehicleData_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  if(c.gps)  delete c.gps;
-  c.gps=0;
-
-  if(c.speed)  delete c.speed;
-  c.speed=0;
-
-  if(c.rpm)  delete c.rpm;
-  c.rpm=0;
-
-  if(c.fuelLevel)  delete c.fuelLevel;
-  c.fuelLevel=0;
-
-  if(c.avgFuelEconomy)  delete c.avgFuelEconomy;
-  c.avgFuelEconomy=0;
-
-  if(c.batteryVoltage)  delete c.batteryVoltage;
-  c.batteryVoltage=0;
-
-  if(c.externalTemperature)  delete c.externalTemperature;
-  c.externalTemperature=0;
-
-  if(c.vin)  delete c.vin;
-  c.vin=0;
-
-  if(c.prndl)  delete c.prndl;
-  c.prndl=0;
-
-  if(c.tirePressure)  delete c.tirePressure;
-  c.tirePressure=0;
-
-  if(c.batteryPackVoltage)  delete c.batteryPackVoltage;
-  c.batteryPackVoltage=0;
-
-  if(c.batteryPackCurrent)  delete c.batteryPackCurrent;
-  c.batteryPackCurrent=0;
-
-  if(c.batteryPackTemperature)  delete c.batteryPackTemperature;
-  c.batteryPackTemperature=0;
-
-  if(c.engineTorque)  delete c.engineTorque;
-  c.engineTorque=0;
-
-  if(c.odometer)  delete c.odometer;
-  c.odometer=0;
-
-  if(c.tripOdometer)  delete c.tripOdometer;
-  c.tripOdometer=0;
-
-  if(c.satRadioESN)  delete c.satRadioESN;
-  c.satRadioESN=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-    if(json.isMember("gps"))
-    {
-      const Json::Value& j=json["gps"];
-      c.gps=new GPSData();
-      if(!GPSDataMarshaller::fromJSON(j,c.gps[0]))
-        return false;
-    }
-    if(json.isMember("speed"))
-    {
-      const Json::Value& j=json["speed"];
-      if(!j.isNumeric())  return false;
-      c.speed=new float(j.asDouble());
-    }
-    if(json.isMember("rpm"))
-    {
-      const Json::Value& j=json["rpm"];
-      if(!j.isInt())  return false;
-      c.rpm=new unsigned int(j.asInt());
-    }
-    if(json.isMember("fuelLevel"))
-    {
-      const Json::Value& j=json["fuelLevel"];
-      if(!j.isNumeric())  return false;
-      c.fuelLevel=new float(j.asDouble());
-    }
-    if(json.isMember("avgFuelEconomy"))
-    {
-      const Json::Value& j=json["avgFuelEconomy"];
-      if(!j.isNumeric())  return false;
-      c.avgFuelEconomy=new float(j.asDouble());
-    }
-    if(json.isMember("batteryVoltage"))
-    {
-      const Json::Value& j=json["batteryVoltage"];
-      if(!j.isNumeric())  return false;
-      c.batteryVoltage=new float(j.asDouble());
-    }
-    if(json.isMember("externalTemperature"))
-    {
-      const Json::Value& j=json["externalTemperature"];
-      if(!j.isNumeric())  return false;
-      c.externalTemperature=new float(j.asDouble());
-    }
-    if(json.isMember("vin"))
-    {
-      const Json::Value& j=json["vin"];
-      if(!j.isString())  return false;
-      c.vin=new std::string(j.asString());
-    }
-    if(json.isMember("prndl"))
-    {
-      const Json::Value& j=json["prndl"];
-      c.prndl=new PRNDL();
-      if(!PRNDLMarshaller::fromJSON(j,c.prndl[0]))
-        return false;
-    }
-    if(json.isMember("tirePressure"))
-    {
-      const Json::Value& j=json["tirePressure"];
-      c.tirePressure=new TireStatus();
-      if(!TireStatusMarshaller::fromJSON(j,c.tirePressure[0]))
-        return false;
-    }
-    if(json.isMember("batteryPackVoltage"))
-    {
-      const Json::Value& j=json["batteryPackVoltage"];
-      if(!j.isNumeric())  return false;
-      c.batteryPackVoltage=new float(j.asDouble());
-    }
-    if(json.isMember("batteryPackCurrent"))
-    {
-      const Json::Value& j=json["batteryPackCurrent"];
-      if(!j.isNumeric())  return false;
-      c.batteryPackCurrent=new float(j.asDouble());
-    }
-    if(json.isMember("batteryPackTemperature"))
-    {
-      const Json::Value& j=json["batteryPackTemperature"];
-      if(!j.isInt())  return false;
-      c.batteryPackTemperature=new int(j.asInt());
-    }
-    if(json.isMember("engineTorque"))
-    {
-      const Json::Value& j=json["engineTorque"];
-      if(!j.isInt())  return false;
-      c.engineTorque=new int(j.asInt());
-    }
-    if(json.isMember("odometer"))
-    {
-      const Json::Value& j=json["odometer"];
-      if(!j.isInt())  return false;
-      c.odometer=new unsigned int(j.asInt());
-    }
-    if(json.isMember("tripOdometer"))
-    {
-      const Json::Value& j=json["tripOdometer"];
-      if(!j.isInt())  return false;
-      c.tripOdometer=new unsigned int(j.asInt());
-    }
-    if(json.isMember("satRadioESN"))
-    {
-      const Json::Value& j=json["satRadioESN"];
-      if(!j.isString())  return false;
-      c.satRadioESN=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.h
deleted file mode 100644
index 0fd76e299..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GETVEHICLEDATA_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GETVEHICLEDATA_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct GetVehicleData_responseMarshaller
-  {
-    static bool checkIntegrity(GetVehicleData_response& e);
-    static bool checkIntegrityConst(const GetVehicleData_response& e);
-  
-    static bool fromString(const std::string& s,GetVehicleData_response& e);
-    static const std::string toString(const GetVehicleData_response& e);
-  
-    static bool fromJSON(const Json::Value& s,GetVehicleData_response& e);
-    static Json::Value toJSON(const GetVehicleData_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.cpp
deleted file mode 100644
index d7bd2157e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/GlobalProperty.h"
-#include "GlobalPropertyMarshaller.h"
-#include "GlobalPropertyMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const GlobalProperty::GlobalPropertyInternal GlobalPropertyMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return GlobalProperty::INVALID_ENUM;
-  const struct PerfectHashTable* p=GlobalProperty_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<GlobalProperty::GlobalPropertyInternal>(p->idx) : GlobalProperty::INVALID_ENUM;
-}
-
-
-bool GlobalPropertyMarshaller::fromJSON(const Json::Value& s,GlobalProperty& e)
-{
-  e.mInternal=GlobalProperty::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=GlobalProperty::INVALID_ENUM);
-}
-
-
-Json::Value GlobalPropertyMarshaller::toJSON(const GlobalProperty& e)
-{
-  if(e.mInternal==GlobalProperty::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool GlobalPropertyMarshaller::fromString(const std::string& s,GlobalProperty& e)
-{
-  e.mInternal=GlobalProperty::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string GlobalPropertyMarshaller::toString(const GlobalProperty& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==GlobalProperty::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable GlobalPropertyMarshaller::mHashTable[4]=
-{
-  {"HELPPROMPT",0},
-  {"TIMEOUTPROMPT",1},
-  {"VRHELPTITLE",2},
-  {"VRHELPITEMS",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp
deleted file mode 100644
index 552048852..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name GlobalProperty_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-HELPPROMPT,0
-TIMEOUTPROMPT,1
-VRHELPTITLE,2
-VRHELPITEMS,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.h
deleted file mode 100644
index 4a1f83443..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_GLOBALPROPERTYMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_GLOBALPROPERTYMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/GlobalProperty.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for GlobalProperty
-
-  class GlobalPropertyMarshaller
-  {
-  public:
-  
-    static std::string toName(const GlobalProperty& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(GlobalProperty& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=GlobalProperty::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(GlobalProperty& e)		{ return e.mInternal!=GlobalProperty::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const GlobalProperty& e)	{ return e.mInternal!=GlobalProperty::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,GlobalProperty& e);
-    static const std::string toString(const GlobalProperty& e);
-  
-    static bool fromJSON(const Json::Value& s,GlobalProperty& e);
-    static Json::Value toJSON(const GlobalProperty& e);
-  
-    static const char* getName(GlobalProperty::GlobalPropertyInternal e)
-    {
-       return (e>=0 && e<4) ? mHashTable[e].name : NULL;
-    }
-  
-    static const GlobalProperty::GlobalPropertyInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[4];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.inc
deleted file mode 100644
index 2c354cf18..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.inc
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp  */
-/* Computed positions: -k'7' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 10
-#define MAX_WORD_LENGTH 13
-#define MIN_HASH_VALUE 10
-#define MAX_HASH_VALUE 16
-/* maximum key range = 7, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class GlobalProperty_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-GlobalProperty_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17,  5, 17, 17, 17, 17, 17,  0,
-      17, 17, 17, 17,  0, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17
-    };
-  return len + asso_values[(unsigned char)str[6]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-GlobalProperty_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10, 11,  0, 13,
-       0,  0, 11
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp"
-      {"HELPPROMPT",0},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp"
-      {"VRHELPTITLE",2},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp"
-      {"TIMEOUTPROMPT",1},
-      {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/GlobalPropertyMarshaller.gp"
-      {"VRHELPITEMS",3}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplication.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplication.cpp
deleted file mode 100644
index e3e04c519..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplication.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h"
-#include "HMIApplicationMarshaller.h"
-#include "AppTypeMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "TTSChunkMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-HMIApplication& HMIApplication::operator =(const HMIApplication& c)
-{
-  appId=c.appId;
-  appName=c.appName;
-  appType=c.appType ? new std::vector<AppType>(c.appType[0]) : 0;
-  deviceName=c.deviceName;
-  hmiDisplayLanguageDesired=c.hmiDisplayLanguageDesired;
-  icon=c.icon ? new std::string(c.icon[0]) : 0;
-  isMediaApplication=c.isMediaApplication;
-  languageDesired=c.languageDesired;
-  ngnMediaScreenAppName=c.ngnMediaScreenAppName ? new std::string(c.ngnMediaScreenAppName[0]) : 0;
-  ttsName=c.ttsName ? new std::vector<TTSChunk>(c.ttsName[0]) : 0;
-  vrSynonyms=c.vrSynonyms ? new std::vector<std::string>(c.vrSynonyms[0]) : 0;
-
-  return *this;
-}
-
-
-HMIApplication::~HMIApplication(void)
-{
-  if(appType)
-    delete appType;
-  if(icon)
-    delete icon;
-  if(ngnMediaScreenAppName)
-    delete ngnMediaScreenAppName;
-  if(ttsName)
-    delete ttsName;
-  if(vrSynonyms)
-    delete vrSynonyms;
-}
-
-
-HMIApplication::HMIApplication(const HMIApplication& c)
-{
-  *this=c;
-}
-
-
-bool HMIApplication::checkIntegrity(void)
-{
-  return HMIApplicationMarshaller::checkIntegrity(*this);
-}
-
-
-HMIApplication::HMIApplication(void) :
-    appType(0),
-    icon(0),
-    ngnMediaScreenAppName(0),
-    ttsName(0),
-    vrSynonyms(0)
-{
-}
-
-
-
-bool HMIApplication::set_appId(int appId_)
-{
-  appId=appId_;
-  return true;
-}
-
-bool HMIApplication::set_appName(const std::string& appName_)
-{
-  if(appName_.length()>100)  return false;
-  appName=appName_;
-  return true;
-}
-
-bool HMIApplication::set_appType(const std::vector<AppType>& appType_)
-{
-  unsigned int i=appType_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!AppTypeMarshaller::checkIntegrityConst(appType_[i]))   return false;
-  }
-  delete appType;
-  appType=0;
-
-  appType=new std::vector<AppType>(appType_);
-  return true;
-}
-
-void HMIApplication::reset_appType(void)
-{
-  if(appType)
-    delete appType;
-  appType=0;
-}
-
-bool HMIApplication::set_deviceName(const std::string& deviceName_)
-{
-  deviceName=deviceName_;
-  return true;
-}
-
-bool HMIApplication::set_hmiDisplayLanguageDesired(const Language& hmiDisplayLanguageDesired_)
-{
-  if(!LanguageMarshaller::checkIntegrityConst(hmiDisplayLanguageDesired_))   return false;
-  hmiDisplayLanguageDesired=hmiDisplayLanguageDesired_;
-  return true;
-}
-
-bool HMIApplication::set_icon(const std::string& icon_)
-{
-  delete icon;
-  icon=0;
-
-  icon=new std::string(icon_);
-  return true;
-}
-
-void HMIApplication::reset_icon(void)
-{
-  if(icon)
-    delete icon;
-  icon=0;
-}
-
-bool HMIApplication::set_isMediaApplication(bool isMediaApplication_)
-{
-  isMediaApplication=isMediaApplication_;
-  return true;
-}
-
-bool HMIApplication::set_languageDesired(const Language& languageDesired_)
-{
-  if(!LanguageMarshaller::checkIntegrityConst(languageDesired_))   return false;
-  languageDesired=languageDesired_;
-  return true;
-}
-
-bool HMIApplication::set_ngnMediaScreenAppName(const std::string& ngnMediaScreenAppName_)
-{
-  if(ngnMediaScreenAppName_.length()>100)  return false;
-  delete ngnMediaScreenAppName;
-  ngnMediaScreenAppName=0;
-
-  ngnMediaScreenAppName=new std::string(ngnMediaScreenAppName_);
-  return true;
-}
-
-void HMIApplication::reset_ngnMediaScreenAppName(void)
-{
-  if(ngnMediaScreenAppName)
-    delete ngnMediaScreenAppName;
-  ngnMediaScreenAppName=0;
-}
-
-bool HMIApplication::set_ttsName(const std::vector<TTSChunk>& ttsName_)
-{
-  unsigned int i=ttsName_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(ttsName_[i]))   return false;
-  }
-  delete ttsName;
-  ttsName=0;
-
-  ttsName=new std::vector<TTSChunk>(ttsName_);
-  return true;
-}
-
-void HMIApplication::reset_ttsName(void)
-{
-  if(ttsName)
-    delete ttsName;
-  ttsName=0;
-}
-
-bool HMIApplication::set_vrSynonyms(const std::vector<std::string>& vrSynonyms_)
-{
-  unsigned int i=vrSynonyms_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(vrSynonyms_[i].length()>40)  return false;
-  }
-  delete vrSynonyms;
-  vrSynonyms=0;
-
-  vrSynonyms=new std::vector<std::string>(vrSynonyms_);
-  return true;
-}
-
-void HMIApplication::reset_vrSynonyms(void)
-{
-  if(vrSynonyms)
-    delete vrSynonyms;
-  vrSynonyms=0;
-}
-
-
-
-
-int HMIApplication::get_appId(void) const
-{
-  return appId;
-}
-
-
-const std::string& HMIApplication::get_appName(void) const 
-{
-  return appName;
-}
-
-
-const std::vector<AppType>* HMIApplication::get_appType(void) const 
-{
-  return appType;
-}
-
-
-const std::string& HMIApplication::get_deviceName(void) const 
-{
-  return deviceName;
-}
-
-
-const Language& HMIApplication::get_hmiDisplayLanguageDesired(void) const 
-{
-  return hmiDisplayLanguageDesired;
-}
-
-
-const std::string* HMIApplication::get_icon(void) const 
-{
-  return icon;
-}
-
-
-bool HMIApplication::get_isMediaApplication(void) const
-{
-  return isMediaApplication;
-}
-
-
-const Language& HMIApplication::get_languageDesired(void) const 
-{
-  return languageDesired;
-}
-
-
-const std::string* HMIApplication::get_ngnMediaScreenAppName(void) const 
-{
-  return ngnMediaScreenAppName;
-}
-
-
-const std::vector<TTSChunk>* HMIApplication::get_ttsName(void) const 
-{
-  return ttsName;
-}
-
-
-const std::vector<std::string>* HMIApplication::get_vrSynonyms(void) const 
-{
-  return vrSynonyms;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.cpp
deleted file mode 100644
index 95e35d961..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h"
-#include "AppTypeMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#include "HMIApplicationMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool HMIApplicationMarshaller::checkIntegrity(HMIApplication& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool HMIApplicationMarshaller::fromString(const std::string& s,HMIApplication& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string HMIApplicationMarshaller::toString(const HMIApplication& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool HMIApplicationMarshaller::checkIntegrityConst(const HMIApplication& s)
-{
-  if(s.appName.length()>100)  return false;
-  if(s.appType)
-  {
-    unsigned int i=s.appType[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!AppTypeMarshaller::checkIntegrityConst(s.appType[0][i]))   return false;
-    }
-  }
-  if(!LanguageMarshaller::checkIntegrityConst(s.hmiDisplayLanguageDesired))  return false;
-  if(!LanguageMarshaller::checkIntegrityConst(s.languageDesired))  return false;
-  if(s.ngnMediaScreenAppName && s.ngnMediaScreenAppName->length()>100)  return false;
-  if(s.ttsName)
-  {
-    unsigned int i=s.ttsName[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.ttsName[0][i]))   return false;
-    }
-  }
-  if(s.vrSynonyms)
-  {
-    unsigned int i=s.vrSynonyms[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.vrSynonyms[0][i].length()>40)  return false;
-    }
-  }
-  return true;
-}
-
-Json::Value HMIApplicationMarshaller::toJSON(const HMIApplication& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["appId"]=Json::Value(e.appId);
-
-  json["appName"]=Json::Value(e.appName);
-
-  if(e.appType)
-  {
-    unsigned int sz=e.appType->size();
-    json["appType"]=Json::Value(Json::arrayValue);
-    json["appType"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["appType"][i]=AppTypeMarshaller::toJSON(e.appType[0][i]);
-  }
-
-  json["deviceName"]=Json::Value(e.deviceName);
-
-  json["hmiDisplayLanguageDesired"]=LanguageMarshaller::toJSON(e.hmiDisplayLanguageDesired);
-
-  if(e.icon)
-    json["icon"]=Json::Value(*e.icon);
-
-  json["isMediaApplication"]=Json::Value(e.isMediaApplication);
-
-  json["languageDesired"]=LanguageMarshaller::toJSON(e.languageDesired);
-
-  if(e.ngnMediaScreenAppName)
-    json["ngnMediaScreenAppName"]=Json::Value(*e.ngnMediaScreenAppName);
-
-  if(e.ttsName)
-  {
-    unsigned int sz=e.ttsName->size();
-    json["ttsName"]=Json::Value(Json::arrayValue);
-    json["ttsName"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["ttsName"][i]=TTSChunkMarshaller::toJSON(e.ttsName[0][i]);
-  }
-
-  if(e.vrSynonyms)
-  {
-    unsigned int sz=e.vrSynonyms->size();
-    json["vrSynonyms"]=Json::Value(Json::arrayValue);
-    json["vrSynonyms"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["vrSynonyms"][i]=Json::Value(e.vrSynonyms[0][i]);
-  }
-
-
-  return json;
-}
-
-
-bool HMIApplicationMarshaller::fromJSON(const Json::Value& json,HMIApplication& c)
-{
-  if(c.appType)  delete c.appType;
-  c.appType=0;
-
-  if(c.icon)  delete c.icon;
-  c.icon=0;
-
-  if(c.ngnMediaScreenAppName)  delete c.ngnMediaScreenAppName;
-  c.ngnMediaScreenAppName=0;
-
-  if(c.ttsName)  delete c.ttsName;
-  c.ttsName=0;
-
-  if(c.vrSynonyms)  delete c.vrSynonyms;
-  c.vrSynonyms=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("appId"))  return false;
-    {
-      const Json::Value& j=json["appId"];
-      if(!j.isInt())  return false;
-      c.appId=j.asInt();
-    }
-    if(!json.isMember("appName"))  return false;
-    {
-      const Json::Value& j=json["appName"];
-      if(!j.isString())  return false;
-      c.appName=j.asString();
-    }
-    if(json.isMember("appType"))
-    {
-      const Json::Value& j=json["appType"];
-      if(!j.isArray())  return false;
-      c.appType=new std::vector<AppType>();
-      c.appType->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        AppType t;
-        if(!AppTypeMarshaller::fromJSON(j[i],t))
-          return false;
-        c.appType[0][i]=t;
-      }
-
-    }
-    if(!json.isMember("deviceName"))  return false;
-    {
-      const Json::Value& j=json["deviceName"];
-      if(!j.isString())  return false;
-      c.deviceName=j.asString();
-    }
-    if(!json.isMember("hmiDisplayLanguageDesired"))  return false;
-    {
-      const Json::Value& j=json["hmiDisplayLanguageDesired"];
-      if(!LanguageMarshaller::fromJSON(j,c.hmiDisplayLanguageDesired))
-        return false;
-    }
-    if(json.isMember("icon"))
-    {
-      const Json::Value& j=json["icon"];
-      if(!j.isString())  return false;
-      c.icon=new std::string(j.asString());
-    }
-    if(!json.isMember("isMediaApplication"))  return false;
-    {
-      const Json::Value& j=json["isMediaApplication"];
-      if(!j.isBool())  return false;
-      c.isMediaApplication=j.asBool();
-    }
-    if(!json.isMember("languageDesired"))  return false;
-    {
-      const Json::Value& j=json["languageDesired"];
-      if(!LanguageMarshaller::fromJSON(j,c.languageDesired))
-        return false;
-    }
-    if(json.isMember("ngnMediaScreenAppName"))
-    {
-      const Json::Value& j=json["ngnMediaScreenAppName"];
-      if(!j.isString())  return false;
-      c.ngnMediaScreenAppName=new std::string(j.asString());
-    }
-    if(json.isMember("ttsName"))
-    {
-      const Json::Value& j=json["ttsName"];
-      if(!j.isArray())  return false;
-      c.ttsName=new std::vector<TTSChunk>();
-      c.ttsName->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        TTSChunk t;
-        if(!TTSChunkMarshaller::fromJSON(j[i],t))
-          return false;
-        c.ttsName[0][i]=t;
-      }
-
-    }
-    if(json.isMember("vrSynonyms"))
-    {
-      const Json::Value& j=json["vrSynonyms"];
-      if(!j.isArray())  return false;
-      c.vrSynonyms=new std::vector<std::string>();
-      c.vrSynonyms->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.vrSynonyms[0][i]=j[i].asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.h
deleted file mode 100644
index 17980e19b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIApplicationMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_HMIAPPLICATIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_HMIAPPLICATIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct HMIApplicationMarshaller
-  {
-    static bool checkIntegrity(HMIApplication& e);
-    static bool checkIntegrityConst(const HMIApplication& e);
-  
-    static bool fromString(const std::string& s,HMIApplication& e);
-    static const std::string toString(const HMIApplication& e);
-  
-    static bool fromJSON(const Json::Value& s,HMIApplication& e);
-    static Json::Value toJSON(const HMIApplication& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.cpp
deleted file mode 100644
index 68c509ca0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMILevel.h"
-#include "HMILevelMarshaller.h"
-#include "HMILevelMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const HMILevel::HMILevelInternal HMILevelMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return HMILevel::INVALID_ENUM;
-  const struct PerfectHashTable* p=HMILevel_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<HMILevel::HMILevelInternal>(p->idx) : HMILevel::INVALID_ENUM;
-}
-
-
-bool HMILevelMarshaller::fromJSON(const Json::Value& s,HMILevel& e)
-{
-  e.mInternal=HMILevel::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=HMILevel::INVALID_ENUM);
-}
-
-
-Json::Value HMILevelMarshaller::toJSON(const HMILevel& e)
-{
-  if(e.mInternal==HMILevel::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool HMILevelMarshaller::fromString(const std::string& s,HMILevel& e)
-{
-  e.mInternal=HMILevel::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string HMILevelMarshaller::toString(const HMILevel& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==HMILevel::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable HMILevelMarshaller::mHashTable[4]=
-{
-  {"FULL",0},
-  {"LIMITED",1},
-  {"BACKGROUND",2},
-  {"NONE",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp
deleted file mode 100644
index 709952be5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name HMILevel_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-FULL,0
-LIMITED,1
-BACKGROUND,2
-NONE,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.h
deleted file mode 100644
index d0aa0d8d2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_HMILEVELMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_HMILEVELMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMILevel.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for HMILevel
-
-  class HMILevelMarshaller
-  {
-  public:
-  
-    static std::string toName(const HMILevel& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(HMILevel& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=HMILevel::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(HMILevel& e)		{ return e.mInternal!=HMILevel::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const HMILevel& e)	{ return e.mInternal!=HMILevel::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,HMILevel& e);
-    static const std::string toString(const HMILevel& e);
-  
-    static bool fromJSON(const Json::Value& s,HMILevel& e);
-    static Json::Value toJSON(const HMILevel& e);
-  
-    static const char* getName(HMILevel::HMILevelInternal e)
-    {
-       return (e>=0 && e<4) ? mHashTable[e].name : NULL;
-    }
-  
-    static const HMILevel::HMILevelInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[4];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.inc
deleted file mode 100644
index 59f976cf0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.inc
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp  */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 10
-/* maximum key range = 7, duplicates = 0 */
-
-class HMILevel_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-HMILevel_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11,  0, 11, 11, 11,
-       5, 11, 11, 11, 11, 11,  0, 11,  0, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-HMILevel_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  0,  0,  7,  0,  4, 10
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp"
-      {"NONE",3},
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp"
-      {"LIMITED",1},
-      {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp"
-      {"FULL",0},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMILevelMarshaller.gp"
-      {"BACKGROUND",2}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissions.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissions.cpp
deleted file mode 100644
index a36ab58c8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissions.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIPermissions.h"
-#include "HMIPermissionsMarshaller.h"
-#include "HMILevelMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-HMIPermissions::HMIPermissions(const HMIPermissions& c)
-{
-  *this=c;
-}
-
-
-bool HMIPermissions::checkIntegrity(void)
-{
-  return HMIPermissionsMarshaller::checkIntegrity(*this);
-}
-
-
-HMIPermissions::HMIPermissions(void)
-{
-}
-
-
-
-bool HMIPermissions::set_allowed(const std::vector<HMILevel>& allowed_)
-{
-  unsigned int i=allowed_.size();
-  if(i>100 || i<0)  return false;
-  while(i--)
-  {
-    if(!HMILevelMarshaller::checkIntegrityConst(allowed_[i]))   return false;
-  }
-  allowed=allowed_;
-  return true;
-}
-
-bool HMIPermissions::set_userDisallowed(const std::vector<HMILevel>& userDisallowed_)
-{
-  unsigned int i=userDisallowed_.size();
-  if(i>100 || i<0)  return false;
-  while(i--)
-  {
-    if(!HMILevelMarshaller::checkIntegrityConst(userDisallowed_[i]))   return false;
-  }
-  userDisallowed=userDisallowed_;
-  return true;
-}
-
-
-
-
-const std::vector<HMILevel>& HMIPermissions::get_allowed(void) const 
-{
-  return allowed;
-}
-
-
-const std::vector<HMILevel>& HMIPermissions::get_userDisallowed(void) const 
-{
-  return userDisallowed;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.cpp
deleted file mode 100644
index 003366232..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIPermissions.h"
-#include "HMILevelMarshaller.h"
-
-#include "HMIPermissionsMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool HMIPermissionsMarshaller::checkIntegrity(HMIPermissions& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool HMIPermissionsMarshaller::fromString(const std::string& s,HMIPermissions& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string HMIPermissionsMarshaller::toString(const HMIPermissions& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool HMIPermissionsMarshaller::checkIntegrityConst(const HMIPermissions& s)
-{
-  {
-    unsigned int i=s.allowed.size();
-    if(i>100 || i<0)  return false;
-    while(i--)
-    {
-    if(!HMILevelMarshaller::checkIntegrityConst(s.allowed[i]))   return false;
-    }
-  }
-  {
-    unsigned int i=s.userDisallowed.size();
-    if(i>100 || i<0)  return false;
-    while(i--)
-    {
-    if(!HMILevelMarshaller::checkIntegrityConst(s.userDisallowed[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value HMIPermissionsMarshaller::toJSON(const HMIPermissions& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["allowed"]=Json::Value(Json::arrayValue);
-  json["allowed"].resize(e.allowed.size());
-  for(unsigned int i=0;i<e.allowed.size();i++)
-    json["allowed"][i]=HMILevelMarshaller::toJSON(e.allowed[i]);
-
-  json["userDisallowed"]=Json::Value(Json::arrayValue);
-  json["userDisallowed"].resize(e.userDisallowed.size());
-  for(unsigned int i=0;i<e.userDisallowed.size();i++)
-    json["userDisallowed"][i]=HMILevelMarshaller::toJSON(e.userDisallowed[i]);
-
-
-  return json;
-}
-
-
-bool HMIPermissionsMarshaller::fromJSON(const Json::Value& json,HMIPermissions& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("allowed"))  return false;
-    {
-      const Json::Value& j=json["allowed"];
-      if(!j.isArray())  return false;
-      c.allowed.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          HMILevel t;
-          if(!HMILevelMarshaller::fromJSON(j[i],t))
-            return false;
-          c.allowed[i]=t;
-        }
-
-    }
-    if(!json.isMember("userDisallowed"))  return false;
-    {
-      const Json::Value& j=json["userDisallowed"];
-      if(!j.isArray())  return false;
-      c.userDisallowed.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          HMILevel t;
-          if(!HMILevelMarshaller::fromJSON(j[i],t))
-            return false;
-          c.userDisallowed[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.h
deleted file mode 100644
index 4afbe5739..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HMIPermissionsMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_HMIPERMISSIONSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_HMIPERMISSIONSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HMIPermissions.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct HMIPermissionsMarshaller
-  {
-    static bool checkIntegrity(HMIPermissions& e);
-    static bool checkIntegrityConst(const HMIPermissions& e);
-  
-    static bool fromString(const std::string& s,HMIPermissions& e);
-    static const std::string toString(const HMIPermissions& e);
-  
-    static bool fromJSON(const Json::Value& s,HMIPermissions& e);
-    static Json::Value toJSON(const HMIPermissions& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.cpp
deleted file mode 100644
index 429bc53cc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/HmiZoneCapabilities.h"
-#include "HmiZoneCapabilitiesMarshaller.h"
-#include "HmiZoneCapabilitiesMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const HmiZoneCapabilities::HmiZoneCapabilitiesInternal HmiZoneCapabilitiesMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return HmiZoneCapabilities::INVALID_ENUM;
-  const struct PerfectHashTable* p=HmiZoneCapabilities_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<HmiZoneCapabilities::HmiZoneCapabilitiesInternal>(p->idx) : HmiZoneCapabilities::INVALID_ENUM;
-}
-
-
-bool HmiZoneCapabilitiesMarshaller::fromJSON(const Json::Value& s,HmiZoneCapabilities& e)
-{
-  e.mInternal=HmiZoneCapabilities::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=HmiZoneCapabilities::INVALID_ENUM);
-}
-
-
-Json::Value HmiZoneCapabilitiesMarshaller::toJSON(const HmiZoneCapabilities& e)
-{
-  if(e.mInternal==HmiZoneCapabilities::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool HmiZoneCapabilitiesMarshaller::fromString(const std::string& s,HmiZoneCapabilities& e)
-{
-  e.mInternal=HmiZoneCapabilities::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string HmiZoneCapabilitiesMarshaller::toString(const HmiZoneCapabilities& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==HmiZoneCapabilities::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable HmiZoneCapabilitiesMarshaller::mHashTable[2]=
-{
-  {"FRONT",0},
-  {"BACK",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp
deleted file mode 100644
index 4dd38536b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name HmiZoneCapabilities_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-FRONT,0
-BACK,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.h
deleted file mode 100644
index 1bf347580..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_HMIZONECAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_HMIZONECAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/HmiZoneCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for HmiZoneCapabilities
-
-  class HmiZoneCapabilitiesMarshaller
-  {
-  public:
-  
-    static std::string toName(const HmiZoneCapabilities& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(HmiZoneCapabilities& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=HmiZoneCapabilities::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(HmiZoneCapabilities& e)		{ return e.mInternal!=HmiZoneCapabilities::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const HmiZoneCapabilities& e)	{ return e.mInternal!=HmiZoneCapabilities::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,HmiZoneCapabilities& e);
-    static const std::string toString(const HmiZoneCapabilities& e);
-  
-    static bool fromJSON(const Json::Value& s,HmiZoneCapabilities& e);
-    static Json::Value toJSON(const HmiZoneCapabilities& e);
-  
-    static const char* getName(HmiZoneCapabilities::HmiZoneCapabilitiesInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const HmiZoneCapabilities::HmiZoneCapabilitiesInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.inc
deleted file mode 100644
index 3b9d7dc10..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 5
-/* maximum key range = 2, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class HmiZoneCapabilities_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-HmiZoneCapabilities_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-HmiZoneCapabilities_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  5
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp"
-      {"BACK",1},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/HmiZoneCapabilitiesMarshaller.gp"
-      {"FRONT",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Image.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Image.cpp
deleted file mode 100644
index 43c538e2f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Image.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Image.h"
-#include "ImageMarshaller.h"
-#include "ImageTypeMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-Image::Image(const Image& c)
-{
-  *this=c;
-}
-
-
-bool Image::checkIntegrity(void)
-{
-  return ImageMarshaller::checkIntegrity(*this);
-}
-
-
-Image::Image(void)
-{
-}
-
-
-
-bool Image::set_imageType(const ImageType& imageType_)
-{
-  if(!ImageTypeMarshaller::checkIntegrityConst(imageType_))   return false;
-  imageType=imageType_;
-  return true;
-}
-
-bool Image::set_value(const std::string& value_)
-{
-  if(value_.length()>65535)  return false;
-  value=value_;
-  return true;
-}
-
-
-
-
-const ImageType& Image::get_imageType(void) const 
-{
-  return imageType;
-}
-
-
-const std::string& Image::get_value(void) const 
-{
-  return value;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.cpp
deleted file mode 100644
index 4e3c8cc7c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Image.h"
-#include "ImageTypeMarshaller.h"
-
-#include "ImageMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ImageMarshaller::checkIntegrity(Image& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ImageMarshaller::fromString(const std::string& s,Image& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ImageMarshaller::toString(const Image& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ImageMarshaller::checkIntegrityConst(const Image& s)
-{
-  if(!ImageTypeMarshaller::checkIntegrityConst(s.imageType))  return false;
-  if(s.value.length()>65535)  return false;
-  return true;
-}
-
-Json::Value ImageMarshaller::toJSON(const Image& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["imageType"]=ImageTypeMarshaller::toJSON(e.imageType);
-
-  json["value"]=Json::Value(e.value);
-
-
-  return json;
-}
-
-
-bool ImageMarshaller::fromJSON(const Json::Value& json,Image& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("imageType"))  return false;
-    {
-      const Json::Value& j=json["imageType"];
-      if(!ImageTypeMarshaller::fromJSON(j,c.imageType))
-        return false;
-    }
-    if(!json.isMember("value"))  return false;
-    {
-      const Json::Value& j=json["value"];
-      if(!j.isString())  return false;
-      c.value=j.asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.h
deleted file mode 100644
index 4e3d83b3f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_IMAGEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_IMAGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Image.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ImageMarshaller
-  {
-    static bool checkIntegrity(Image& e);
-    static bool checkIntegrityConst(const Image& e);
-  
-    static bool fromString(const std::string& s,Image& e);
-    static const std::string toString(const Image& e);
-  
-    static bool fromJSON(const Json::Value& s,Image& e);
-    static Json::Value toJSON(const Image& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.cpp
deleted file mode 100644
index 961edd8b6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/ImageType.h"
-#include "ImageTypeMarshaller.h"
-#include "ImageTypeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const ImageType::ImageTypeInternal ImageTypeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return ImageType::INVALID_ENUM;
-  const struct PerfectHashTable* p=ImageType_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<ImageType::ImageTypeInternal>(p->idx) : ImageType::INVALID_ENUM;
-}
-
-
-bool ImageTypeMarshaller::fromJSON(const Json::Value& s,ImageType& e)
-{
-  e.mInternal=ImageType::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=ImageType::INVALID_ENUM);
-}
-
-
-Json::Value ImageTypeMarshaller::toJSON(const ImageType& e)
-{
-  if(e.mInternal==ImageType::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ImageTypeMarshaller::fromString(const std::string& s,ImageType& e)
-{
-  e.mInternal=ImageType::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string ImageTypeMarshaller::toString(const ImageType& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==ImageType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ImageTypeMarshaller::mHashTable[2]=
-{
-  {"STATIC",0},
-  {"DYNAMIC",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp
deleted file mode 100644
index 62b224bfa..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name ImageType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-STATIC,0
-DYNAMIC,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.h
deleted file mode 100644
index c9e6e4edc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_IMAGETYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_IMAGETYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ImageType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for ImageType
-
-  class ImageTypeMarshaller
-  {
-  public:
-  
-    static std::string toName(const ImageType& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(ImageType& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=ImageType::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(ImageType& e)		{ return e.mInternal!=ImageType::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const ImageType& e)	{ return e.mInternal!=ImageType::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,ImageType& e);
-    static const std::string toString(const ImageType& e);
-  
-    static bool fromJSON(const Json::Value& s,ImageType& e);
-    static Json::Value toJSON(const ImageType& e);
-  
-    static const char* getName(ImageType::ImageTypeInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const ImageType::ImageTypeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.inc
deleted file mode 100644
index 5c3ccddc3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 6
-#define MAX_WORD_LENGTH 7
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 7
-/* maximum key range = 2, duplicates = 0 */
-
-class ImageType_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-ImageType_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-ImageType_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  6,  7
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp"
-      {"STATIC",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ImageTypeMarshaller.gp"
-      {"DYNAMIC",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.cpp
deleted file mode 100644
index 95e108394..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/InteractionMode.h"
-#include "InteractionModeMarshaller.h"
-#include "InteractionModeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const InteractionMode::InteractionModeInternal InteractionModeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return InteractionMode::INVALID_ENUM;
-  const struct PerfectHashTable* p=InteractionMode_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<InteractionMode::InteractionModeInternal>(p->idx) : InteractionMode::INVALID_ENUM;
-}
-
-
-bool InteractionModeMarshaller::fromJSON(const Json::Value& s,InteractionMode& e)
-{
-  e.mInternal=InteractionMode::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=InteractionMode::INVALID_ENUM);
-}
-
-
-Json::Value InteractionModeMarshaller::toJSON(const InteractionMode& e)
-{
-  if(e.mInternal==InteractionMode::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool InteractionModeMarshaller::fromString(const std::string& s,InteractionMode& e)
-{
-  e.mInternal=InteractionMode::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string InteractionModeMarshaller::toString(const InteractionMode& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==InteractionMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable InteractionModeMarshaller::mHashTable[3]=
-{
-  {"MANUAL_ONLY",0},
-  {"VR_ONLY",1},
-  {"BOTH",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp
deleted file mode 100644
index a81968963..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name InteractionMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-MANUAL_ONLY,0
-VR_ONLY,1
-BOTH,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.h
deleted file mode 100644
index 75b0e3cac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_INTERACTIONMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_INTERACTIONMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/InteractionMode.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for InteractionMode
-
-  class InteractionModeMarshaller
-  {
-  public:
-  
-    static std::string toName(const InteractionMode& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(InteractionMode& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=InteractionMode::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(InteractionMode& e)		{ return e.mInternal!=InteractionMode::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const InteractionMode& e)	{ return e.mInternal!=InteractionMode::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,InteractionMode& e);
-    static const std::string toString(const InteractionMode& e);
-  
-    static bool fromJSON(const Json::Value& s,InteractionMode& e);
-    static Json::Value toJSON(const InteractionMode& e);
-  
-    static const char* getName(InteractionMode::InteractionModeInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const InteractionMode::InteractionModeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.inc
deleted file mode 100644
index 454e6333d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.inc
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 11
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 11
-/* maximum key range = 8, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class InteractionMode_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-InteractionMode_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-InteractionMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  0,  0,  7,  0,  0,  0, 11
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp"
-      {"BOTH",2},
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp"
-      {"VR_ONLY",1},
-      {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/InteractionModeMarshaller.gp"
-      {"MANUAL_ONLY",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.cpp
deleted file mode 100644
index 055e86a6a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-#include "LanguageMarshaller.h"
-#include "LanguageMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const Language::LanguageInternal LanguageMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return Language::INVALID_ENUM;
-  const struct PerfectHashTable* p=Language_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<Language::LanguageInternal>(p->idx) : Language::INVALID_ENUM;
-}
-
-
-bool LanguageMarshaller::fromJSON(const Json::Value& s,Language& e)
-{
-  e.mInternal=Language::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=Language::INVALID_ENUM);
-}
-
-
-Json::Value LanguageMarshaller::toJSON(const Language& e)
-{
-  if(e.mInternal==Language::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool LanguageMarshaller::fromString(const std::string& s,Language& e)
-{
-  e.mInternal=Language::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string LanguageMarshaller::toString(const Language& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==Language::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable LanguageMarshaller::mHashTable[20]=
-{
-  {"EN-US",0},
-  {"ES-MX",1},
-  {"FR-CA",2},
-  {"DE-EU",3},
-  {"ES-EU",4},
-  {"EN-EU",5},
-  {"RU-RU",6},
-  {"TR-TR",7},
-  {"PL-EU",8},
-  {"FR-EU",9},
-  {"IT-EU",10},
-  {"SV-EU",11},
-  {"PT-EU",12},
-  {"NL-EU",13},
-  {"EN-AU",14},
-  {"ZH-CN",15},
-  {"ZH-TW",16},
-  {"JA-JP",17},
-  {"AR",18},
-  {"KO-KR",19}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp
deleted file mode 100644
index 9e1622550..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp
+++ /dev/null
@@ -1,36 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name Language_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-EN-US,0
-ES-MX,1
-FR-CA,2
-DE-EU,3
-ES-EU,4
-EN-EU,5
-RU-RU,6
-TR-TR,7
-PL-EU,8
-FR-EU,9
-IT-EU,10
-SV-EU,11
-PT-EU,12
-NL-EU,13
-EN-AU,14
-ZH-CN,15
-ZH-TW,16
-JA-JP,17
-AR,18
-KO-KR,19
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h
deleted file mode 100644
index c9497572e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_LANGUAGEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_LANGUAGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Language.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for Language
-
-  class LanguageMarshaller
-  {
-  public:
-  
-    static std::string toName(const Language& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(Language& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=Language::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(Language& e)		{ return e.mInternal!=Language::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const Language& e)	{ return e.mInternal!=Language::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,Language& e);
-    static const std::string toString(const Language& e);
-  
-    static bool fromJSON(const Json::Value& s,Language& e);
-    static Json::Value toJSON(const Language& e);
-  
-    static const char* getName(Language::LanguageInternal e)
-    {
-       return (e>=0 && e<20) ? mHashTable[e].name : NULL;
-    }
-  
-    static const Language::LanguageInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[20];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.inc
deleted file mode 100644
index 71c457ef8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.inc
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp  */
-/* Computed positions: -k'1-2,4' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 20
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 50
-/* maximum key range = 48, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class Language_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Language_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51,  1, 51,  3, 28,  5,
-      30, 51,  5, 13,  0, 15, 25, 15,  0, 15,
-      10, 51,  0,  3, 10,  0, 10, 51, 51, 51,
-       0, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[3]];
-      /*FALLTHROUGH*/
-      case 3:
-      case 2:
-        hval += asso_values[(unsigned char)str[1]];
-      /*FALLTHROUGH*/
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-Language_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  2,  0,  5,  5,  0,  0,  0,  5,  5,  0,  5,
-       0,  5,  0,  0,  5,  0,  5,  0,  0,  5,  0,  5,  0,  0,
-       5,  0,  5,  0,  0,  5,  0,  5,  0,  0,  5,  0,  5,  0,
-       0,  5,  0,  5,  0,  0,  0,  0,  5
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""},
-#line 35 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"AR",18},
-      {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"RU-RU",6},
-#line 34 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"JA-JP",17},
-      {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"EN-US",0},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"EN-AU",14},
-      {""},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"ZH-CN",15},
-      {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"EN-EU",5},
-      {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"ES-EU",4},
-      {""},
-#line 33 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"ZH-TW",16},
-      {""}, {""},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"SV-EU",11},
-      {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"TR-TR",7},
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"ES-MX",1},
-      {""},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"PT-EU",12},
-      {""}, {""},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"IT-EU",10},
-      {""},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"NL-EU",13},
-      {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"FR-CA",2},
-      {""},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"FR-EU",9},
-      {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"DE-EU",3},
-      {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"PL-EU",8},
-      {""}, {""}, {""}, {""},
-#line 36 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/LanguageMarshaller.gp"
-      {"KO-KR",19}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_request.cpp
deleted file mode 100644
index 39c9781b2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_request.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h"
-#include "ListFiles_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-ListFiles_request::~ListFiles_request(void)
-{
-}
-
-
-ListFiles_request::ListFiles_request(const ListFiles_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool ListFiles_request::checkIntegrity(void)
-{
-  return ListFiles_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ListFiles_request::ListFiles_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.cpp
deleted file mode 100644
index abf8a76b5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h"
-
-
-#include "ListFiles_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ListFiles_requestMarshaller::checkIntegrity(ListFiles_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ListFiles_requestMarshaller::fromString(const std::string& s,ListFiles_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ListFiles_requestMarshaller::toString(const ListFiles_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ListFiles_requestMarshaller::checkIntegrityConst(const ListFiles_request& s)
-{
-  return true;
-}
-
-Json::Value ListFiles_requestMarshaller::toJSON(const ListFiles_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  return json;
-}
-
-
-bool ListFiles_requestMarshaller::fromJSON(const Json::Value& json,ListFiles_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.h
deleted file mode 100644
index 0b5e68555..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_LISTFILES_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_LISTFILES_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ListFiles_requestMarshaller
-  {
-    static bool checkIntegrity(ListFiles_request& e);
-    static bool checkIntegrityConst(const ListFiles_request& e);
-  
-    static bool fromString(const std::string& s,ListFiles_request& e);
-    static const std::string toString(const ListFiles_request& e);
-  
-    static bool fromJSON(const Json::Value& s,ListFiles_request& e);
-    static Json::Value toJSON(const ListFiles_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_response.cpp
deleted file mode 100644
index 85973fd93..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_response.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h"
-#include "ListFiles_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ListFiles_response& ListFiles_response::operator =(const ListFiles_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    filenames = c.filenames ? new std::vector<std::string>(c.filenames[0]) : 0;
-    spaceAvailable = c.spaceAvailable;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-ListFiles_response::~ListFiles_response(void)
-{
-    if (filenames)
-    {
-        delete filenames;
-    }
-}
-
-ListFiles_response::ListFiles_response(const ListFiles_response& c)
-{
-    *this = c;
-}
-
-bool ListFiles_response::checkIntegrity(void)
-{
-    return ListFiles_responseMarshaller::checkIntegrity(*this);
-}
-
-ListFiles_response::ListFiles_response(void)
-    : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-    , filenames(0)
-{}
-
-bool ListFiles_response::set_filenames(const std::vector<std::string>& filenames_)
-{
-    unsigned int i = filenames_.size();
-    if (i > 1000 || i < 0) // TODO(AK): unsigned int i < 0
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (filenames_[i].length() > 500)
-        {
-            return false;
-        }
-    }
-    delete filenames;
-    filenames = 0;
-
-    filenames = new std::vector<std::string>(filenames_);
-    return true;
-}
-
-void ListFiles_response::reset_filenames(void)
-{
-    if (filenames)
-    {
-        delete filenames;
-    }
-    filenames = 0;
-}
-
-bool ListFiles_response::set_spaceAvailable(unsigned int spaceAvailable_)
-{
-    if (spaceAvailable_ > 2000000000)
-    {
-        return false;
-    }
-    spaceAvailable = spaceAvailable_;
-    return true;
-}
-
-const std::vector<std::string>* ListFiles_response::get_filenames(void) const
-{
-    return filenames;
-}
-
-unsigned int ListFiles_response::get_spaceAvailable(void) const
-{
-    return spaceAvailable;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.cpp
deleted file mode 100644
index 7ca71414c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h"
-#include "ResultMarshaller.h"
-
-#include "ListFiles_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ListFiles_responseMarshaller::checkIntegrity(ListFiles_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ListFiles_responseMarshaller::fromString(const std::string& s,ListFiles_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ListFiles_responseMarshaller::toString(const ListFiles_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ListFiles_responseMarshaller::checkIntegrityConst(const ListFiles_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.filenames)
-  {
-    unsigned int i=s.filenames[0].size();
-    if(i>1000 || i<0)  return false;
-    while(i--)
-    {
-      if(s.filenames[0][i].length()>500)  return false;
-    }
-  }
-  if(s.spaceAvailable>2000000000)  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value ListFiles_responseMarshaller::toJSON(const ListFiles_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.filenames)
-  {
-    unsigned int sz=e.filenames->size();
-    json["filenames"]=Json::Value(Json::arrayValue);
-    json["filenames"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["filenames"][i]=Json::Value(e.filenames[0][i]);
-  }
-
-  json["spaceAvailable"]=Json::Value(e.spaceAvailable);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool ListFiles_responseMarshaller::fromJSON(const Json::Value& json,ListFiles_response& c)
-{
-  if(c.filenames)  delete c.filenames;
-  c.filenames=0;
-
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("filenames"))
-    {
-      const Json::Value& j=json["filenames"];
-      if(!j.isArray())  return false;
-      c.filenames=new std::vector<std::string>();
-      c.filenames->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.filenames[0][i]=j[i].asString();
-    }
-    if(!json.isMember("spaceAvailable"))  return false;
-    {
-      const Json::Value& j=json["spaceAvailable"];
-      if(!j.isInt())  return false;
-      c.spaceAvailable=j.asInt();
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.h
deleted file mode 100644
index 76b8e71b5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_LISTFILES_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_LISTFILES_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ListFiles_responseMarshaller
-  {
-    static bool checkIntegrity(ListFiles_response& e);
-    static bool checkIntegrityConst(const ListFiles_response& e);
-  
-    static bool fromString(const std::string& s,ListFiles_response& e);
-    static const std::string toString(const ListFiles_response& e);
-  
-    static bool fromJSON(const Json::Value& s,ListFiles_response& e);
-    static Json::Value toJSON(const ListFiles_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Marshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Marshaller.cpp
deleted file mode 100644
index 9d22600d5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Marshaller.cpp
+++ /dev/null
@@ -1,1362 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Alert_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnCommand.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-NsSmartDeviceLinkRPC::SDLRPCMessage* Marshaller::fromString(const std::string& s,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt)
-{
-  NsSmartDeviceLinkRPC::SDLRPCMessage* rv=0;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-
-    if(!reader.parse(s,json,false))  return 0;
-    if(!(rv=fromJSON(json,fid,mt)))  return 0;
-  }
-  catch(...)
-  {
-    return 0;
-  }
-  return rv;
-}
-
-std::string Marshaller::toString(const NsSmartDeviceLinkRPC::SDLRPCMessage* msg,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt)
-{
-  if(!msg)  return "";
-
-  Json::Value json=toJSON(msg,fid,mt);
-
-  if(json.isNull()) return "";
-
-  Json::FastWriter writer;
-  std::string rv;
-  return writer.write(json);
-}
-
-
-NsSmartDeviceLinkRPC::SDLRPCMessage* Marshaller::fromJSON(const Json::Value& json,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt)
-{
-  if(!json.isObject())  return NULL;
-  Json::Value j=Json::Value(Json::nullValue);
-
-  if(!json.isMember("parameters"))  return NULL;
-  j=json["parameters"];
-
-  switch(fid)							// let's rock, china style
-  {
-    case FunctionID::AddCommandID:
-      if(mt==messageType::request)
-      {
-        AddCommand_request* rv=new AddCommand_request;
-        if(AddCommand_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        AddCommand_response* rv=new AddCommand_response;
-        if(AddCommand_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::AddSubMenuID:
-      if(mt==messageType::request)
-      {
-        AddSubMenu_request* rv=new AddSubMenu_request;
-        if(AddSubMenu_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        AddSubMenu_response* rv=new AddSubMenu_response;
-        if(AddSubMenu_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::AlertID:
-      if(mt==messageType::request)
-      {
-        Alert_request* rv=new Alert_request;
-        if(Alert_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        Alert_response* rv=new Alert_response;
-        if(Alert_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::AlertManeuverID:
-      if(mt==messageType::request)
-      {
-        AlertManeuver_request* rv=new AlertManeuver_request;
-        if(AlertManeuver_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        AlertManeuver_response* rv=new AlertManeuver_response;
-        if(AlertManeuver_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::ChangeRegistrationID:
-      if(mt==messageType::request)
-      {
-        ChangeRegistration_request* rv=new ChangeRegistration_request;
-        if(ChangeRegistration_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        ChangeRegistration_response* rv=new ChangeRegistration_response;
-        if(ChangeRegistration_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::CreateInteractionChoiceSetID:
-      if(mt==messageType::request)
-      {
-        CreateInteractionChoiceSet_request* rv=new CreateInteractionChoiceSet_request;
-        if(CreateInteractionChoiceSet_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        CreateInteractionChoiceSet_response* rv=new CreateInteractionChoiceSet_response;
-        if(CreateInteractionChoiceSet_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::DeleteCommandID:
-      if(mt==messageType::request)
-      {
-        DeleteCommand_request* rv=new DeleteCommand_request;
-        if(DeleteCommand_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        DeleteCommand_response* rv=new DeleteCommand_response;
-        if(DeleteCommand_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::DeleteFileID:
-      if(mt==messageType::request)
-      {
-        DeleteFile_request* rv=new DeleteFile_request;
-        if(DeleteFile_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        DeleteFile_response* rv=new DeleteFile_response;
-        if(DeleteFile_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::DeleteInteractionChoiceSetID:
-      if(mt==messageType::request)
-      {
-        DeleteInteractionChoiceSet_request* rv=new DeleteInteractionChoiceSet_request;
-        if(DeleteInteractionChoiceSet_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        DeleteInteractionChoiceSet_response* rv=new DeleteInteractionChoiceSet_response;
-        if(DeleteInteractionChoiceSet_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::DeleteSubMenuID:
-      if(mt==messageType::request)
-      {
-        DeleteSubMenu_request* rv=new DeleteSubMenu_request;
-        if(DeleteSubMenu_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        DeleteSubMenu_response* rv=new DeleteSubMenu_response;
-        if(DeleteSubMenu_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::DialNumberID:
-      if(mt==messageType::request)
-      {
-        DialNumber_request* rv=new DialNumber_request;
-        if(DialNumber_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        DialNumber_response* rv=new DialNumber_response;
-        if(DialNumber_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::EncodedSyncPDataID:
-      if(mt==messageType::request)
-      {
-        EncodedSyncPData_request* rv=new EncodedSyncPData_request;
-        if(EncodedSyncPData_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        EncodedSyncPData_response* rv=new EncodedSyncPData_response;
-        if(EncodedSyncPData_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::EndAudioPassThruID:
-      if(mt==messageType::request)
-      {
-        EndAudioPassThru_request* rv=new EndAudioPassThru_request;
-        if(EndAudioPassThru_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        EndAudioPassThru_response* rv=new EndAudioPassThru_response;
-        if(EndAudioPassThru_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::GenericResponseID:
-      if(mt==messageType::request)
-      {
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        GenericResponse_response* rv=new GenericResponse_response;
-        if(GenericResponse_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::GetDTCsID:
-      if(mt==messageType::request)
-      {
-        GetDTCs_request* rv=new GetDTCs_request;
-        if(GetDTCs_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        GetDTCs_response* rv=new GetDTCs_response;
-        if(GetDTCs_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::GetVehicleDataID:
-      if(mt==messageType::request)
-      {
-        GetVehicleData_request* rv=new GetVehicleData_request;
-        if(GetVehicleData_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        GetVehicleData_response* rv=new GetVehicleData_response;
-        if(GetVehicleData_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::ListFilesID:
-      if(mt==messageType::request)
-      {
-        ListFiles_request* rv=new ListFiles_request;
-        if(ListFiles_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        ListFiles_response* rv=new ListFiles_response;
-        if(ListFiles_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::OnAppInterfaceUnregisteredID:
-      if(mt==messageType::notification)
-      {
-        OnAppInterfaceUnregistered* rv=new OnAppInterfaceUnregistered;
-        if(OnAppInterfaceUnregisteredMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-      }
-    case FunctionID::OnAudioPassThruID:
-      if(mt==messageType::notification)
-      {
-        OnAudioPassThru* rv=new OnAudioPassThru;
-        if(OnAudioPassThruMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-      }
-    case FunctionID::OnButtonEventID:
-      if(mt==messageType::notification)
-      {
-        OnButtonEvent* rv=new OnButtonEvent;
-        if(OnButtonEventMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-      }
-    case FunctionID::OnButtonPressID:
-      if(mt==messageType::notification)
-      {
-        OnButtonPress* rv=new OnButtonPress;
-        if(OnButtonPressMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-      }
-    case FunctionID::OnCommandID:
-      if(mt==messageType::notification)
-      {
-        OnCommand* rv=new OnCommand;
-        if(OnCommandMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-      }
-    case FunctionID::OnDriverDistractionID:
-      if(mt==messageType::notification)
-      {
-        OnDriverDistraction* rv=new OnDriverDistraction;
-        if(OnDriverDistractionMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-      }
-    case FunctionID::OnEncodedSyncPDataID:
-      if(mt==messageType::notification)
-      {
-        OnEncodedSyncPData* rv=new OnEncodedSyncPData;
-        if(OnEncodedSyncPDataMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-      }
-    case FunctionID::OnHMIStatusID:
-      if(mt==messageType::notification)
-      {
-        OnHMIStatus* rv=new OnHMIStatus;
-        if(OnHMIStatusMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-      }
-    case FunctionID::OnLanguageChangeID:
-      if(mt==messageType::notification)
-      {
-        OnLanguageChange* rv=new OnLanguageChange;
-        if(OnLanguageChangeMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-      }
-    case FunctionID::OnPermissionsChangeID:
-      if(mt==messageType::notification)
-      {
-        OnPermissionsChange* rv=new OnPermissionsChange;
-        if(OnPermissionsChangeMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-      }
-    case FunctionID::OnTBTClientStateID:
-      if(mt==messageType::notification)
-      {
-        OnTBTClientState* rv=new OnTBTClientState;
-        if(OnTBTClientStateMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-      }
-    case FunctionID::OnVehicleDataID:
-      if(mt==messageType::notification)
-      {
-        OnVehicleData* rv=new OnVehicleData;
-        if(OnVehicleDataMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-      }
-    case FunctionID::PerformAudioPassThruID:
-      if(mt==messageType::request)
-      {
-        PerformAudioPassThru_request* rv=new PerformAudioPassThru_request;
-        if(PerformAudioPassThru_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        PerformAudioPassThru_response* rv=new PerformAudioPassThru_response;
-        if(PerformAudioPassThru_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::PerformInteractionID:
-      if(mt==messageType::request)
-      {
-        PerformInteraction_request* rv=new PerformInteraction_request;
-        if(PerformInteraction_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        PerformInteraction_response* rv=new PerformInteraction_response;
-        if(PerformInteraction_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::PutFileID:
-      if(mt==messageType::request)
-      {
-        PutFile_request* rv=new PutFile_request;
-        if(PutFile_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        PutFile_response* rv=new PutFile_response;
-        if(PutFile_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::ReadDIDID:
-      if(mt==messageType::request)
-      {
-        ReadDID_request* rv=new ReadDID_request;
-        if(ReadDID_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        ReadDID_response* rv=new ReadDID_response;
-        if(ReadDID_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::RegisterAppInterfaceID:
-      if(mt==messageType::request)
-      {
-        RegisterAppInterface_request* rv=new RegisterAppInterface_request;
-        if(RegisterAppInterface_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        RegisterAppInterface_response* rv=new RegisterAppInterface_response;
-        if(RegisterAppInterface_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::ResetGlobalPropertiesID:
-      if(mt==messageType::request)
-      {
-        ResetGlobalProperties_request* rv=new ResetGlobalProperties_request;
-        if(ResetGlobalProperties_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        ResetGlobalProperties_response* rv=new ResetGlobalProperties_response;
-        if(ResetGlobalProperties_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::ScrollableMessageID:
-      if(mt==messageType::request)
-      {
-        ScrollableMessage_request* rv=new ScrollableMessage_request;
-        if(ScrollableMessage_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        ScrollableMessage_response* rv=new ScrollableMessage_response;
-        if(ScrollableMessage_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::SetAppIconID:
-      if(mt==messageType::request)
-      {
-        SetAppIcon_request* rv=new SetAppIcon_request;
-        if(SetAppIcon_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        SetAppIcon_response* rv=new SetAppIcon_response;
-        if(SetAppIcon_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::SetDisplayLayoutID:
-      if(mt==messageType::request)
-      {
-        SetDisplayLayout_request* rv=new SetDisplayLayout_request;
-        if(SetDisplayLayout_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        SetDisplayLayout_response* rv=new SetDisplayLayout_response;
-        if(SetDisplayLayout_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::SetGlobalPropertiesID:
-      if(mt==messageType::request)
-      {
-        SetGlobalProperties_request* rv=new SetGlobalProperties_request;
-        if(SetGlobalProperties_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        SetGlobalProperties_response* rv=new SetGlobalProperties_response;
-        if(SetGlobalProperties_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::SetMediaClockTimerID:
-      if(mt==messageType::request)
-      {
-        SetMediaClockTimer_request* rv=new SetMediaClockTimer_request;
-        if(SetMediaClockTimer_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        SetMediaClockTimer_response* rv=new SetMediaClockTimer_response;
-        if(SetMediaClockTimer_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::ShowID:
-      if(mt==messageType::request)
-      {
-        Show_request* rv=new Show_request;
-        if(Show_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        Show_response* rv=new Show_response;
-        if(Show_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::ShowConstantTBTID:
-      if(mt==messageType::request)
-      {
-        ShowConstantTBT_request* rv=new ShowConstantTBT_request;
-        if(ShowConstantTBT_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        ShowConstantTBT_response* rv=new ShowConstantTBT_response;
-        if(ShowConstantTBT_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::SliderID:
-      if(mt==messageType::request)
-      {
-        Slider_request* rv=new Slider_request;
-        if(Slider_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        Slider_response* rv=new Slider_response;
-        if(Slider_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::SpeakID:
-      if(mt==messageType::request)
-      {
-        Speak_request* rv=new Speak_request;
-        if(Speak_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        Speak_response* rv=new Speak_response;
-        if(Speak_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::SubscribeButtonID:
-      if(mt==messageType::request)
-      {
-        SubscribeButton_request* rv=new SubscribeButton_request;
-        if(SubscribeButton_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        SubscribeButton_response* rv=new SubscribeButton_response;
-        if(SubscribeButton_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::SubscribeVehicleDataID:
-      if(mt==messageType::request)
-      {
-        SubscribeVehicleData_request* rv=new SubscribeVehicleData_request;
-        if(SubscribeVehicleData_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        SubscribeVehicleData_response* rv=new SubscribeVehicleData_response;
-        if(SubscribeVehicleData_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::UnregisterAppInterfaceID:
-      if(mt==messageType::request)
-      {
-        UnregisterAppInterface_request* rv=new UnregisterAppInterface_request;
-        if(UnregisterAppInterface_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        UnregisterAppInterface_response* rv=new UnregisterAppInterface_response;
-        if(UnregisterAppInterface_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::UnsubscribeButtonID:
-      if(mt==messageType::request)
-      {
-        UnsubscribeButton_request* rv=new UnsubscribeButton_request;
-        if(UnsubscribeButton_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        UnsubscribeButton_response* rv=new UnsubscribeButton_response;
-        if(UnsubscribeButton_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::UnsubscribeVehicleDataID:
-      if(mt==messageType::request)
-      {
-        UnsubscribeVehicleData_request* rv=new UnsubscribeVehicleData_request;
-        if(UnsubscribeVehicleData_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        UnsubscribeVehicleData_response* rv=new UnsubscribeVehicleData_response;
-        if(UnsubscribeVehicleData_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    case FunctionID::UpdateTurnListID:
-      if(mt==messageType::request)
-      {
-        UpdateTurnList_request* rv=new UpdateTurnList_request;
-        if(UpdateTurnList_requestMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-
-      if(mt==messageType::response)
-      {
-        UpdateTurnList_response* rv=new UpdateTurnList_response;
-        if(UpdateTurnList_responseMarshaller::fromJSON(j,*rv))
-          return rv;
-        delete rv;
-        return NULL;
-      }
-      return NULL;
-    default:;
-  }
-
-  return NULL;
-}
-
-Json::Value Marshaller::toJSON(const NsSmartDeviceLinkRPC::SDLRPCMessage* msg, FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt)
-{
-  Json::Value j=toJSONparam(msg,fid,mt);
-  Json::Value rv=Json::Value(Json::nullValue);
-  if(!j.isNull())
-  {
-    rv=Json::Value(Json::objectValue);
-    rv["parameters"]=j;
-  }
-  return rv;
-}
-
-
-Json::Value Marshaller::toJSONparam(const NsSmartDeviceLinkRPC::SDLRPCMessage* msg,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt)
-{
-  Json::Value j=Json::Value(Json::nullValue);
-  if(!msg) return j;
-
-  switch(fid)
-  {
-    case FunctionID::AddCommandID:
-      if(mt==messageType::request)
-        return AddCommand_requestMarshaller::toJSON(* static_cast<const AddCommand_request*>(msg));
-      if(mt==messageType::response)
-         return AddCommand_responseMarshaller::toJSON(* static_cast<const AddCommand_response*>(msg));
-      return j;
-    case FunctionID::AddSubMenuID:
-      if(mt==messageType::request)
-        return AddSubMenu_requestMarshaller::toJSON(* static_cast<const AddSubMenu_request*>(msg));
-      if(mt==messageType::response)
-         return AddSubMenu_responseMarshaller::toJSON(* static_cast<const AddSubMenu_response*>(msg));
-      return j;
-    case FunctionID::AlertID:
-      if(mt==messageType::request)
-        return Alert_requestMarshaller::toJSON(* static_cast<const Alert_request*>(msg));
-      if(mt==messageType::response)
-         return Alert_responseMarshaller::toJSON(* static_cast<const Alert_response*>(msg));
-      return j;
-    case FunctionID::AlertManeuverID:
-      if(mt==messageType::request)
-        return AlertManeuver_requestMarshaller::toJSON(* static_cast<const AlertManeuver_request*>(msg));
-      if(mt==messageType::response)
-         return AlertManeuver_responseMarshaller::toJSON(* static_cast<const AlertManeuver_response*>(msg));
-      return j;
-    case FunctionID::ChangeRegistrationID:
-      if(mt==messageType::request)
-        return ChangeRegistration_requestMarshaller::toJSON(* static_cast<const ChangeRegistration_request*>(msg));
-      if(mt==messageType::response)
-         return ChangeRegistration_responseMarshaller::toJSON(* static_cast<const ChangeRegistration_response*>(msg));
-      return j;
-    case FunctionID::CreateInteractionChoiceSetID:
-      if(mt==messageType::request)
-        return CreateInteractionChoiceSet_requestMarshaller::toJSON(* static_cast<const CreateInteractionChoiceSet_request*>(msg));
-      if(mt==messageType::response)
-         return CreateInteractionChoiceSet_responseMarshaller::toJSON(* static_cast<const CreateInteractionChoiceSet_response*>(msg));
-      return j;
-    case FunctionID::DeleteCommandID:
-      if(mt==messageType::request)
-        return DeleteCommand_requestMarshaller::toJSON(* static_cast<const DeleteCommand_request*>(msg));
-      if(mt==messageType::response)
-         return DeleteCommand_responseMarshaller::toJSON(* static_cast<const DeleteCommand_response*>(msg));
-      return j;
-    case FunctionID::DeleteFileID:
-      if(mt==messageType::request)
-        return DeleteFile_requestMarshaller::toJSON(* static_cast<const DeleteFile_request*>(msg));
-      if(mt==messageType::response)
-         return DeleteFile_responseMarshaller::toJSON(* static_cast<const DeleteFile_response*>(msg));
-      return j;
-    case FunctionID::DeleteInteractionChoiceSetID:
-      if(mt==messageType::request)
-        return DeleteInteractionChoiceSet_requestMarshaller::toJSON(* static_cast<const DeleteInteractionChoiceSet_request*>(msg));
-      if(mt==messageType::response)
-         return DeleteInteractionChoiceSet_responseMarshaller::toJSON(* static_cast<const DeleteInteractionChoiceSet_response*>(msg));
-      return j;
-    case FunctionID::DeleteSubMenuID:
-      if(mt==messageType::request)
-        return DeleteSubMenu_requestMarshaller::toJSON(* static_cast<const DeleteSubMenu_request*>(msg));
-      if(mt==messageType::response)
-         return DeleteSubMenu_responseMarshaller::toJSON(* static_cast<const DeleteSubMenu_response*>(msg));
-      return j;
-    case FunctionID::DialNumberID:
-      if(mt==messageType::request)
-        return DialNumber_requestMarshaller::toJSON(* static_cast<const DialNumber_request*>(msg));
-      if(mt==messageType::response)
-         return DialNumber_responseMarshaller::toJSON(* static_cast<const DialNumber_response*>(msg));
-      return j;
-    case FunctionID::EncodedSyncPDataID:
-      if(mt==messageType::request)
-        return EncodedSyncPData_requestMarshaller::toJSON(* static_cast<const EncodedSyncPData_request*>(msg));
-      if(mt==messageType::response)
-         return EncodedSyncPData_responseMarshaller::toJSON(* static_cast<const EncodedSyncPData_response*>(msg));
-      return j;
-    case FunctionID::EndAudioPassThruID:
-      if(mt==messageType::request)
-        return EndAudioPassThru_requestMarshaller::toJSON(* static_cast<const EndAudioPassThru_request*>(msg));
-      if(mt==messageType::response)
-         return EndAudioPassThru_responseMarshaller::toJSON(* static_cast<const EndAudioPassThru_response*>(msg));
-      return j;
-    case FunctionID::GenericResponseID:
-      if(mt==messageType::request)
-        return Json::nullValue;
-      if(mt==messageType::response)
-        return GenericResponse_responseMarshaller::toJSON(* static_cast<const GenericResponse_response*>(msg));
-      return j;
-    case FunctionID::GetDTCsID:
-      if(mt==messageType::request)
-        return GetDTCs_requestMarshaller::toJSON(* static_cast<const GetDTCs_request*>(msg));
-      if(mt==messageType::response)
-         return GetDTCs_responseMarshaller::toJSON(* static_cast<const GetDTCs_response*>(msg));
-      return j;
-    case FunctionID::GetVehicleDataID:
-      if(mt==messageType::request)
-        return GetVehicleData_requestMarshaller::toJSON(* static_cast<const GetVehicleData_request*>(msg));
-      if(mt==messageType::response)
-         return GetVehicleData_responseMarshaller::toJSON(* static_cast<const GetVehicleData_response*>(msg));
-      return j;
-    case FunctionID::ListFilesID:
-      if(mt==messageType::request)
-        return ListFiles_requestMarshaller::toJSON(* static_cast<const ListFiles_request*>(msg));
-      if(mt==messageType::response)
-         return ListFiles_responseMarshaller::toJSON(* static_cast<const ListFiles_response*>(msg));
-      return j;
-    case FunctionID::OnAppInterfaceUnregisteredID:
-      return mt==messageType::notification ? OnAppInterfaceUnregisteredMarshaller::toJSON(* static_cast<const OnAppInterfaceUnregistered*>(msg)) : j;
-    case FunctionID::OnAudioPassThruID:
-      return mt==messageType::notification ? OnAudioPassThruMarshaller::toJSON(* static_cast<const OnAudioPassThru*>(msg)) : j;
-    case FunctionID::OnButtonEventID:
-      return mt==messageType::notification ? OnButtonEventMarshaller::toJSON(* static_cast<const OnButtonEvent*>(msg)) : j;
-    case FunctionID::OnButtonPressID:
-      return mt==messageType::notification ? OnButtonPressMarshaller::toJSON(* static_cast<const OnButtonPress*>(msg)) : j;
-    case FunctionID::OnCommandID:
-      return mt==messageType::notification ? OnCommandMarshaller::toJSON(* static_cast<const OnCommand*>(msg)) : j;
-    case FunctionID::OnDriverDistractionID:
-      return mt==messageType::notification ? OnDriverDistractionMarshaller::toJSON(* static_cast<const OnDriverDistraction*>(msg)) : j;
-    case FunctionID::OnEncodedSyncPDataID:
-      return mt==messageType::notification ? OnEncodedSyncPDataMarshaller::toJSON(* static_cast<const OnEncodedSyncPData*>(msg)) : j;
-    case FunctionID::OnHMIStatusID:
-      return mt==messageType::notification ? OnHMIStatusMarshaller::toJSON(* static_cast<const OnHMIStatus*>(msg)) : j;
-    case FunctionID::OnLanguageChangeID:
-      return mt==messageType::notification ? OnLanguageChangeMarshaller::toJSON(* static_cast<const OnLanguageChange*>(msg)) : j;
-    case FunctionID::OnPermissionsChangeID:
-      return mt==messageType::notification ? OnPermissionsChangeMarshaller::toJSON(* static_cast<const OnPermissionsChange*>(msg)) : j;
-    case FunctionID::OnTBTClientStateID:
-      return mt==messageType::notification ? OnTBTClientStateMarshaller::toJSON(* static_cast<const OnTBTClientState*>(msg)) : j;
-    case FunctionID::OnVehicleDataID:
-      return mt==messageType::notification ? OnVehicleDataMarshaller::toJSON(* static_cast<const OnVehicleData*>(msg)) : j;
-    case FunctionID::PerformAudioPassThruID:
-      if(mt==messageType::request)
-        return PerformAudioPassThru_requestMarshaller::toJSON(* static_cast<const PerformAudioPassThru_request*>(msg));
-      if(mt==messageType::response)
-         return PerformAudioPassThru_responseMarshaller::toJSON(* static_cast<const PerformAudioPassThru_response*>(msg));
-      return j;
-    case FunctionID::PerformInteractionID:
-      if(mt==messageType::request)
-        return PerformInteraction_requestMarshaller::toJSON(* static_cast<const PerformInteraction_request*>(msg));
-      if(mt==messageType::response)
-         return PerformInteraction_responseMarshaller::toJSON(* static_cast<const PerformInteraction_response*>(msg));
-      return j;
-    case FunctionID::PutFileID:
-      if(mt==messageType::request)
-        return PutFile_requestMarshaller::toJSON(* static_cast<const PutFile_request*>(msg));
-      if(mt==messageType::response)
-         return PutFile_responseMarshaller::toJSON(* static_cast<const PutFile_response*>(msg));
-      return j;
-    case FunctionID::ReadDIDID:
-      if(mt==messageType::request)
-        return ReadDID_requestMarshaller::toJSON(* static_cast<const ReadDID_request*>(msg));
-      if(mt==messageType::response)
-         return ReadDID_responseMarshaller::toJSON(* static_cast<const ReadDID_response*>(msg));
-      return j;
-    case FunctionID::RegisterAppInterfaceID:
-      if(mt==messageType::request)
-        return RegisterAppInterface_requestMarshaller::toJSON(* static_cast<const RegisterAppInterface_request*>(msg));
-      if(mt==messageType::response)
-         return RegisterAppInterface_responseMarshaller::toJSON(* static_cast<const RegisterAppInterface_response*>(msg));
-      return j;
-    case FunctionID::ResetGlobalPropertiesID:
-      if(mt==messageType::request)
-        return ResetGlobalProperties_requestMarshaller::toJSON(* static_cast<const ResetGlobalProperties_request*>(msg));
-      if(mt==messageType::response)
-         return ResetGlobalProperties_responseMarshaller::toJSON(* static_cast<const ResetGlobalProperties_response*>(msg));
-      return j;
-    case FunctionID::ScrollableMessageID:
-      if(mt==messageType::request)
-        return ScrollableMessage_requestMarshaller::toJSON(* static_cast<const ScrollableMessage_request*>(msg));
-      if(mt==messageType::response)
-         return ScrollableMessage_responseMarshaller::toJSON(* static_cast<const ScrollableMessage_response*>(msg));
-      return j;
-    case FunctionID::SetAppIconID:
-      if(mt==messageType::request)
-        return SetAppIcon_requestMarshaller::toJSON(* static_cast<const SetAppIcon_request*>(msg));
-      if(mt==messageType::response)
-         return SetAppIcon_responseMarshaller::toJSON(* static_cast<const SetAppIcon_response*>(msg));
-      return j;
-    case FunctionID::SetDisplayLayoutID:
-      if(mt==messageType::request)
-        return SetDisplayLayout_requestMarshaller::toJSON(* static_cast<const SetDisplayLayout_request*>(msg));
-      if(mt==messageType::response)
-         return SetDisplayLayout_responseMarshaller::toJSON(* static_cast<const SetDisplayLayout_response*>(msg));
-      return j;
-    case FunctionID::SetGlobalPropertiesID:
-      if(mt==messageType::request)
-        return SetGlobalProperties_requestMarshaller::toJSON(* static_cast<const SetGlobalProperties_request*>(msg));
-      if(mt==messageType::response)
-         return SetGlobalProperties_responseMarshaller::toJSON(* static_cast<const SetGlobalProperties_response*>(msg));
-      return j;
-    case FunctionID::SetMediaClockTimerID:
-      if(mt==messageType::request)
-        return SetMediaClockTimer_requestMarshaller::toJSON(* static_cast<const SetMediaClockTimer_request*>(msg));
-      if(mt==messageType::response)
-         return SetMediaClockTimer_responseMarshaller::toJSON(* static_cast<const SetMediaClockTimer_response*>(msg));
-      return j;
-    case FunctionID::ShowID:
-      if(mt==messageType::request)
-        return Show_requestMarshaller::toJSON(* static_cast<const Show_request*>(msg));
-      if(mt==messageType::response)
-         return Show_responseMarshaller::toJSON(* static_cast<const Show_response*>(msg));
-      return j;
-    case FunctionID::ShowConstantTBTID:
-      if(mt==messageType::request)
-        return ShowConstantTBT_requestMarshaller::toJSON(* static_cast<const ShowConstantTBT_request*>(msg));
-      if(mt==messageType::response)
-         return ShowConstantTBT_responseMarshaller::toJSON(* static_cast<const ShowConstantTBT_response*>(msg));
-      return j;
-    case FunctionID::SliderID:
-      if(mt==messageType::request)
-        return Slider_requestMarshaller::toJSON(* static_cast<const Slider_request*>(msg));
-      if(mt==messageType::response)
-         return Slider_responseMarshaller::toJSON(* static_cast<const Slider_response*>(msg));
-      return j;
-    case FunctionID::SpeakID:
-      if(mt==messageType::request)
-        return Speak_requestMarshaller::toJSON(* static_cast<const Speak_request*>(msg));
-      if(mt==messageType::response)
-         return Speak_responseMarshaller::toJSON(* static_cast<const Speak_response*>(msg));
-      return j;
-    case FunctionID::SubscribeButtonID:
-      if(mt==messageType::request)
-        return SubscribeButton_requestMarshaller::toJSON(* static_cast<const SubscribeButton_request*>(msg));
-      if(mt==messageType::response)
-         return SubscribeButton_responseMarshaller::toJSON(* static_cast<const SubscribeButton_response*>(msg));
-      return j;
-    case FunctionID::SubscribeVehicleDataID:
-      if(mt==messageType::request)
-        return SubscribeVehicleData_requestMarshaller::toJSON(* static_cast<const SubscribeVehicleData_request*>(msg));
-      if(mt==messageType::response)
-         return SubscribeVehicleData_responseMarshaller::toJSON(* static_cast<const SubscribeVehicleData_response*>(msg));
-      return j;
-    case FunctionID::UnregisterAppInterfaceID:
-      if(mt==messageType::request)
-        return UnregisterAppInterface_requestMarshaller::toJSON(* static_cast<const UnregisterAppInterface_request*>(msg));
-      if(mt==messageType::response)
-         return UnregisterAppInterface_responseMarshaller::toJSON(* static_cast<const UnregisterAppInterface_response*>(msg));
-      return j;
-    case FunctionID::UnsubscribeButtonID:
-      if(mt==messageType::request)
-        return UnsubscribeButton_requestMarshaller::toJSON(* static_cast<const UnsubscribeButton_request*>(msg));
-      if(mt==messageType::response)
-         return UnsubscribeButton_responseMarshaller::toJSON(* static_cast<const UnsubscribeButton_response*>(msg));
-      return j;
-    case FunctionID::UnsubscribeVehicleDataID:
-      if(mt==messageType::request)
-        return UnsubscribeVehicleData_requestMarshaller::toJSON(* static_cast<const UnsubscribeVehicleData_request*>(msg));
-      if(mt==messageType::response)
-         return UnsubscribeVehicleData_responseMarshaller::toJSON(* static_cast<const UnsubscribeVehicleData_response*>(msg));
-      return j;
-    case FunctionID::UpdateTurnListID:
-      if(mt==messageType::request)
-        return UpdateTurnList_requestMarshaller::toJSON(* static_cast<const UpdateTurnList_request*>(msg));
-      if(mt==messageType::response)
-         return UpdateTurnList_responseMarshaller::toJSON(* static_cast<const UpdateTurnList_response*>(msg));
-      return j;
-    default:;
-  }
-  return j;
-}
-
-RegisterAppInterface_requestMarshaller Marshaller::mRegisterAppInterface_request;
-RegisterAppInterface_responseMarshaller Marshaller::mRegisterAppInterface_response;
-UnregisterAppInterface_requestMarshaller Marshaller::mUnregisterAppInterface_request;
-UnregisterAppInterface_responseMarshaller Marshaller::mUnregisterAppInterface_response;
-SetGlobalProperties_requestMarshaller Marshaller::mSetGlobalProperties_request;
-SetGlobalProperties_responseMarshaller Marshaller::mSetGlobalProperties_response;
-ResetGlobalProperties_requestMarshaller Marshaller::mResetGlobalProperties_request;
-ResetGlobalProperties_responseMarshaller Marshaller::mResetGlobalProperties_response;
-AddCommand_requestMarshaller Marshaller::mAddCommand_request;
-AddCommand_responseMarshaller Marshaller::mAddCommand_response;
-DeleteCommand_requestMarshaller Marshaller::mDeleteCommand_request;
-DeleteCommand_responseMarshaller Marshaller::mDeleteCommand_response;
-AddSubMenu_requestMarshaller Marshaller::mAddSubMenu_request;
-AddSubMenu_responseMarshaller Marshaller::mAddSubMenu_response;
-DeleteSubMenu_requestMarshaller Marshaller::mDeleteSubMenu_request;
-DeleteSubMenu_responseMarshaller Marshaller::mDeleteSubMenu_response;
-CreateInteractionChoiceSet_requestMarshaller Marshaller::mCreateInteractionChoiceSet_request;
-CreateInteractionChoiceSet_responseMarshaller Marshaller::mCreateInteractionChoiceSet_response;
-PerformInteraction_requestMarshaller Marshaller::mPerformInteraction_request;
-PerformInteraction_responseMarshaller Marshaller::mPerformInteraction_response;
-DeleteInteractionChoiceSet_requestMarshaller Marshaller::mDeleteInteractionChoiceSet_request;
-DeleteInteractionChoiceSet_responseMarshaller Marshaller::mDeleteInteractionChoiceSet_response;
-Alert_requestMarshaller Marshaller::mAlert_request;
-Alert_responseMarshaller Marshaller::mAlert_response;
-Show_requestMarshaller Marshaller::mShow_request;
-Show_responseMarshaller Marshaller::mShow_response;
-Speak_requestMarshaller Marshaller::mSpeak_request;
-Speak_responseMarshaller Marshaller::mSpeak_response;
-SetMediaClockTimer_requestMarshaller Marshaller::mSetMediaClockTimer_request;
-SetMediaClockTimer_responseMarshaller Marshaller::mSetMediaClockTimer_response;
-EncodedSyncPData_requestMarshaller Marshaller::mEncodedSyncPData_request;
-EncodedSyncPData_responseMarshaller Marshaller::mEncodedSyncPData_response;
-DialNumber_requestMarshaller Marshaller::mDialNumber_request;
-DialNumber_responseMarshaller Marshaller::mDialNumber_response;
-PerformAudioPassThru_requestMarshaller Marshaller::mPerformAudioPassThru_request;
-PerformAudioPassThru_responseMarshaller Marshaller::mPerformAudioPassThru_response;
-EndAudioPassThru_requestMarshaller Marshaller::mEndAudioPassThru_request;
-EndAudioPassThru_responseMarshaller Marshaller::mEndAudioPassThru_response;
-SubscribeButton_requestMarshaller Marshaller::mSubscribeButton_request;
-SubscribeButton_responseMarshaller Marshaller::mSubscribeButton_response;
-UnsubscribeButton_requestMarshaller Marshaller::mUnsubscribeButton_request;
-UnsubscribeButton_responseMarshaller Marshaller::mUnsubscribeButton_response;
-SubscribeVehicleData_requestMarshaller Marshaller::mSubscribeVehicleData_request;
-SubscribeVehicleData_responseMarshaller Marshaller::mSubscribeVehicleData_response;
-UnsubscribeVehicleData_requestMarshaller Marshaller::mUnsubscribeVehicleData_request;
-UnsubscribeVehicleData_responseMarshaller Marshaller::mUnsubscribeVehicleData_response;
-GetVehicleData_requestMarshaller Marshaller::mGetVehicleData_request;
-GetVehicleData_responseMarshaller Marshaller::mGetVehicleData_response;
-ReadDID_requestMarshaller Marshaller::mReadDID_request;
-ReadDID_responseMarshaller Marshaller::mReadDID_response;
-GetDTCs_requestMarshaller Marshaller::mGetDTCs_request;
-GetDTCs_responseMarshaller Marshaller::mGetDTCs_response;
-ScrollableMessage_requestMarshaller Marshaller::mScrollableMessage_request;
-ScrollableMessage_responseMarshaller Marshaller::mScrollableMessage_response;
-Slider_requestMarshaller Marshaller::mSlider_request;
-Slider_responseMarshaller Marshaller::mSlider_response;
-ShowConstantTBT_requestMarshaller Marshaller::mShowConstantTBT_request;
-ShowConstantTBT_responseMarshaller Marshaller::mShowConstantTBT_response;
-AlertManeuver_requestMarshaller Marshaller::mAlertManeuver_request;
-AlertManeuver_responseMarshaller Marshaller::mAlertManeuver_response;
-UpdateTurnList_requestMarshaller Marshaller::mUpdateTurnList_request;
-UpdateTurnList_responseMarshaller Marshaller::mUpdateTurnList_response;
-ChangeRegistration_requestMarshaller Marshaller::mChangeRegistration_request;
-ChangeRegistration_responseMarshaller Marshaller::mChangeRegistration_response;
-GenericResponse_responseMarshaller Marshaller::mGenericResponse_response;
-PutFile_requestMarshaller Marshaller::mPutFile_request;
-PutFile_responseMarshaller Marshaller::mPutFile_response;
-DeleteFile_requestMarshaller Marshaller::mDeleteFile_request;
-DeleteFile_responseMarshaller Marshaller::mDeleteFile_response;
-ListFiles_requestMarshaller Marshaller::mListFiles_request;
-ListFiles_responseMarshaller Marshaller::mListFiles_response;
-SetAppIcon_requestMarshaller Marshaller::mSetAppIcon_request;
-SetAppIcon_responseMarshaller Marshaller::mSetAppIcon_response;
-SetDisplayLayout_requestMarshaller Marshaller::mSetDisplayLayout_request;
-SetDisplayLayout_responseMarshaller Marshaller::mSetDisplayLayout_response;
-OnHMIStatusMarshaller Marshaller::mOnHMIStatus;
-OnAppInterfaceUnregisteredMarshaller Marshaller::mOnAppInterfaceUnregistered;
-OnButtonEventMarshaller Marshaller::mOnButtonEvent;
-OnButtonPressMarshaller Marshaller::mOnButtonPress;
-OnVehicleDataMarshaller Marshaller::mOnVehicleData;
-OnCommandMarshaller Marshaller::mOnCommand;
-OnEncodedSyncPDataMarshaller Marshaller::mOnEncodedSyncPData;
-OnTBTClientStateMarshaller Marshaller::mOnTBTClientState;
-OnDriverDistractionMarshaller Marshaller::mOnDriverDistraction;
-OnPermissionsChangeMarshaller Marshaller::mOnPermissionsChange;
-OnAudioPassThruMarshaller Marshaller::mOnAudioPassThru;
-OnLanguageChangeMarshaller Marshaller::mOnLanguageChange;
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.cpp
deleted file mode 100644
index 1f8c9b40d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/MediaClockFormat.h"
-#include "MediaClockFormatMarshaller.h"
-#include "MediaClockFormatMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const MediaClockFormat::MediaClockFormatInternal MediaClockFormatMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return MediaClockFormat::INVALID_ENUM;
-  const struct PerfectHashTable* p=MediaClockFormat_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<MediaClockFormat::MediaClockFormatInternal>(p->idx) : MediaClockFormat::INVALID_ENUM;
-}
-
-
-bool MediaClockFormatMarshaller::fromJSON(const Json::Value& s,MediaClockFormat& e)
-{
-  e.mInternal=MediaClockFormat::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=MediaClockFormat::INVALID_ENUM);
-}
-
-
-Json::Value MediaClockFormatMarshaller::toJSON(const MediaClockFormat& e)
-{
-  if(e.mInternal==MediaClockFormat::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool MediaClockFormatMarshaller::fromString(const std::string& s,MediaClockFormat& e)
-{
-  e.mInternal=MediaClockFormat::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string MediaClockFormatMarshaller::toString(const MediaClockFormat& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==MediaClockFormat::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable MediaClockFormatMarshaller::mHashTable[5]=
-{
-  {"CLOCK1",0},
-  {"CLOCK2",1},
-  {"CLOCKTEXT1",2},
-  {"CLOCKTEXT2",3},
-  {"CLOCKTEXT3",4}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp
deleted file mode 100644
index f3b9383c1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp
+++ /dev/null
@@ -1,21 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name MediaClockFormat_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-CLOCK1,0
-CLOCK2,1
-CLOCKTEXT1,2
-CLOCKTEXT2,3
-CLOCKTEXT3,4
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.h
deleted file mode 100644
index 1f3ccd36b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_MEDIACLOCKFORMATMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_MEDIACLOCKFORMATMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/MediaClockFormat.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for MediaClockFormat
-
-  class MediaClockFormatMarshaller
-  {
-  public:
-  
-    static std::string toName(const MediaClockFormat& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(MediaClockFormat& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=MediaClockFormat::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(MediaClockFormat& e)		{ return e.mInternal!=MediaClockFormat::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const MediaClockFormat& e)	{ return e.mInternal!=MediaClockFormat::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,MediaClockFormat& e);
-    static const std::string toString(const MediaClockFormat& e);
-  
-    static bool fromJSON(const Json::Value& s,MediaClockFormat& e);
-    static Json::Value toJSON(const MediaClockFormat& e);
-  
-    static const char* getName(MediaClockFormat::MediaClockFormatInternal e)
-    {
-       return (e>=0 && e<5) ? mHashTable[e].name : NULL;
-    }
-  
-    static const MediaClockFormat::MediaClockFormatInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[5];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.inc
deleted file mode 100644
index 579404325..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.inc
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp  */
-/* Computed positions: -k'$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 5
-#define MIN_WORD_LENGTH 6
-#define MAX_WORD_LENGTH 10
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 15
-/* maximum key range = 10, duplicates = 0 */
-
-class MediaClockFormat_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-MediaClockFormat_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16,  5,
-       0,  2, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16
-    };
-  return len + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-MediaClockFormat_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  6,  0,  0,  0, 10,  6, 10,  0,
-       0, 10
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp"
-      {"CLOCK2",1},
-      {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp"
-      {"CLOCKTEXT2",3},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp"
-      {"CLOCK1",0},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp"
-      {"CLOCKTEXT3",4},
-      {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MediaClockFormatMarshaller.gp"
-      {"CLOCKTEXT1",2}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParams.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParams.cpp
deleted file mode 100644
index e6094516b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParams.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/MenuParams.h"
-#include "MenuParamsMarshaller.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-MenuParams& MenuParams::operator =(const MenuParams& c)
-{
-  menuName=c.menuName;
-  parentID=c.parentID ? new unsigned int(c.parentID[0]) : 0;
-  position=c.position ? new unsigned int(c.position[0]) : 0;
-
-  return *this;
-}
-
-
-MenuParams::~MenuParams(void)
-{
-  if(parentID)
-    delete parentID;
-  if(position)
-    delete position;
-}
-
-
-MenuParams::MenuParams(const MenuParams& c)
-{
-  *this=c;
-}
-
-
-bool MenuParams::checkIntegrity(void)
-{
-  return MenuParamsMarshaller::checkIntegrity(*this);
-}
-
-
-MenuParams::MenuParams(void) :
-    parentID(0),
-    position(0)
-{
-}
-
-
-
-bool MenuParams::set_menuName(const std::string& menuName_)
-{
-  if(menuName_.length()>500)  return false;
-  menuName=menuName_;
-  return true;
-}
-
-bool MenuParams::set_parentID(unsigned int parentID_)
-{
-  if(parentID_>2000000000)  return false;
-  delete parentID;
-  parentID=0;
-
-  parentID=new unsigned int(parentID_);
-  return true;
-}
-
-void MenuParams::reset_parentID(void)
-{
-  if(parentID)
-    delete parentID;
-  parentID=0;
-}
-
-bool MenuParams::set_position(unsigned int position_)
-{
-  if(position_>1000)  return false;
-  delete position;
-  position=0;
-
-  position=new unsigned int(position_);
-  return true;
-}
-
-void MenuParams::reset_position(void)
-{
-  if(position)
-    delete position;
-  position=0;
-}
-
-
-
-
-const std::string& MenuParams::get_menuName(void) const 
-{
-  return menuName;
-}
-
-
-const unsigned int* MenuParams::get_parentID(void) const 
-{
-  return parentID;
-}
-
-
-const unsigned int* MenuParams::get_position(void) const 
-{
-  return position;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.cpp
deleted file mode 100644
index 7e9e24218..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/MenuParams.h"
-
-
-#include "MenuParamsMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool MenuParamsMarshaller::checkIntegrity(MenuParams& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool MenuParamsMarshaller::fromString(const std::string& s,MenuParams& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string MenuParamsMarshaller::toString(const MenuParams& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool MenuParamsMarshaller::checkIntegrityConst(const MenuParams& s)
-{
-  if(s.menuName.length()>500)  return false;
-  if(s.parentID && *s.parentID>2000000000)  return false;
-  if(s.position && *s.position>1000)  return false;
-  return true;
-}
-
-Json::Value MenuParamsMarshaller::toJSON(const MenuParams& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["menuName"]=Json::Value(e.menuName);
-
-  if(e.parentID)
-    json["parentID"]=Json::Value(*e.parentID);
-
-  if(e.position)
-    json["position"]=Json::Value(*e.position);
-
-
-  return json;
-}
-
-
-bool MenuParamsMarshaller::fromJSON(const Json::Value& json,MenuParams& c)
-{
-  if(c.parentID)  delete c.parentID;
-  c.parentID=0;
-
-  if(c.position)  delete c.position;
-  c.position=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("menuName"))  return false;
-    {
-      const Json::Value& j=json["menuName"];
-      if(!j.isString())  return false;
-      c.menuName=j.asString();
-    }
-    if(json.isMember("parentID"))
-    {
-      const Json::Value& j=json["parentID"];
-      if(!j.isInt())  return false;
-      c.parentID=new unsigned int(j.asInt());
-    }
-    if(json.isMember("position"))
-    {
-      const Json::Value& j=json["position"];
-      if(!j.isInt())  return false;
-      c.position=new unsigned int(j.asInt());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.h
deleted file mode 100644
index f25ab627c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/MenuParamsMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_MENUPARAMSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_MENUPARAMSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/MenuParams.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct MenuParamsMarshaller
-  {
-    static bool checkIntegrity(MenuParams& e);
-    static bool checkIntegrityConst(const MenuParams& e);
-  
-    static bool fromString(const std::string& s,MenuParams& e);
-    static const std::string toString(const MenuParams& e);
-  
-    static bool fromJSON(const Json::Value& s,MenuParams& e);
-    static Json::Value toJSON(const MenuParams& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregistered.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregistered.cpp
deleted file mode 100644
index cea50c4bb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregistered.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h"
-#include "OnAppInterfaceUnregisteredMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "AppInterfaceUnregisteredReasonMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnAppInterfaceUnregistered::~OnAppInterfaceUnregistered(void)
-{
-}
-
-
-OnAppInterfaceUnregistered::OnAppInterfaceUnregistered(const OnAppInterfaceUnregistered& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool OnAppInterfaceUnregistered::checkIntegrity(void)
-{
-  return OnAppInterfaceUnregisteredMarshaller::checkIntegrity(*this);
-}
-
-
-OnAppInterfaceUnregistered::OnAppInterfaceUnregistered(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnAppInterfaceUnregistered::set_reason(const AppInterfaceUnregisteredReason& reason_)
-{
-  if(!AppInterfaceUnregisteredReasonMarshaller::checkIntegrityConst(reason_))   return false;
-  reason=reason_;
-  return true;
-}
-
-
-
-
-const AppInterfaceUnregisteredReason& OnAppInterfaceUnregistered::get_reason(void) const 
-{
-  return reason;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.cpp
deleted file mode 100644
index 8a3071d80..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h"
-#include "AppInterfaceUnregisteredReasonMarshaller.h"
-
-#include "OnAppInterfaceUnregisteredMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnAppInterfaceUnregisteredMarshaller::checkIntegrity(OnAppInterfaceUnregistered& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnAppInterfaceUnregisteredMarshaller::fromString(const std::string& s,OnAppInterfaceUnregistered& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnAppInterfaceUnregisteredMarshaller::toString(const OnAppInterfaceUnregistered& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnAppInterfaceUnregisteredMarshaller::checkIntegrityConst(const OnAppInterfaceUnregistered& s)
-{
-  if(!AppInterfaceUnregisteredReasonMarshaller::checkIntegrityConst(s.reason))  return false;
-  return true;
-}
-
-Json::Value OnAppInterfaceUnregisteredMarshaller::toJSON(const OnAppInterfaceUnregistered& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["reason"]=AppInterfaceUnregisteredReasonMarshaller::toJSON(e.reason);
-
-  return json;
-}
-
-
-bool OnAppInterfaceUnregisteredMarshaller::fromJSON(const Json::Value& json,OnAppInterfaceUnregistered& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("reason"))  return false;
-    {
-      const Json::Value& j=json["reason"];
-      if(!AppInterfaceUnregisteredReasonMarshaller::fromJSON(j,c.reason))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.h
deleted file mode 100644
index e249146ce..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONAPPINTERFACEUNREGISTEREDMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONAPPINTERFACEUNREGISTEREDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct OnAppInterfaceUnregisteredMarshaller
-  {
-    static bool checkIntegrity(OnAppInterfaceUnregistered& e);
-    static bool checkIntegrityConst(const OnAppInterfaceUnregistered& e);
-  
-    static bool fromString(const std::string& s,OnAppInterfaceUnregistered& e);
-    static const std::string toString(const OnAppInterfaceUnregistered& e);
-  
-    static bool fromJSON(const Json::Value& s,OnAppInterfaceUnregistered& e);
-    static Json::Value toJSON(const OnAppInterfaceUnregistered& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThru.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThru.cpp
deleted file mode 100644
index 6592ccec9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThru.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h"
-#include "OnAudioPassThruMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnAudioPassThru::~OnAudioPassThru(void)
-{
-}
-
-
-OnAudioPassThru::OnAudioPassThru(const OnAudioPassThru& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool OnAudioPassThru::checkIntegrity(void)
-{
-  return OnAudioPassThruMarshaller::checkIntegrity(*this);
-}
-
-
-OnAudioPassThru::OnAudioPassThru(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.cpp
deleted file mode 100644
index b823dc0db..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h"
-
-
-#include "OnAudioPassThruMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnAudioPassThruMarshaller::checkIntegrity(OnAudioPassThru& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnAudioPassThruMarshaller::fromString(const std::string& s,OnAudioPassThru& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnAudioPassThruMarshaller::toString(const OnAudioPassThru& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnAudioPassThruMarshaller::checkIntegrityConst(const OnAudioPassThru& s)
-{
-  return true;
-}
-
-Json::Value OnAudioPassThruMarshaller::toJSON(const OnAudioPassThru& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  return json=Json::Value(Json::nullValue);
-}
-
-
-bool OnAudioPassThruMarshaller::fromJSON(const Json::Value& json,OnAudioPassThru& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.h
deleted file mode 100644
index 3b69417f0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONAUDIOPASSTHRUMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONAUDIOPASSTHRUMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct OnAudioPassThruMarshaller
-  {
-    static bool checkIntegrity(OnAudioPassThru& e);
-    static bool checkIntegrityConst(const OnAudioPassThru& e);
-  
-    static bool fromString(const std::string& s,OnAudioPassThru& e);
-    static const std::string toString(const OnAudioPassThru& e);
-  
-    static bool fromJSON(const Json::Value& s,OnAudioPassThru& e);
-    static Json::Value toJSON(const OnAudioPassThru& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEvent.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEvent.cpp
deleted file mode 100644
index 5dd2436a2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEvent.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h"
-#include "OnButtonEventMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ButtonEventModeMarshaller.h"
-#include "ButtonNameMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnButtonEvent::~OnButtonEvent(void)
-{
-}
-
-
-OnButtonEvent::OnButtonEvent(const OnButtonEvent& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool OnButtonEvent::checkIntegrity(void)
-{
-  return OnButtonEventMarshaller::checkIntegrity(*this);
-}
-
-
-OnButtonEvent::OnButtonEvent(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnButtonEvent::set_buttonName(const ButtonName& buttonName_)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(buttonName_))   return false;
-  buttonName=buttonName_;
-  return true;
-}
-
-bool OnButtonEvent::set_buttonEventMode(const ButtonEventMode& buttonEventMode_)
-{
-  if(!ButtonEventModeMarshaller::checkIntegrityConst(buttonEventMode_))   return false;
-  buttonEventMode=buttonEventMode_;
-  return true;
-}
-
-bool OnButtonEvent::set_customButtonID(unsigned int customButtonID_)
-{
-  if(customButtonID_>65536)  return false;
-  customButtonID=customButtonID_;
-  return true;
-}
-
-
-
-
-const ButtonName& OnButtonEvent::get_buttonName(void) const 
-{
-  return buttonName;
-}
-
-const ButtonEventMode& OnButtonEvent::get_buttonEventMode(void) const 
-{
-  return buttonEventMode;
-}
-
-unsigned int OnButtonEvent::get_customButtonID(void) const
-{
-  return customButtonID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.cpp
deleted file mode 100644
index ecf9f5c94..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h"
-#include "ButtonEventModeMarshaller.h"
-#include "ButtonNameMarshaller.h"
-
-#include "OnButtonEventMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnButtonEventMarshaller::checkIntegrity(OnButtonEvent& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnButtonEventMarshaller::fromString(const std::string& s,OnButtonEvent& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnButtonEventMarshaller::toString(const OnButtonEvent& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnButtonEventMarshaller::checkIntegrityConst(const OnButtonEvent& s)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(s.buttonName))  return false;
-  if(!ButtonEventModeMarshaller::checkIntegrityConst(s.buttonEventMode))  return false;
-  if(s.customButtonID>65536)  return false;
-  return true;
-}
-
-Json::Value OnButtonEventMarshaller::toJSON(const OnButtonEvent& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["buttonName"]=ButtonNameMarshaller::toJSON(e.buttonName);
-
-  json["buttonEventMode"]=ButtonEventModeMarshaller::toJSON(e.buttonEventMode);
-
-  json["customButtonID"]=Json::Value(e.customButtonID);
-
-  return json;
-}
-
-
-bool OnButtonEventMarshaller::fromJSON(const Json::Value& json,OnButtonEvent& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("buttonName"))  return false;
-    {
-      const Json::Value& j=json["buttonName"];
-      if(!ButtonNameMarshaller::fromJSON(j,c.buttonName))
-        return false;
-    }
-    if(!json.isMember("buttonEventMode"))  return false;
-    {
-      const Json::Value& j=json["buttonEventMode"];
-      if(!ButtonEventModeMarshaller::fromJSON(j,c.buttonEventMode))
-        return false;
-    }
-    if(!json.isMember("customButtonID"))  return false;
-    {
-      const Json::Value& j=json["customButtonID"];
-      if(!j.isInt())  return false;
-      c.customButtonID=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.h
deleted file mode 100644
index f3df6184d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONBUTTONEVENTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONBUTTONEVENTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct OnButtonEventMarshaller
-  {
-    static bool checkIntegrity(OnButtonEvent& e);
-    static bool checkIntegrityConst(const OnButtonEvent& e);
-  
-    static bool fromString(const std::string& s,OnButtonEvent& e);
-    static const std::string toString(const OnButtonEvent& e);
-  
-    static bool fromJSON(const Json::Value& s,OnButtonEvent& e);
-    static Json::Value toJSON(const OnButtonEvent& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPress.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPress.cpp
deleted file mode 100644
index 47be4f7bb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPress.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h"
-#include "OnButtonPressMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ButtonNameMarshaller.h"
-#include "ButtonPressModeMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnButtonPress::~OnButtonPress(void)
-{
-}
-
-
-OnButtonPress::OnButtonPress(const OnButtonPress& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool OnButtonPress::checkIntegrity(void)
-{
-  return OnButtonPressMarshaller::checkIntegrity(*this);
-}
-
-
-OnButtonPress::OnButtonPress(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnButtonPress::set_buttonName(const ButtonName& buttonName_)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(buttonName_))   return false;
-  buttonName=buttonName_;
-  return true;
-}
-
-bool OnButtonPress::set_buttonPressMode(const ButtonPressMode& buttonPressMode_)
-{
-  if(!ButtonPressModeMarshaller::checkIntegrityConst(buttonPressMode_))   return false;
-  buttonPressMode=buttonPressMode_;
-  return true;
-}
-
-bool OnButtonPress::set_customButtonID(unsigned int customButtonID_)
-{
-  if(customButtonID_>65536)  return false;
-  customButtonID=customButtonID_;
-  return true;
-}
-
-
-
-
-const ButtonName& OnButtonPress::get_buttonName(void) const 
-{
-  return buttonName;
-}
-
-const ButtonPressMode& OnButtonPress::get_buttonPressMode(void) const 
-{
-  return buttonPressMode;
-}
-
-unsigned int OnButtonPress::get_customButtonID(void) const
-{
-  return customButtonID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.cpp
deleted file mode 100644
index db7ec8a55..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h"
-#include "ButtonNameMarshaller.h"
-#include "ButtonPressModeMarshaller.h"
-
-#include "OnButtonPressMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnButtonPressMarshaller::checkIntegrity(OnButtonPress& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnButtonPressMarshaller::fromString(const std::string& s,OnButtonPress& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnButtonPressMarshaller::toString(const OnButtonPress& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnButtonPressMarshaller::checkIntegrityConst(const OnButtonPress& s)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(s.buttonName))  return false;
-  if(!ButtonPressModeMarshaller::checkIntegrityConst(s.buttonPressMode))  return false;
-  if(s.customButtonID>65536)  return false;
-  return true;
-}
-
-Json::Value OnButtonPressMarshaller::toJSON(const OnButtonPress& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["buttonName"]=ButtonNameMarshaller::toJSON(e.buttonName);
-
-  json["buttonPressMode"]=ButtonPressModeMarshaller::toJSON(e.buttonPressMode);
-
-  json["customButtonID"]=Json::Value(e.customButtonID);
-
-  return json;
-}
-
-
-bool OnButtonPressMarshaller::fromJSON(const Json::Value& json,OnButtonPress& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("buttonName"))  return false;
-    {
-      const Json::Value& j=json["buttonName"];
-      if(!ButtonNameMarshaller::fromJSON(j,c.buttonName))
-        return false;
-    }
-    if(!json.isMember("buttonPressMode"))  return false;
-    {
-      const Json::Value& j=json["buttonPressMode"];
-      if(!ButtonPressModeMarshaller::fromJSON(j,c.buttonPressMode))
-        return false;
-    }
-    if(!json.isMember("customButtonID"))  return false;
-    {
-      const Json::Value& j=json["customButtonID"];
-      if(!j.isInt())  return false;
-      c.customButtonID=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.h
deleted file mode 100644
index a78cfcf32..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONBUTTONPRESSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONBUTTONPRESSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct OnButtonPressMarshaller
-  {
-    static bool checkIntegrity(OnButtonPress& e);
-    static bool checkIntegrityConst(const OnButtonPress& e);
-  
-    static bool fromString(const std::string& s,OnButtonPress& e);
-    static const std::string toString(const OnButtonPress& e);
-  
-    static bool fromJSON(const Json::Value& s,OnButtonPress& e);
-    static Json::Value toJSON(const OnButtonPress& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommand.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommand.cpp
deleted file mode 100644
index 9852c0b48..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommand.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnCommand.h"
-#include "OnCommandMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "TriggerSourceMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnCommand::~OnCommand(void)
-{
-}
-
-
-OnCommand::OnCommand(const OnCommand& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool OnCommand::checkIntegrity(void)
-{
-  return OnCommandMarshaller::checkIntegrity(*this);
-}
-
-
-OnCommand::OnCommand(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnCommand::set_cmdID(unsigned int cmdID_)
-{
-  if(cmdID_>2000000000)  return false;
-  cmdID=cmdID_;
-  return true;
-}
-
-bool OnCommand::set_triggerSource(const TriggerSource& triggerSource_)
-{
-  if(!TriggerSourceMarshaller::checkIntegrityConst(triggerSource_))   return false;
-  triggerSource=triggerSource_;
-  return true;
-}
-
-
-
-
-unsigned int OnCommand::get_cmdID(void) const
-{
-  return cmdID;
-}
-
-const TriggerSource& OnCommand::get_triggerSource(void) const 
-{
-  return triggerSource;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.cpp
deleted file mode 100644
index b255a9132..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnCommand.h"
-#include "TriggerSourceMarshaller.h"
-
-#include "OnCommandMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnCommandMarshaller::checkIntegrity(OnCommand& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnCommandMarshaller::fromString(const std::string& s,OnCommand& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnCommandMarshaller::toString(const OnCommand& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnCommandMarshaller::checkIntegrityConst(const OnCommand& s)
-{
-  if(s.cmdID>2000000000)  return false;
-  if(!TriggerSourceMarshaller::checkIntegrityConst(s.triggerSource))  return false;
-  return true;
-}
-
-Json::Value OnCommandMarshaller::toJSON(const OnCommand& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["cmdID"]=Json::Value(e.cmdID);
-
-  json["triggerSource"]=TriggerSourceMarshaller::toJSON(e.triggerSource);
-
-  return json;
-}
-
-
-bool OnCommandMarshaller::fromJSON(const Json::Value& json,OnCommand& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("cmdID"))  return false;
-    {
-      const Json::Value& j=json["cmdID"];
-      if(!j.isInt())  return false;
-      c.cmdID=j.asInt();
-    }
-    if(!json.isMember("triggerSource"))  return false;
-    {
-      const Json::Value& j=json["triggerSource"];
-      if(!TriggerSourceMarshaller::fromJSON(j,c.triggerSource))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.h
deleted file mode 100644
index 5a2194b76..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONCOMMANDMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONCOMMANDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnCommand.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct OnCommandMarshaller
-  {
-    static bool checkIntegrity(OnCommand& e);
-    static bool checkIntegrityConst(const OnCommand& e);
-  
-    static bool fromString(const std::string& s,OnCommand& e);
-    static const std::string toString(const OnCommand& e);
-  
-    static bool fromJSON(const Json::Value& s,OnCommand& e);
-    static Json::Value toJSON(const OnCommand& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistraction.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistraction.cpp
deleted file mode 100644
index afe6af9f3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistraction.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h"
-#include "OnDriverDistractionMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "DriverDistractionStateMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnDriverDistraction::~OnDriverDistraction(void)
-{
-}
-
-
-OnDriverDistraction::OnDriverDistraction(const OnDriverDistraction& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool OnDriverDistraction::checkIntegrity(void)
-{
-  return OnDriverDistractionMarshaller::checkIntegrity(*this);
-}
-
-
-OnDriverDistraction::OnDriverDistraction(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnDriverDistraction::set_state(const DriverDistractionState& state_)
-{
-  if(!DriverDistractionStateMarshaller::checkIntegrityConst(state_))   return false;
-  state=state_;
-  return true;
-}
-
-
-
-
-const DriverDistractionState& OnDriverDistraction::get_state(void) const 
-{
-  return state;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.cpp
deleted file mode 100644
index bc70d7ab4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h"
-#include "DriverDistractionStateMarshaller.h"
-
-#include "OnDriverDistractionMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnDriverDistractionMarshaller::checkIntegrity(OnDriverDistraction& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnDriverDistractionMarshaller::fromString(const std::string& s,OnDriverDistraction& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnDriverDistractionMarshaller::toString(const OnDriverDistraction& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnDriverDistractionMarshaller::checkIntegrityConst(const OnDriverDistraction& s)
-{
-  if(!DriverDistractionStateMarshaller::checkIntegrityConst(s.state))  return false;
-  return true;
-}
-
-Json::Value OnDriverDistractionMarshaller::toJSON(const OnDriverDistraction& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["state"]=DriverDistractionStateMarshaller::toJSON(e.state);
-
-  return json;
-}
-
-
-bool OnDriverDistractionMarshaller::fromJSON(const Json::Value& json,OnDriverDistraction& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("state"))  return false;
-    {
-      const Json::Value& j=json["state"];
-      if(!DriverDistractionStateMarshaller::fromJSON(j,c.state))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.h
deleted file mode 100644
index c5995e904..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONDRIVERDISTRACTIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONDRIVERDISTRACTIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct OnDriverDistractionMarshaller
-  {
-    static bool checkIntegrity(OnDriverDistraction& e);
-    static bool checkIntegrityConst(const OnDriverDistraction& e);
-  
-    static bool fromString(const std::string& s,OnDriverDistraction& e);
-    static const std::string toString(const OnDriverDistraction& e);
-  
-    static bool fromJSON(const Json::Value& s,OnDriverDistraction& e);
-    static Json::Value toJSON(const OnDriverDistraction& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPData.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPData.cpp
deleted file mode 100644
index fdecaad45..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPData.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h"
-#include "OnEncodedSyncPDataMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-OnEncodedSyncPData& OnEncodedSyncPData::operator =(const OnEncodedSyncPData& c)
-{
-  data= c.data;
-  URL= c.URL ? new std::string(c.URL[0]) : 0;
-  Timeout= c.Timeout ? new int(c.Timeout[0]) : 0;
-
-  return *this;
-}
-
-
-OnEncodedSyncPData::~OnEncodedSyncPData(void)
-{
-  if(URL)
-    delete URL;
-  if(Timeout)
-    delete Timeout;
-}
-
-
-OnEncodedSyncPData::OnEncodedSyncPData(const OnEncodedSyncPData& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool OnEncodedSyncPData::checkIntegrity(void)
-{
-  return OnEncodedSyncPDataMarshaller::checkIntegrity(*this);
-}
-
-
-OnEncodedSyncPData::OnEncodedSyncPData(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      URL(0),
-    Timeout(0)
-{
-}
-
-
-
-bool OnEncodedSyncPData::set_data(const std::vector<std::string>& data_)
-{
-  unsigned int i=data_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(data_[i].length()>10000)  return false;
-  }
-  data=data_;
-  return true;
-}
-
-bool OnEncodedSyncPData::set_URL(const std::string& URL_)
-{
-  if(URL_.length()>1000)  return false;
-  delete URL;
-  URL=0;
-
-  URL=new std::string(URL_);
-  return true;
-}
-
-void OnEncodedSyncPData::reset_URL(void)
-{
-  if(URL)
-    delete URL;
-  URL=0;
-}
-
-bool OnEncodedSyncPData::set_Timeout(int Timeout_)
-{
-  if(Timeout_>2000000000)  return false;
-  delete Timeout;
-  Timeout=0;
-
-  Timeout=new int(Timeout_);
-  return true;
-}
-
-void OnEncodedSyncPData::reset_Timeout(void)
-{
-  if(Timeout)
-    delete Timeout;
-  Timeout=0;
-}
-
-
-
-
-const std::vector<std::string>& OnEncodedSyncPData::get_data(void) const 
-{
-  return data;
-}
-
-const std::string* OnEncodedSyncPData::get_URL(void) const 
-{
-  return URL;
-}
-
-const int* OnEncodedSyncPData::get_Timeout(void) const 
-{
-  return Timeout;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.cpp
deleted file mode 100644
index 47003bc2d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h"
-
-
-#include "OnEncodedSyncPDataMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnEncodedSyncPDataMarshaller::checkIntegrity(OnEncodedSyncPData& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnEncodedSyncPDataMarshaller::fromString(const std::string& s,OnEncodedSyncPData& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnEncodedSyncPDataMarshaller::toString(const OnEncodedSyncPData& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnEncodedSyncPDataMarshaller::checkIntegrityConst(const OnEncodedSyncPData& s)
-{
-  {
-    unsigned int i=s.data.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.data[i].length()>10000)  return false;
-    }
-  }
-  if(s.URL && s.URL->length()>1000)  return false;
-  if(s.Timeout && *s.Timeout>2000000000)  return false;
-  if(s.Timeout && *s.Timeout<-2000000000)  return false;
-  return true;
-}
-
-Json::Value OnEncodedSyncPDataMarshaller::toJSON(const OnEncodedSyncPData& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["data"]=Json::Value(Json::arrayValue);
-  json["data"].resize(e.data.size());
-  for(unsigned int i=0;i<e.data.size();i++)
-    json["data"][i]=Json::Value(e.data[i]);
-
-  if(e.URL)
-    json["URL"]=Json::Value(*e.URL);
-
-  if(e.Timeout)
-    json["Timeout"]=Json::Value(*e.Timeout);
-
-  return json;
-}
-
-
-bool OnEncodedSyncPDataMarshaller::fromJSON(const Json::Value& json,OnEncodedSyncPData& c)
-{
-  if(c.URL)  delete c.URL;
-  c.URL=0;
-
-  if(c.Timeout)  delete c.Timeout;
-  c.Timeout=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("data"))  return false;
-    {
-      const Json::Value& j=json["data"];
-      if(!j.isArray())  return false;
-      c.data.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.data[i]=j[i].asString();
-    }
-    if(json.isMember("URL"))
-    {
-      const Json::Value& j=json["URL"];
-      if(!j.isString())  return false;
-      c.URL=new std::string(j.asString());
-    }
-    if(json.isMember("Timeout"))
-    {
-      const Json::Value& j=json["Timeout"];
-      if(!j.isInt())  return false;
-      c.Timeout=new int(j.asInt());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.h
deleted file mode 100644
index 34723a4be..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONENCODEDSYNCPDATAMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONENCODEDSYNCPDATAMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct OnEncodedSyncPDataMarshaller
-  {
-    static bool checkIntegrity(OnEncodedSyncPData& e);
-    static bool checkIntegrityConst(const OnEncodedSyncPData& e);
-  
-    static bool fromString(const std::string& s,OnEncodedSyncPData& e);
-    static const std::string toString(const OnEncodedSyncPData& e);
-  
-    static bool fromJSON(const Json::Value& s,OnEncodedSyncPData& e);
-    static Json::Value toJSON(const OnEncodedSyncPData& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatus.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatus.cpp
deleted file mode 100644
index 8179abc2d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatus.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h"
-#include "OnHMIStatusMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "AudioStreamingStateMarshaller.h"
-#include "HMILevelMarshaller.h"
-#include "SystemContextMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnHMIStatus::~OnHMIStatus(void)
-{
-}
-
-
-OnHMIStatus::OnHMIStatus(const OnHMIStatus& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool OnHMIStatus::checkIntegrity(void)
-{
-  return OnHMIStatusMarshaller::checkIntegrity(*this);
-}
-
-
-OnHMIStatus::OnHMIStatus(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnHMIStatus::set_hmiLevel(const HMILevel& hmiLevel_)
-{
-  if(!HMILevelMarshaller::checkIntegrityConst(hmiLevel_))   return false;
-  hmiLevel=hmiLevel_;
-  return true;
-}
-
-bool OnHMIStatus::set_audioStreamingState(const AudioStreamingState& audioStreamingState_)
-{
-  if(!AudioStreamingStateMarshaller::checkIntegrityConst(audioStreamingState_))   return false;
-  audioStreamingState=audioStreamingState_;
-  return true;
-}
-
-bool OnHMIStatus::set_systemContext(const SystemContext& systemContext_)
-{
-  if(!SystemContextMarshaller::checkIntegrityConst(systemContext_))   return false;
-  systemContext=systemContext_;
-  return true;
-}
-
-
-
-
-const HMILevel& OnHMIStatus::get_hmiLevel(void) const 
-{
-  return hmiLevel;
-}
-
-const AudioStreamingState& OnHMIStatus::get_audioStreamingState(void) const 
-{
-  return audioStreamingState;
-}
-
-const SystemContext& OnHMIStatus::get_systemContext(void) const 
-{
-  return systemContext;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.cpp
deleted file mode 100644
index 07a2ad937..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h"
-#include "AudioStreamingStateMarshaller.h"
-#include "HMILevelMarshaller.h"
-#include "SystemContextMarshaller.h"
-
-#include "OnHMIStatusMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnHMIStatusMarshaller::checkIntegrity(OnHMIStatus& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnHMIStatusMarshaller::fromString(const std::string& s,OnHMIStatus& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnHMIStatusMarshaller::toString(const OnHMIStatus& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnHMIStatusMarshaller::checkIntegrityConst(const OnHMIStatus& s)
-{
-  if(!HMILevelMarshaller::checkIntegrityConst(s.hmiLevel))  return false;
-  if(!AudioStreamingStateMarshaller::checkIntegrityConst(s.audioStreamingState))  return false;
-  if(!SystemContextMarshaller::checkIntegrityConst(s.systemContext))  return false;
-  return true;
-}
-
-Json::Value OnHMIStatusMarshaller::toJSON(const OnHMIStatus& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["hmiLevel"]=HMILevelMarshaller::toJSON(e.hmiLevel);
-
-  json["audioStreamingState"]=AudioStreamingStateMarshaller::toJSON(e.audioStreamingState);
-
-  json["systemContext"]=SystemContextMarshaller::toJSON(e.systemContext);
-
-  return json;
-}
-
-
-bool OnHMIStatusMarshaller::fromJSON(const Json::Value& json,OnHMIStatus& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("hmiLevel"))  return false;
-    {
-      const Json::Value& j=json["hmiLevel"];
-      if(!HMILevelMarshaller::fromJSON(j,c.hmiLevel))
-        return false;
-    }
-    if(!json.isMember("audioStreamingState"))  return false;
-    {
-      const Json::Value& j=json["audioStreamingState"];
-      if(!AudioStreamingStateMarshaller::fromJSON(j,c.audioStreamingState))
-        return false;
-    }
-    if(!json.isMember("systemContext"))  return false;
-    {
-      const Json::Value& j=json["systemContext"];
-      if(!SystemContextMarshaller::fromJSON(j,c.systemContext))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.h
deleted file mode 100644
index b174db1c4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONHMISTATUSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONHMISTATUSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct OnHMIStatusMarshaller
-  {
-    static bool checkIntegrity(OnHMIStatus& e);
-    static bool checkIntegrityConst(const OnHMIStatus& e);
-  
-    static bool fromString(const std::string& s,OnHMIStatus& e);
-    static const std::string toString(const OnHMIStatus& e);
-  
-    static bool fromJSON(const Json::Value& s,OnHMIStatus& e);
-    static Json::Value toJSON(const OnHMIStatus& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChange.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChange.cpp
deleted file mode 100644
index 4a13f9c15..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChange.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h"
-#include "OnLanguageChangeMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "LanguageMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnLanguageChange::~OnLanguageChange(void)
-{
-}
-
-
-OnLanguageChange::OnLanguageChange(const OnLanguageChange& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool OnLanguageChange::checkIntegrity(void)
-{
-  return OnLanguageChangeMarshaller::checkIntegrity(*this);
-}
-
-
-OnLanguageChange::OnLanguageChange(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnLanguageChange::set_language(const Language& language_)
-{
-  if(!LanguageMarshaller::checkIntegrityConst(language_))   return false;
-  language=language_;
-  return true;
-}
-
-bool OnLanguageChange::set_hmiDisplayLanguage(const Language& hmiDisplayLanguage_)
-{
-  if(!LanguageMarshaller::checkIntegrityConst(hmiDisplayLanguage_))   return false;
-  hmiDisplayLanguage=hmiDisplayLanguage_;
-  return true;
-}
-
-
-
-
-const Language& OnLanguageChange::get_language(void) const 
-{
-  return language;
-}
-
-const Language& OnLanguageChange::get_hmiDisplayLanguage(void) const 
-{
-  return hmiDisplayLanguage;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.cpp
deleted file mode 100644
index f75b7fef7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h"
-#include "LanguageMarshaller.h"
-
-#include "OnLanguageChangeMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnLanguageChangeMarshaller::checkIntegrity(OnLanguageChange& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnLanguageChangeMarshaller::fromString(const std::string& s,OnLanguageChange& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnLanguageChangeMarshaller::toString(const OnLanguageChange& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnLanguageChangeMarshaller::checkIntegrityConst(const OnLanguageChange& s)
-{
-  if(!LanguageMarshaller::checkIntegrityConst(s.language))  return false;
-  if(!LanguageMarshaller::checkIntegrityConst(s.hmiDisplayLanguage))  return false;
-  return true;
-}
-
-Json::Value OnLanguageChangeMarshaller::toJSON(const OnLanguageChange& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["language"]=LanguageMarshaller::toJSON(e.language);
-
-  json["hmiDisplayLanguage"]=LanguageMarshaller::toJSON(e.hmiDisplayLanguage);
-
-  return json;
-}
-
-
-bool OnLanguageChangeMarshaller::fromJSON(const Json::Value& json,OnLanguageChange& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("language"))  return false;
-    {
-      const Json::Value& j=json["language"];
-      if(!LanguageMarshaller::fromJSON(j,c.language))
-        return false;
-    }
-    if(!json.isMember("hmiDisplayLanguage"))  return false;
-    {
-      const Json::Value& j=json["hmiDisplayLanguage"];
-      if(!LanguageMarshaller::fromJSON(j,c.hmiDisplayLanguage))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.h
deleted file mode 100644
index 5b8d17f4c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONLANGUAGECHANGEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONLANGUAGECHANGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct OnLanguageChangeMarshaller
-  {
-    static bool checkIntegrity(OnLanguageChange& e);
-    static bool checkIntegrityConst(const OnLanguageChange& e);
-  
-    static bool fromString(const std::string& s,OnLanguageChange& e);
-    static const std::string toString(const OnLanguageChange& e);
-  
-    static bool fromJSON(const Json::Value& s,OnLanguageChange& e);
-    static Json::Value toJSON(const OnLanguageChange& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChange.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChange.cpp
deleted file mode 100644
index fbe8630d1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChange.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h"
-#include "OnPermissionsChangeMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "PermissionItemMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnPermissionsChange::~OnPermissionsChange(void)
-{
-}
-
-
-OnPermissionsChange::OnPermissionsChange(const OnPermissionsChange& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool OnPermissionsChange::checkIntegrity(void)
-{
-  return OnPermissionsChangeMarshaller::checkIntegrity(*this);
-}
-
-
-OnPermissionsChange::OnPermissionsChange(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnPermissionsChange::set_permissionItem(const std::vector<PermissionItem>& permissionItem_)
-{
-  unsigned int i=permissionItem_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!PermissionItemMarshaller::checkIntegrityConst(permissionItem_[i]))   return false;
-  }
-  permissionItem=permissionItem_;
-  return true;
-}
-
-
-
-
-const std::vector<PermissionItem>& OnPermissionsChange::get_permissionItem(void) const 
-{
-  return permissionItem;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.cpp
deleted file mode 100644
index a6b46460c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h"
-#include "PermissionItemMarshaller.h"
-
-#include "OnPermissionsChangeMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnPermissionsChangeMarshaller::checkIntegrity(OnPermissionsChange& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnPermissionsChangeMarshaller::fromString(const std::string& s,OnPermissionsChange& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnPermissionsChangeMarshaller::toString(const OnPermissionsChange& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnPermissionsChangeMarshaller::checkIntegrityConst(const OnPermissionsChange& s)
-{
-  {
-    unsigned int i=s.permissionItem.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!PermissionItemMarshaller::checkIntegrityConst(s.permissionItem[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value OnPermissionsChangeMarshaller::toJSON(const OnPermissionsChange& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["permissionItem"]=Json::Value(Json::arrayValue);
-  json["permissionItem"].resize(e.permissionItem.size());
-  for(unsigned int i=0;i<e.permissionItem.size();i++)
-    json["permissionItem"][i]=PermissionItemMarshaller::toJSON(e.permissionItem[i]);
-
-  return json;
-}
-
-
-bool OnPermissionsChangeMarshaller::fromJSON(const Json::Value& json,OnPermissionsChange& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("permissionItem"))  return false;
-    {
-      const Json::Value& j=json["permissionItem"];
-      if(!j.isArray())  return false;
-      c.permissionItem.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          PermissionItem t;
-          if(!PermissionItemMarshaller::fromJSON(j[i],t))
-            return false;
-          c.permissionItem[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.h
deleted file mode 100644
index cbe0e7097..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONPERMISSIONSCHANGEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONPERMISSIONSCHANGEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct OnPermissionsChangeMarshaller
-  {
-    static bool checkIntegrity(OnPermissionsChange& e);
-    static bool checkIntegrityConst(const OnPermissionsChange& e);
-  
-    static bool fromString(const std::string& s,OnPermissionsChange& e);
-    static const std::string toString(const OnPermissionsChange& e);
-  
-    static bool fromJSON(const Json::Value& s,OnPermissionsChange& e);
-    static Json::Value toJSON(const OnPermissionsChange& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientState.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientState.cpp
deleted file mode 100644
index 3976b2d43..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientState.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h"
-#include "OnTBTClientStateMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "TBTStateMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-OnTBTClientState::~OnTBTClientState(void)
-{
-}
-
-
-OnTBTClientState::OnTBTClientState(const OnTBTClientState& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool OnTBTClientState::checkIntegrity(void)
-{
-  return OnTBTClientStateMarshaller::checkIntegrity(*this);
-}
-
-
-OnTBTClientState::OnTBTClientState(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool OnTBTClientState::set_state(const TBTState& state_)
-{
-  if(!TBTStateMarshaller::checkIntegrityConst(state_))   return false;
-  state=state_;
-  return true;
-}
-
-
-
-
-const TBTState& OnTBTClientState::get_state(void) const 
-{
-  return state;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.cpp
deleted file mode 100644
index 54e22fab8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h"
-#include "TBTStateMarshaller.h"
-
-#include "OnTBTClientStateMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnTBTClientStateMarshaller::checkIntegrity(OnTBTClientState& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnTBTClientStateMarshaller::fromString(const std::string& s,OnTBTClientState& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnTBTClientStateMarshaller::toString(const OnTBTClientState& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnTBTClientStateMarshaller::checkIntegrityConst(const OnTBTClientState& s)
-{
-  if(!TBTStateMarshaller::checkIntegrityConst(s.state))  return false;
-  return true;
-}
-
-Json::Value OnTBTClientStateMarshaller::toJSON(const OnTBTClientState& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["state"]=TBTStateMarshaller::toJSON(e.state);
-
-  return json;
-}
-
-
-bool OnTBTClientStateMarshaller::fromJSON(const Json::Value& json,OnTBTClientState& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("state"))  return false;
-    {
-      const Json::Value& j=json["state"];
-      if(!TBTStateMarshaller::fromJSON(j,c.state))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.h
deleted file mode 100644
index 1e641003b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONTBTCLIENTSTATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONTBTCLIENTSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct OnTBTClientStateMarshaller
-  {
-    static bool checkIntegrity(OnTBTClientState& e);
-    static bool checkIntegrityConst(const OnTBTClientState& e);
-  
-    static bool fromString(const std::string& s,OnTBTClientState& e);
-    static const std::string toString(const OnTBTClientState& e);
-  
-    static bool fromJSON(const Json::Value& s,OnTBTClientState& e);
-    static Json::Value toJSON(const OnTBTClientState& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleData.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleData.cpp
deleted file mode 100644
index 366a92360..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleData.cpp
+++ /dev/null
@@ -1,534 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h"
-#include "OnVehicleDataMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "GPSDataMarshaller.h"
-#include "PRNDLMarshaller.h"
-#include "TireStatusMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-OnVehicleData& OnVehicleData::operator =(const OnVehicleData& c)
-{
-  gps= c.gps ? new GPSData(c.gps[0]) : 0;
-  speed= c.speed ? new float(c.speed[0]) : 0;
-  rpm= c.rpm ? new unsigned int(c.rpm[0]) : 0;
-  fuelLevel= c.fuelLevel ? new float(c.fuelLevel[0]) : 0;
-  avgFuelEconomy= c.avgFuelEconomy ? new float(c.avgFuelEconomy[0]) : 0;
-  batteryVoltage= c.batteryVoltage ? new float(c.batteryVoltage[0]) : 0;
-  externalTemperature= c.externalTemperature ? new float(c.externalTemperature[0]) : 0;
-  vin= c.vin ? new std::string(c.vin[0]) : 0;
-  prndl= c.prndl ? new PRNDL(c.prndl[0]) : 0;
-  tirePressure= c.tirePressure ? new TireStatus(c.tirePressure[0]) : 0;
-  batteryPackVoltage= c.batteryPackVoltage ? new float(c.batteryPackVoltage[0]) : 0;
-  batteryPackCurrent= c.batteryPackCurrent ? new float(c.batteryPackCurrent[0]) : 0;
-  batteryPackTemperature= c.batteryPackTemperature ? new int(c.batteryPackTemperature[0]) : 0;
-  engineTorque= c.engineTorque ? new int(c.engineTorque[0]) : 0;
-  odometer= c.odometer ? new unsigned int(c.odometer[0]) : 0;
-  tripOdometer= c.tripOdometer ? new unsigned int(c.tripOdometer[0]) : 0;
-  genericbinary= c.genericbinary ? new std::string(c.genericbinary[0]) : 0;
-
-  return *this;
-}
-
-
-OnVehicleData::~OnVehicleData(void)
-{
-  if(gps)
-    delete gps;
-  if(speed)
-    delete speed;
-  if(rpm)
-    delete rpm;
-  if(fuelLevel)
-    delete fuelLevel;
-  if(avgFuelEconomy)
-    delete avgFuelEconomy;
-  if(batteryVoltage)
-    delete batteryVoltage;
-  if(externalTemperature)
-    delete externalTemperature;
-  if(vin)
-    delete vin;
-  if(prndl)
-    delete prndl;
-  if(tirePressure)
-    delete tirePressure;
-  if(batteryPackVoltage)
-    delete batteryPackVoltage;
-  if(batteryPackCurrent)
-    delete batteryPackCurrent;
-  if(batteryPackTemperature)
-    delete batteryPackTemperature;
-  if(engineTorque)
-    delete engineTorque;
-  if(odometer)
-    delete odometer;
-  if(tripOdometer)
-    delete tripOdometer;
-  if(genericbinary)
-    delete genericbinary;
-}
-
-
-OnVehicleData::OnVehicleData(const OnVehicleData& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool OnVehicleData::checkIntegrity(void)
-{
-  return OnVehicleDataMarshaller::checkIntegrity(*this);
-}
-
-
-OnVehicleData::OnVehicleData(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      gps(0),
-    speed(0),
-    rpm(0),
-    fuelLevel(0),
-    avgFuelEconomy(0),
-    batteryVoltage(0),
-    externalTemperature(0),
-    vin(0),
-    prndl(0),
-    tirePressure(0),
-    batteryPackVoltage(0),
-    batteryPackCurrent(0),
-    batteryPackTemperature(0),
-    engineTorque(0),
-    odometer(0),
-    tripOdometer(0),
-    genericbinary(0)
-{
-}
-
-
-
-bool OnVehicleData::set_gps(const GPSData& gps_)
-{
-  if(!GPSDataMarshaller::checkIntegrityConst(gps_))   return false;
-  delete gps;
-  gps=0;
-
-  gps=new GPSData(gps_);
-  return true;
-}
-
-void OnVehicleData::reset_gps(void)
-{
-  if(gps)
-    delete gps;
-  gps=0;
-}
-
-bool OnVehicleData::set_speed(float speed_)
-{
-  if(speed_>500)  return false;
-  if(speed_<-100)  return false;
-  delete speed;
-  speed=0;
-
-  speed=new float(speed_);
-  return true;
-}
-
-void OnVehicleData::reset_speed(void)
-{
-  if(speed)
-    delete speed;
-  speed=0;
-}
-
-bool OnVehicleData::set_rpm(unsigned int rpm_)
-{
-  if(rpm_>20000)  return false;
-  delete rpm;
-  rpm=0;
-
-  rpm=new unsigned int(rpm_);
-  return true;
-}
-
-void OnVehicleData::reset_rpm(void)
-{
-  if(rpm)
-    delete rpm;
-  rpm=0;
-}
-
-bool OnVehicleData::set_fuelLevel(float fuelLevel_)
-{
-  if(fuelLevel_>100)  return false;
-  if(fuelLevel_<0)  return false;
-  delete fuelLevel;
-  fuelLevel=0;
-
-  fuelLevel=new float(fuelLevel_);
-  return true;
-}
-
-void OnVehicleData::reset_fuelLevel(void)
-{
-  if(fuelLevel)
-    delete fuelLevel;
-  fuelLevel=0;
-}
-
-bool OnVehicleData::set_avgFuelEconomy(float avgFuelEconomy_)
-{
-  if(avgFuelEconomy_>7000)  return false;
-  if(avgFuelEconomy_<0)  return false;
-  delete avgFuelEconomy;
-  avgFuelEconomy=0;
-
-  avgFuelEconomy=new float(avgFuelEconomy_);
-  return true;
-}
-
-void OnVehicleData::reset_avgFuelEconomy(void)
-{
-  if(avgFuelEconomy)
-    delete avgFuelEconomy;
-  avgFuelEconomy=0;
-}
-
-bool OnVehicleData::set_batteryVoltage(float batteryVoltage_)
-{
-  if(batteryVoltage_>26)  return false;
-  if(batteryVoltage_<0)  return false;
-  delete batteryVoltage;
-  batteryVoltage=0;
-
-  batteryVoltage=new float(batteryVoltage_);
-  return true;
-}
-
-void OnVehicleData::reset_batteryVoltage(void)
-{
-  if(batteryVoltage)
-    delete batteryVoltage;
-  batteryVoltage=0;
-}
-
-bool OnVehicleData::set_externalTemperature(float externalTemperature_)
-{
-  if(externalTemperature_>100)  return false;
-  if(externalTemperature_<-40)  return false;
-  delete externalTemperature;
-  externalTemperature=0;
-
-  externalTemperature=new float(externalTemperature_);
-  return true;
-}
-
-void OnVehicleData::reset_externalTemperature(void)
-{
-  if(externalTemperature)
-    delete externalTemperature;
-  externalTemperature=0;
-}
-
-bool OnVehicleData::set_vin(const std::string& vin_)
-{
-  if(vin_.length()>17)  return false;
-  delete vin;
-  vin=0;
-
-  vin=new std::string(vin_);
-  return true;
-}
-
-void OnVehicleData::reset_vin(void)
-{
-  if(vin)
-    delete vin;
-  vin=0;
-}
-
-bool OnVehicleData::set_prndl(const PRNDL& prndl_)
-{
-  if(!PRNDLMarshaller::checkIntegrityConst(prndl_))   return false;
-  delete prndl;
-  prndl=0;
-
-  prndl=new PRNDL(prndl_);
-  return true;
-}
-
-void OnVehicleData::reset_prndl(void)
-{
-  if(prndl)
-    delete prndl;
-  prndl=0;
-}
-
-bool OnVehicleData::set_tirePressure(const TireStatus& tirePressure_)
-{
-  if(!TireStatusMarshaller::checkIntegrityConst(tirePressure_))   return false;
-  delete tirePressure;
-  tirePressure=0;
-
-  tirePressure=new TireStatus(tirePressure_);
-  return true;
-}
-
-void OnVehicleData::reset_tirePressure(void)
-{
-  if(tirePressure)
-    delete tirePressure;
-  tirePressure=0;
-}
-
-bool OnVehicleData::set_batteryPackVoltage(float batteryPackVoltage_)
-{
-  if(batteryPackVoltage_>1000)  return false;
-  if(batteryPackVoltage_<-1000)  return false;
-  delete batteryPackVoltage;
-  batteryPackVoltage=0;
-
-  batteryPackVoltage=new float(batteryPackVoltage_);
-  return true;
-}
-
-void OnVehicleData::reset_batteryPackVoltage(void)
-{
-  if(batteryPackVoltage)
-    delete batteryPackVoltage;
-  batteryPackVoltage=0;
-}
-
-bool OnVehicleData::set_batteryPackCurrent(float batteryPackCurrent_)
-{
-  if(batteryPackCurrent_>1000)  return false;
-  if(batteryPackCurrent_<-1000)  return false;
-  delete batteryPackCurrent;
-  batteryPackCurrent=0;
-
-  batteryPackCurrent=new float(batteryPackCurrent_);
-  return true;
-}
-
-void OnVehicleData::reset_batteryPackCurrent(void)
-{
-  if(batteryPackCurrent)
-    delete batteryPackCurrent;
-  batteryPackCurrent=0;
-}
-
-bool OnVehicleData::set_batteryPackTemperature(int batteryPackTemperature_)
-{
-  if(batteryPackTemperature_>250)  return false;
-  delete batteryPackTemperature;
-  batteryPackTemperature=0;
-
-  batteryPackTemperature=new int(batteryPackTemperature_);
-  return true;
-}
-
-void OnVehicleData::reset_batteryPackTemperature(void)
-{
-  if(batteryPackTemperature)
-    delete batteryPackTemperature;
-  batteryPackTemperature=0;
-}
-
-bool OnVehicleData::set_engineTorque(int engineTorque_)
-{
-  if(engineTorque_>55000)  return false;
-  delete engineTorque;
-  engineTorque=0;
-
-  engineTorque=new int(engineTorque_);
-  return true;
-}
-
-void OnVehicleData::reset_engineTorque(void)
-{
-  if(engineTorque)
-    delete engineTorque;
-  engineTorque=0;
-}
-
-bool OnVehicleData::set_odometer(unsigned int odometer_)
-{
-  if(odometer_>2000000)  return false;
-  delete odometer;
-  odometer=0;
-
-  odometer=new unsigned int(odometer_);
-  return true;
-}
-
-void OnVehicleData::reset_odometer(void)
-{
-  if(odometer)
-    delete odometer;
-  odometer=0;
-}
-
-bool OnVehicleData::set_tripOdometer(unsigned int tripOdometer_)
-{
-  if(tripOdometer_>2000000)  return false;
-  delete tripOdometer;
-  tripOdometer=0;
-
-  tripOdometer=new unsigned int(tripOdometer_);
-  return true;
-}
-
-void OnVehicleData::reset_tripOdometer(void)
-{
-  if(tripOdometer)
-    delete tripOdometer;
-  tripOdometer=0;
-}
-
-bool OnVehicleData::set_genericbinary(const std::string& genericbinary_)
-{
-  if(genericbinary_.length()>500)  return false;
-  delete genericbinary;
-  genericbinary=0;
-
-  genericbinary=new std::string(genericbinary_);
-  return true;
-}
-
-void OnVehicleData::reset_genericbinary(void)
-{
-  if(genericbinary)
-    delete genericbinary;
-  genericbinary=0;
-}
-
-
-
-
-const GPSData* OnVehicleData::get_gps(void) const 
-{
-  return gps;
-}
-
-const float* OnVehicleData::get_speed(void) const 
-{
-  return speed;
-}
-
-const unsigned int* OnVehicleData::get_rpm(void) const 
-{
-  return rpm;
-}
-
-const float* OnVehicleData::get_fuelLevel(void) const 
-{
-  return fuelLevel;
-}
-
-const float* OnVehicleData::get_avgFuelEconomy(void) const 
-{
-  return avgFuelEconomy;
-}
-
-const float* OnVehicleData::get_batteryVoltage(void) const 
-{
-  return batteryVoltage;
-}
-
-const float* OnVehicleData::get_externalTemperature(void) const 
-{
-  return externalTemperature;
-}
-
-const std::string* OnVehicleData::get_vin(void) const 
-{
-  return vin;
-}
-
-const PRNDL* OnVehicleData::get_prndl(void) const 
-{
-  return prndl;
-}
-
-const TireStatus* OnVehicleData::get_tirePressure(void) const 
-{
-  return tirePressure;
-}
-
-const float* OnVehicleData::get_batteryPackVoltage(void) const 
-{
-  return batteryPackVoltage;
-}
-
-const float* OnVehicleData::get_batteryPackCurrent(void) const 
-{
-  return batteryPackCurrent;
-}
-
-const int* OnVehicleData::get_batteryPackTemperature(void) const 
-{
-  return batteryPackTemperature;
-}
-
-const int* OnVehicleData::get_engineTorque(void) const 
-{
-  return engineTorque;
-}
-
-const unsigned int* OnVehicleData::get_odometer(void) const 
-{
-  return odometer;
-}
-
-const unsigned int* OnVehicleData::get_tripOdometer(void) const 
-{
-  return tripOdometer;
-}
-
-const std::string* OnVehicleData::get_genericbinary(void) const 
-{
-  return genericbinary;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.cpp
deleted file mode 100644
index ab52df37e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h"
-#include "GPSDataMarshaller.h"
-#include "PRNDLMarshaller.h"
-#include "TireStatusMarshaller.h"
-
-#include "OnVehicleDataMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool OnVehicleDataMarshaller::checkIntegrity(OnVehicleData& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool OnVehicleDataMarshaller::fromString(const std::string& s,OnVehicleData& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string OnVehicleDataMarshaller::toString(const OnVehicleData& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool OnVehicleDataMarshaller::checkIntegrityConst(const OnVehicleData& s)
-{
-  if(s.gps && !GPSDataMarshaller::checkIntegrityConst(*s.gps))  return false;
-  if(s.speed && *s.speed>500)  return false;
-  if(s.speed && *s.speed<-100)  return false;
-  if(s.rpm && *s.rpm>20000)  return false;
-  if(s.fuelLevel && *s.fuelLevel>100)  return false;
-  if(s.fuelLevel && *s.fuelLevel<0)  return false;
-  if(s.avgFuelEconomy && *s.avgFuelEconomy>7000)  return false;
-  if(s.avgFuelEconomy && *s.avgFuelEconomy<0)  return false;
-  if(s.batteryVoltage && *s.batteryVoltage>26)  return false;
-  if(s.batteryVoltage && *s.batteryVoltage<0)  return false;
-  if(s.externalTemperature && *s.externalTemperature>100)  return false;
-  if(s.externalTemperature && *s.externalTemperature<-40)  return false;
-  if(s.vin && s.vin->length()>17)  return false;
-  if(s.prndl && !PRNDLMarshaller::checkIntegrityConst(*s.prndl))  return false;
-  if(s.tirePressure && !TireStatusMarshaller::checkIntegrityConst(*s.tirePressure))  return false;
-  if(s.batteryPackVoltage && *s.batteryPackVoltage>1000)  return false;
-  if(s.batteryPackVoltage && *s.batteryPackVoltage<-1000)  return false;
-  if(s.batteryPackCurrent && *s.batteryPackCurrent>1000)  return false;
-  if(s.batteryPackCurrent && *s.batteryPackCurrent<-1000)  return false;
-  if(s.batteryPackTemperature && *s.batteryPackTemperature>250)  return false;
-  if(s.batteryPackTemperature && *s.batteryPackTemperature<-50)  return false;
-  if(s.engineTorque && *s.engineTorque>55000)  return false;
-  if(s.engineTorque && *s.engineTorque<-10000)  return false;
-  if(s.odometer && *s.odometer>2000000)  return false;
-  if(s.tripOdometer && *s.tripOdometer>2000000)  return false;
-  if(s.genericbinary && s.genericbinary->length()>500)  return false;
-  return true;
-}
-
-Json::Value OnVehicleDataMarshaller::toJSON(const OnVehicleData& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  if(e.gps)
-    json["gps"]=GPSDataMarshaller::toJSON(*e.gps);
-
-  if(e.speed)
-    json["speed"]=Json::Value(*e.speed);
-
-  if(e.rpm)
-    json["rpm"]=Json::Value(*e.rpm);
-
-  if(e.fuelLevel)
-    json["fuelLevel"]=Json::Value(*e.fuelLevel);
-
-  if(e.avgFuelEconomy)
-    json["avgFuelEconomy"]=Json::Value(*e.avgFuelEconomy);
-
-  if(e.batteryVoltage)
-    json["batteryVoltage"]=Json::Value(*e.batteryVoltage);
-
-  if(e.externalTemperature)
-    json["externalTemperature"]=Json::Value(*e.externalTemperature);
-
-  if(e.vin)
-    json["vin"]=Json::Value(*e.vin);
-
-  if(e.prndl)
-    json["prndl"]=PRNDLMarshaller::toJSON(*e.prndl);
-
-  if(e.tirePressure)
-    json["tirePressure"]=TireStatusMarshaller::toJSON(*e.tirePressure);
-
-  if(e.batteryPackVoltage)
-    json["batteryPackVoltage"]=Json::Value(*e.batteryPackVoltage);
-
-  if(e.batteryPackCurrent)
-    json["batteryPackCurrent"]=Json::Value(*e.batteryPackCurrent);
-
-  if(e.batteryPackTemperature)
-    json["batteryPackTemperature"]=Json::Value(*e.batteryPackTemperature);
-
-  if(e.engineTorque)
-    json["engineTorque"]=Json::Value(*e.engineTorque);
-
-  if(e.odometer)
-    json["odometer"]=Json::Value(*e.odometer);
-
-  if(e.tripOdometer)
-    json["tripOdometer"]=Json::Value(*e.tripOdometer);
-
-  if(e.genericbinary)
-    json["genericbinary"]=Json::Value(*e.genericbinary);
-
-  return json;
-}
-
-
-bool OnVehicleDataMarshaller::fromJSON(const Json::Value& json,OnVehicleData& c)
-{
-  if(c.gps)  delete c.gps;
-  c.gps=0;
-
-  if(c.speed)  delete c.speed;
-  c.speed=0;
-
-  if(c.rpm)  delete c.rpm;
-  c.rpm=0;
-
-  if(c.fuelLevel)  delete c.fuelLevel;
-  c.fuelLevel=0;
-
-  if(c.avgFuelEconomy)  delete c.avgFuelEconomy;
-  c.avgFuelEconomy=0;
-
-  if(c.batteryVoltage)  delete c.batteryVoltage;
-  c.batteryVoltage=0;
-
-  if(c.externalTemperature)  delete c.externalTemperature;
-  c.externalTemperature=0;
-
-  if(c.vin)  delete c.vin;
-  c.vin=0;
-
-  if(c.prndl)  delete c.prndl;
-  c.prndl=0;
-
-  if(c.tirePressure)  delete c.tirePressure;
-  c.tirePressure=0;
-
-  if(c.batteryPackVoltage)  delete c.batteryPackVoltage;
-  c.batteryPackVoltage=0;
-
-  if(c.batteryPackCurrent)  delete c.batteryPackCurrent;
-  c.batteryPackCurrent=0;
-
-  if(c.batteryPackTemperature)  delete c.batteryPackTemperature;
-  c.batteryPackTemperature=0;
-
-  if(c.engineTorque)  delete c.engineTorque;
-  c.engineTorque=0;
-
-  if(c.odometer)  delete c.odometer;
-  c.odometer=0;
-
-  if(c.tripOdometer)  delete c.tripOdometer;
-  c.tripOdometer=0;
-
-  if(c.genericbinary)  delete c.genericbinary;
-  c.genericbinary=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(json.isMember("gps"))
-    {
-      const Json::Value& j=json["gps"];
-      c.gps=new GPSData();
-      if(!GPSDataMarshaller::fromJSON(j,c.gps[0]))
-        return false;
-    }
-    if(json.isMember("speed"))
-    {
-      const Json::Value& j=json["speed"];
-      if(!j.isNumeric())  return false;
-      c.speed=new float(j.asDouble());
-    }
-    if(json.isMember("rpm"))
-    {
-      const Json::Value& j=json["rpm"];
-      if(!j.isInt())  return false;
-      c.rpm=new unsigned int(j.asInt());
-    }
-    if(json.isMember("fuelLevel"))
-    {
-      const Json::Value& j=json["fuelLevel"];
-      if(!j.isNumeric())  return false;
-      c.fuelLevel=new float(j.asDouble());
-    }
-    if(json.isMember("avgFuelEconomy"))
-    {
-      const Json::Value& j=json["avgFuelEconomy"];
-      if(!j.isNumeric())  return false;
-      c.avgFuelEconomy=new float(j.asDouble());
-    }
-    if(json.isMember("batteryVoltage"))
-    {
-      const Json::Value& j=json["batteryVoltage"];
-      if(!j.isNumeric())  return false;
-      c.batteryVoltage=new float(j.asDouble());
-    }
-    if(json.isMember("externalTemperature"))
-    {
-      const Json::Value& j=json["externalTemperature"];
-      if(!j.isNumeric())  return false;
-      c.externalTemperature=new float(j.asDouble());
-    }
-    if(json.isMember("vin"))
-    {
-      const Json::Value& j=json["vin"];
-      if(!j.isString())  return false;
-      c.vin=new std::string(j.asString());
-    }
-    if(json.isMember("prndl"))
-    {
-      const Json::Value& j=json["prndl"];
-      c.prndl=new PRNDL();
-      if(!PRNDLMarshaller::fromJSON(j,c.prndl[0]))
-        return false;
-    }
-    if(json.isMember("tirePressure"))
-    {
-      const Json::Value& j=json["tirePressure"];
-      c.tirePressure=new TireStatus();
-      if(!TireStatusMarshaller::fromJSON(j,c.tirePressure[0]))
-        return false;
-    }
-    if(json.isMember("batteryPackVoltage"))
-    {
-      const Json::Value& j=json["batteryPackVoltage"];
-      if(!j.isNumeric())  return false;
-      c.batteryPackVoltage=new float(j.asDouble());
-    }
-    if(json.isMember("batteryPackCurrent"))
-    {
-      const Json::Value& j=json["batteryPackCurrent"];
-      if(!j.isNumeric())  return false;
-      c.batteryPackCurrent=new float(j.asDouble());
-    }
-    if(json.isMember("batteryPackTemperature"))
-    {
-      const Json::Value& j=json["batteryPackTemperature"];
-      if(!j.isInt())  return false;
-      c.batteryPackTemperature=new int(j.asInt());
-    }
-    if(json.isMember("engineTorque"))
-    {
-      const Json::Value& j=json["engineTorque"];
-      if(!j.isInt())  return false;
-      c.engineTorque=new int(j.asInt());
-    }
-    if(json.isMember("odometer"))
-    {
-      const Json::Value& j=json["odometer"];
-      if(!j.isInt())  return false;
-      c.odometer=new unsigned int(j.asInt());
-    }
-    if(json.isMember("tripOdometer"))
-    {
-      const Json::Value& j=json["tripOdometer"];
-      if(!j.isInt())  return false;
-      c.tripOdometer=new unsigned int(j.asInt());
-    }
-    if(json.isMember("genericbinary"))
-    {
-      const Json::Value& j=json["genericbinary"];
-      if(!j.isString())  return false;
-      c.genericbinary=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.h
deleted file mode 100644
index 4e7f966da..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_ONVEHICLEDATAMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_ONVEHICLEDATAMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct OnVehicleDataMarshaller
-  {
-    static bool checkIntegrity(OnVehicleData& e);
-    static bool checkIntegrityConst(const OnVehicleData& e);
-  
-    static bool fromString(const std::string& s,OnVehicleData& e);
-    static const std::string toString(const OnVehicleData& e);
-  
-    static bool fromJSON(const Json::Value& s,OnVehicleData& e);
-    static Json::Value toJSON(const OnVehicleData& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.cpp
deleted file mode 100644
index 23e857b97..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/PRNDL.h"
-#include "PRNDLMarshaller.h"
-#include "PRNDLMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const PRNDL::PRNDLInternal PRNDLMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return PRNDL::INVALID_ENUM;
-  const struct PerfectHashTable* p=PRNDL_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<PRNDL::PRNDLInternal>(p->idx) : PRNDL::INVALID_ENUM;
-}
-
-
-bool PRNDLMarshaller::fromJSON(const Json::Value& s,PRNDL& e)
-{
-  e.mInternal=PRNDL::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=PRNDL::INVALID_ENUM);
-}
-
-
-Json::Value PRNDLMarshaller::toJSON(const PRNDL& e)
-{
-  if(e.mInternal==PRNDL::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool PRNDLMarshaller::fromString(const std::string& s,PRNDL& e)
-{
-  e.mInternal=PRNDL::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string PRNDLMarshaller::toString(const PRNDL& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==PRNDL::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable PRNDLMarshaller::mHashTable[14]=
-{
-  {"PARK",0},
-  {"REVERSE",1},
-  {"NEUTRAL",2},
-  {"LOWGEAR",3},
-  {"FORWARD_DRIVE_2",4},
-  {"FORWARD_DRIVE_3",5},
-  {"FORWARD_DRIVE_4",6},
-  {"FORWARD_DRIVE_5",7},
-  {"FORWARD_DRIVE_6",8},
-  {"SECOND_GEAR_HOLD",9},
-  {"THIRD_GEAR_HOLD",10},
-  {"FOURTH_GEAR_HOLD",11},
-  {"FIFTH_GEAR_HOLD",12},
-  {"SIXTH_GEAR_HOLD",13}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp
deleted file mode 100644
index c57a7e56a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp
+++ /dev/null
@@ -1,30 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name PRNDL_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-PARK,0
-REVERSE,1
-NEUTRAL,2
-LOWGEAR,3
-FORWARD_DRIVE_2,4
-FORWARD_DRIVE_3,5
-FORWARD_DRIVE_4,6
-FORWARD_DRIVE_5,7
-FORWARD_DRIVE_6,8
-SECOND_GEAR_HOLD,9
-THIRD_GEAR_HOLD,10
-FOURTH_GEAR_HOLD,11
-FIFTH_GEAR_HOLD,12
-SIXTH_GEAR_HOLD,13
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.h
deleted file mode 100644
index 46422b4d1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PRNDLMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PRNDLMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PRNDL.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for PRNDL
-
-  class PRNDLMarshaller
-  {
-  public:
-  
-    static std::string toName(const PRNDL& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(PRNDL& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=PRNDL::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(PRNDL& e)		{ return e.mInternal!=PRNDL::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const PRNDL& e)	{ return e.mInternal!=PRNDL::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,PRNDL& e);
-    static const std::string toString(const PRNDL& e);
-  
-    static bool fromJSON(const Json::Value& s,PRNDL& e);
-    static Json::Value toJSON(const PRNDL& e);
-  
-    static const char* getName(PRNDL::PRNDLInternal e)
-    {
-       return (e>=0 && e<14) ? mHashTable[e].name : NULL;
-    }
-  
-    static const PRNDL::PRNDLInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[14];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.inc
deleted file mode 100644
index 835205540..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.inc
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp  */
-/* Computed positions: -k'1,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 14
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 16
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 35
-/* maximum key range = 32, duplicates = 0 */
-
-class PRNDL_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-PRNDL_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      14,  9,  4, 15, 10, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36,  0, 10,
-       5, 36, 36, 36, 36,  0,  0, 36,  5, 36,
-       0, 36,  0,  0, 10, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-      36, 36, 36, 36, 36, 36
-    };
-  return len + asso_values[(unsigned char)str[len - 1]] + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-PRNDL_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  0,  0,  7,  0,  0,  0,  0,  7,  0,
-       0, 15, 16,  7,  0,  0, 15, 16,  0,  0, 15, 15,  0,  0,
-       0, 15, 15,  0,  0,  0, 15, 15
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"PARK",0},
-      {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"LOWGEAR",3},
-      {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"NEUTRAL",2},
-      {""}, {""},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"SIXTH_GEAR_HOLD",13},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"SECOND_GEAR_HOLD",9},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"REVERSE",1},
-      {""}, {""},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"FIFTH_GEAR_HOLD",12},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"FOURTH_GEAR_HOLD",11},
-      {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"FORWARD_DRIVE_4",6},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"THIRD_GEAR_HOLD",10},
-      {""}, {""}, {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"FORWARD_DRIVE_3",5},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"FORWARD_DRIVE_6",8},
-      {""}, {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"FORWARD_DRIVE_2",4},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PRNDLMarshaller.gp"
-      {"FORWARD_DRIVE_5",7}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissions.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissions.cpp
deleted file mode 100644
index e3597d369..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissions.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ParameterPermissions.h"
-#include "ParameterPermissionsMarshaller.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-ParameterPermissions::ParameterPermissions(const ParameterPermissions& c)
-{
-  *this=c;
-}
-
-
-bool ParameterPermissions::checkIntegrity(void)
-{
-  return ParameterPermissionsMarshaller::checkIntegrity(*this);
-}
-
-
-ParameterPermissions::ParameterPermissions(void)
-{
-}
-
-
-
-bool ParameterPermissions::set_allowed(const std::vector<std::string>& allowed_)
-{
-  unsigned int i=allowed_.size();
-  if(i>100 || i<0)  return false;
-  while(i--)
-  {
-    if(allowed_[i].length()>100)  return false;
-  }
-  allowed=allowed_;
-  return true;
-}
-
-bool ParameterPermissions::set_userDisallowed(const std::vector<std::string>& userDisallowed_)
-{
-  unsigned int i=userDisallowed_.size();
-  if(i>100 || i<0)  return false;
-  while(i--)
-  {
-  }
-  userDisallowed=userDisallowed_;
-  return true;
-}
-
-
-
-
-const std::vector<std::string>& ParameterPermissions::get_allowed(void) const 
-{
-  return allowed;
-}
-
-
-const std::vector<std::string>& ParameterPermissions::get_userDisallowed(void) const 
-{
-  return userDisallowed;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.cpp
deleted file mode 100644
index f0d40f309..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ParameterPermissions.h"
-
-
-#include "ParameterPermissionsMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ParameterPermissionsMarshaller::checkIntegrity(ParameterPermissions& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ParameterPermissionsMarshaller::fromString(const std::string& s,ParameterPermissions& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ParameterPermissionsMarshaller::toString(const ParameterPermissions& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ParameterPermissionsMarshaller::checkIntegrityConst(const ParameterPermissions& s)
-{
-  {
-    unsigned int i=s.allowed.size();
-    if(i>100 || i<0)  return false;
-    while(i--)
-    {
-      if(s.allowed[i].length()>100)  return false;
-    }
-  }
-  {
-    unsigned int i=s.userDisallowed.size();
-    if(i>100 || i<0)  return false;
-    while(i--)
-    {
-    }
-  }
-  return true;
-}
-
-Json::Value ParameterPermissionsMarshaller::toJSON(const ParameterPermissions& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["allowed"]=Json::Value(Json::arrayValue);
-  json["allowed"].resize(e.allowed.size());
-  for(unsigned int i=0;i<e.allowed.size();i++)
-    json["allowed"][i]=Json::Value(e.allowed[i]);
-
-  json["userDisallowed"]=Json::Value(Json::arrayValue);
-  json["userDisallowed"].resize(e.userDisallowed.size());
-  for(unsigned int i=0;i<e.userDisallowed.size();i++)
-    json["userDisallowed"][i]=Json::Value(e.userDisallowed[i]);
-
-
-  return json;
-}
-
-
-bool ParameterPermissionsMarshaller::fromJSON(const Json::Value& json,ParameterPermissions& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("allowed"))  return false;
-    {
-      const Json::Value& j=json["allowed"];
-      if(!j.isArray())  return false;
-      c.allowed.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.allowed[i]=j[i].asString();
-    }
-    if(!json.isMember("userDisallowed"))  return false;
-    {
-      const Json::Value& j=json["userDisallowed"];
-      if(!j.isArray())  return false;
-      c.userDisallowed.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.userDisallowed[i]=j[i].asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.h
deleted file mode 100644
index 78a017cfe..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ParameterPermissionsMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PARAMETERPERMISSIONSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PARAMETERPERMISSIONSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ParameterPermissions.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ParameterPermissionsMarshaller
-  {
-    static bool checkIntegrity(ParameterPermissions& e);
-    static bool checkIntegrityConst(const ParameterPermissions& e);
-  
-    static bool fromString(const std::string& s,ParameterPermissions& e);
-    static const std::string toString(const ParameterPermissions& e);
-  
-    static bool fromJSON(const Json::Value& s,ParameterPermissions& e);
-    static Json::Value toJSON(const ParameterPermissions& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerfectHashTable.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerfectHashTable.h
deleted file mode 100644
index e62b1404a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerfectHashTable.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef PERFECTHASHTABLE_INCLUDE
-#define PERFECTHASHTABLE_INCLUDE
-
-namespace NsSmartDeviceLinkRPCV2
-{
-  struct PerfectHashTable
-  {
-    const char *name;
-    unsigned int idx;
-  };
-}
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_request.cpp
deleted file mode 100644
index bb53486ce..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_request.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h"
-#include "PerformAudioPassThru_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "AudioCaptureQualityMarshaller.h"
-#include "AudioTypeMarshaller.h"
-#include "SamplingRateMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-PerformAudioPassThru_request& PerformAudioPassThru_request::operator =(const PerformAudioPassThru_request& c)
-{
-  initialPrompt= c.initialPrompt;
-  audioPassThruDisplayText1= c.audioPassThruDisplayText1 ? new std::string(c.audioPassThruDisplayText1[0]) : 0;
-  audioPassThruDisplayText2= c.audioPassThruDisplayText2 ? new std::string(c.audioPassThruDisplayText2[0]) : 0;
-  samplingRate= c.samplingRate;
-  maxDuration= c.maxDuration;
-  bitsPerSample= c.bitsPerSample;
-  audioType= c.audioType;
-
-  return *this;
-}
-
-
-PerformAudioPassThru_request::~PerformAudioPassThru_request(void)
-{
-  if(audioPassThruDisplayText1)
-    delete audioPassThruDisplayText1;
-  if(audioPassThruDisplayText2)
-    delete audioPassThruDisplayText2;
-}
-
-
-PerformAudioPassThru_request::PerformAudioPassThru_request(const PerformAudioPassThru_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool PerformAudioPassThru_request::checkIntegrity(void)
-{
-  return PerformAudioPassThru_requestMarshaller::checkIntegrity(*this);
-}
-
-
-PerformAudioPassThru_request::PerformAudioPassThru_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      audioPassThruDisplayText1(0),
-    audioPassThruDisplayText2(0)
-{
-}
-
-
-
-bool PerformAudioPassThru_request::set_initialPrompt(const std::vector<TTSChunk>& initialPrompt_)
-{
-  unsigned int i=initialPrompt_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(initialPrompt_[i]))   return false;
-  }
-  initialPrompt=initialPrompt_;
-  return true;
-}
-
-bool PerformAudioPassThru_request::set_audioPassThruDisplayText1(const std::string& audioPassThruDisplayText1_)
-{
-  if(audioPassThruDisplayText1_.length()>500)  return false;
-  delete audioPassThruDisplayText1;
-  audioPassThruDisplayText1=0;
-
-  audioPassThruDisplayText1=new std::string(audioPassThruDisplayText1_);
-  return true;
-}
-
-void PerformAudioPassThru_request::reset_audioPassThruDisplayText1(void)
-{
-  if(audioPassThruDisplayText1)
-    delete audioPassThruDisplayText1;
-  audioPassThruDisplayText1=0;
-}
-
-bool PerformAudioPassThru_request::set_audioPassThruDisplayText2(const std::string& audioPassThruDisplayText2_)
-{
-  if(audioPassThruDisplayText2_.length()>500)  return false;
-  delete audioPassThruDisplayText2;
-  audioPassThruDisplayText2=0;
-
-  audioPassThruDisplayText2=new std::string(audioPassThruDisplayText2_);
-  return true;
-}
-
-void PerformAudioPassThru_request::reset_audioPassThruDisplayText2(void)
-{
-  if(audioPassThruDisplayText2)
-    delete audioPassThruDisplayText2;
-  audioPassThruDisplayText2=0;
-}
-
-bool PerformAudioPassThru_request::set_samplingRate(const SamplingRate& samplingRate_)
-{
-  if(!SamplingRateMarshaller::checkIntegrityConst(samplingRate_))   return false;
-  samplingRate=samplingRate_;
-  return true;
-}
-
-bool PerformAudioPassThru_request::set_maxDuration(unsigned int maxDuration_)
-{
-  if(maxDuration_>1000000)  return false;
-  maxDuration=maxDuration_;
-  return true;
-}
-
-bool PerformAudioPassThru_request::set_bitsPerSample(const AudioCaptureQuality& bitsPerSample_)
-{
-  if(!AudioCaptureQualityMarshaller::checkIntegrityConst(bitsPerSample_))   return false;
-  bitsPerSample=bitsPerSample_;
-  return true;
-}
-
-bool PerformAudioPassThru_request::set_audioType(const AudioType& audioType_)
-{
-  if(!AudioTypeMarshaller::checkIntegrityConst(audioType_))   return false;
-  audioType=audioType_;
-  return true;
-}
-
-
-
-
-const std::vector<TTSChunk>& PerformAudioPassThru_request::get_initialPrompt(void) const 
-{
-  return initialPrompt;
-}
-
-const std::string* PerformAudioPassThru_request::get_audioPassThruDisplayText1(void) const 
-{
-  return audioPassThruDisplayText1;
-}
-
-const std::string* PerformAudioPassThru_request::get_audioPassThruDisplayText2(void) const 
-{
-  return audioPassThruDisplayText2;
-}
-
-const SamplingRate& PerformAudioPassThru_request::get_samplingRate(void) const 
-{
-  return samplingRate;
-}
-
-unsigned int PerformAudioPassThru_request::get_maxDuration(void) const
-{
-  return maxDuration;
-}
-
-const AudioCaptureQuality& PerformAudioPassThru_request::get_bitsPerSample(void) const 
-{
-  return bitsPerSample;
-}
-
-const AudioType& PerformAudioPassThru_request::get_audioType(void) const 
-{
-  return audioType;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.cpp
deleted file mode 100644
index 00a38360c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h"
-#include "AudioCaptureQualityMarshaller.h"
-#include "AudioTypeMarshaller.h"
-#include "SamplingRateMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#include "PerformAudioPassThru_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PerformAudioPassThru_requestMarshaller::checkIntegrity(PerformAudioPassThru_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PerformAudioPassThru_requestMarshaller::fromString(const std::string& s,PerformAudioPassThru_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PerformAudioPassThru_requestMarshaller::toString(const PerformAudioPassThru_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformAudioPassThru_requestMarshaller::checkIntegrityConst(const PerformAudioPassThru_request& s)
-{
-  {
-    unsigned int i=s.initialPrompt.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.initialPrompt[i]))   return false;
-    }
-  }
-  if(s.audioPassThruDisplayText1 && s.audioPassThruDisplayText1->length()>500)  return false;
-  if(s.audioPassThruDisplayText2 && s.audioPassThruDisplayText2->length()>500)  return false;
-  if(!SamplingRateMarshaller::checkIntegrityConst(s.samplingRate))  return false;
-  if(s.maxDuration>1000000)  return false;
-  if(!AudioCaptureQualityMarshaller::checkIntegrityConst(s.bitsPerSample))  return false;
-  if(!AudioTypeMarshaller::checkIntegrityConst(s.audioType))  return false;
-  return true;
-}
-
-Json::Value PerformAudioPassThru_requestMarshaller::toJSON(const PerformAudioPassThru_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["initialPrompt"]=Json::Value(Json::arrayValue);
-  json["initialPrompt"].resize(e.initialPrompt.size());
-  for(unsigned int i=0;i<e.initialPrompt.size();i++)
-    json["initialPrompt"][i]=TTSChunkMarshaller::toJSON(e.initialPrompt[i]);
-
-  if(e.audioPassThruDisplayText1)
-    json["audioPassThruDisplayText1"]=Json::Value(*e.audioPassThruDisplayText1);
-
-  if(e.audioPassThruDisplayText2)
-    json["audioPassThruDisplayText2"]=Json::Value(*e.audioPassThruDisplayText2);
-
-  json["samplingRate"]=SamplingRateMarshaller::toJSON(e.samplingRate);
-
-  json["maxDuration"]=Json::Value(e.maxDuration);
-
-  json["bitsPerSample"]=AudioCaptureQualityMarshaller::toJSON(e.bitsPerSample);
-
-  json["audioType"]=AudioTypeMarshaller::toJSON(e.audioType);
-
-  return json;
-}
-
-
-bool PerformAudioPassThru_requestMarshaller::fromJSON(const Json::Value& json,PerformAudioPassThru_request& c)
-{
-  if(c.audioPassThruDisplayText1)  delete c.audioPassThruDisplayText1;
-  c.audioPassThruDisplayText1=0;
-
-  if(c.audioPassThruDisplayText2)  delete c.audioPassThruDisplayText2;
-  c.audioPassThruDisplayText2=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("initialPrompt"))  return false;
-    {
-      const Json::Value& j=json["initialPrompt"];
-      if(!j.isArray())  return false;
-      c.initialPrompt.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          TTSChunk t;
-          if(!TTSChunkMarshaller::fromJSON(j[i],t))
-            return false;
-          c.initialPrompt[i]=t;
-        }
-
-    }
-    if(json.isMember("audioPassThruDisplayText1"))
-    {
-      const Json::Value& j=json["audioPassThruDisplayText1"];
-      if(!j.isString())  return false;
-      c.audioPassThruDisplayText1=new std::string(j.asString());
-    }
-    if(json.isMember("audioPassThruDisplayText2"))
-    {
-      const Json::Value& j=json["audioPassThruDisplayText2"];
-      if(!j.isString())  return false;
-      c.audioPassThruDisplayText2=new std::string(j.asString());
-    }
-    if(!json.isMember("samplingRate"))  return false;
-    {
-      const Json::Value& j=json["samplingRate"];
-      if(!SamplingRateMarshaller::fromJSON(j,c.samplingRate))
-        return false;
-    }
-    if(!json.isMember("maxDuration"))  return false;
-    {
-      const Json::Value& j=json["maxDuration"];
-      if(!j.isInt())  return false;
-      c.maxDuration=j.asInt();
-    }
-    if(!json.isMember("bitsPerSample"))  return false;
-    {
-      const Json::Value& j=json["bitsPerSample"];
-      if(!AudioCaptureQualityMarshaller::fromJSON(j,c.bitsPerSample))
-        return false;
-    }
-    if(!json.isMember("audioType"))  return false;
-    {
-      const Json::Value& j=json["audioType"];
-      if(!AudioTypeMarshaller::fromJSON(j,c.audioType))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.h
deleted file mode 100644
index 128fa0935..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PERFORMAUDIOPASSTHRU_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PERFORMAUDIOPASSTHRU_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct PerformAudioPassThru_requestMarshaller
-  {
-    static bool checkIntegrity(PerformAudioPassThru_request& e);
-    static bool checkIntegrityConst(const PerformAudioPassThru_request& e);
-  
-    static bool fromString(const std::string& s,PerformAudioPassThru_request& e);
-    static const std::string toString(const PerformAudioPassThru_request& e);
-  
-    static bool fromJSON(const Json::Value& s,PerformAudioPassThru_request& e);
-    static Json::Value toJSON(const PerformAudioPassThru_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_response.cpp
deleted file mode 100644
index 6524cbbb8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h"
-#include "PerformAudioPassThru_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-PerformAudioPassThru_response& PerformAudioPassThru_response::operator =(const PerformAudioPassThru_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-PerformAudioPassThru_response::~PerformAudioPassThru_response(void)
-{}
-
-PerformAudioPassThru_response::PerformAudioPassThru_response(const PerformAudioPassThru_response& c)
-{
-    *this = c;
-}
-
-bool PerformAudioPassThru_response::checkIntegrity(void)
-{
-    return PerformAudioPassThru_responseMarshaller::checkIntegrity(*this);
-}
-
-PerformAudioPassThru_response::PerformAudioPassThru_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.cpp
deleted file mode 100644
index 3704f19c0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h"
-#include "ResultMarshaller.h"
-
-#include "PerformAudioPassThru_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PerformAudioPassThru_responseMarshaller::checkIntegrity(PerformAudioPassThru_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PerformAudioPassThru_responseMarshaller::fromString(const std::string& s,PerformAudioPassThru_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PerformAudioPassThru_responseMarshaller::toString(const PerformAudioPassThru_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformAudioPassThru_responseMarshaller::checkIntegrityConst(const PerformAudioPassThru_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value PerformAudioPassThru_responseMarshaller::toJSON(const PerformAudioPassThru_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool PerformAudioPassThru_responseMarshaller::fromJSON(const Json::Value& json,PerformAudioPassThru_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.h
deleted file mode 100644
index 80d91a4f3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PERFORMAUDIOPASSTHRU_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PERFORMAUDIOPASSTHRU_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct PerformAudioPassThru_responseMarshaller
-  {
-    static bool checkIntegrity(PerformAudioPassThru_response& e);
-    static bool checkIntegrityConst(const PerformAudioPassThru_response& e);
-  
-    static bool fromString(const std::string& s,PerformAudioPassThru_response& e);
-    static const std::string toString(const PerformAudioPassThru_response& e);
-  
-    static bool fromJSON(const Json::Value& s,PerformAudioPassThru_response& e);
-    static Json::Value toJSON(const PerformAudioPassThru_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_request.cpp
deleted file mode 100644
index e5f05927d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_request.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h"
-#include "PerformInteraction_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "InteractionModeMarshaller.h"
-#include "TTSChunkMarshaller.h"
-#include "VrHelpItemMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-PerformInteraction_request& PerformInteraction_request::operator =(const PerformInteraction_request& c)
-{
-  initialText= c.initialText;
-  initialPrompt= c.initialPrompt;
-  interactionMode= c.interactionMode;
-  interactionChoiceSetIDList= c.interactionChoiceSetIDList;
-  helpPrompt= c.helpPrompt ? new std::vector<TTSChunk>(c.helpPrompt[0]) : 0;
-  timeoutPrompt= c.timeoutPrompt ? new std::vector<TTSChunk>(c.timeoutPrompt[0]) : 0;
-  timeout= c.timeout ? new unsigned int(c.timeout[0]) : 0;
-  vrHelp= c.vrHelp ? new std::vector<VrHelpItem>(c.vrHelp[0]) : 0;
-
-  return *this;
-}
-
-
-PerformInteraction_request::~PerformInteraction_request(void)
-{
-  if(helpPrompt)
-    delete helpPrompt;
-  if(timeoutPrompt)
-    delete timeoutPrompt;
-  if(timeout)
-    delete timeout;
-  if(vrHelp)
-    delete vrHelp;
-}
-
-
-PerformInteraction_request::PerformInteraction_request(const PerformInteraction_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool PerformInteraction_request::checkIntegrity(void)
-{
-  return PerformInteraction_requestMarshaller::checkIntegrity(*this);
-}
-
-
-PerformInteraction_request::PerformInteraction_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      helpPrompt(0),
-    timeoutPrompt(0),
-    timeout(0),
-    vrHelp(0)
-{
-}
-
-
-
-bool PerformInteraction_request::set_initialText(const std::string& initialText_)
-{
-  if(initialText_.length()>500)  return false;
-  initialText=initialText_;
-  return true;
-}
-
-bool PerformInteraction_request::set_initialPrompt(const std::vector<TTSChunk>& initialPrompt_)
-{
-  unsigned int i=initialPrompt_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(initialPrompt_[i]))   return false;
-  }
-  initialPrompt=initialPrompt_;
-  return true;
-}
-
-bool PerformInteraction_request::set_interactionMode(const InteractionMode& interactionMode_)
-{
-  if(!InteractionModeMarshaller::checkIntegrityConst(interactionMode_))   return false;
-  interactionMode=interactionMode_;
-  return true;
-}
-
-bool PerformInteraction_request::set_interactionChoiceSetIDList(const std::vector<unsigned int>& interactionChoiceSetIDList_)
-{
-  unsigned int i=interactionChoiceSetIDList_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(interactionChoiceSetIDList_[i]>2000000000)  return false;
-  }
-  interactionChoiceSetIDList=interactionChoiceSetIDList_;
-  return true;
-}
-
-bool PerformInteraction_request::set_helpPrompt(const std::vector<TTSChunk>& helpPrompt_)
-{
-  unsigned int i=helpPrompt_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(helpPrompt_[i]))   return false;
-  }
-  delete helpPrompt;
-  helpPrompt=0;
-
-  helpPrompt=new std::vector<TTSChunk>(helpPrompt_);
-  return true;
-}
-
-void PerformInteraction_request::reset_helpPrompt(void)
-{
-  if(helpPrompt)
-    delete helpPrompt;
-  helpPrompt=0;
-}
-
-bool PerformInteraction_request::set_timeoutPrompt(const std::vector<TTSChunk>& timeoutPrompt_)
-{
-  unsigned int i=timeoutPrompt_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(timeoutPrompt_[i]))   return false;
-  }
-  delete timeoutPrompt;
-  timeoutPrompt=0;
-
-  timeoutPrompt=new std::vector<TTSChunk>(timeoutPrompt_);
-  return true;
-}
-
-void PerformInteraction_request::reset_timeoutPrompt(void)
-{
-  if(timeoutPrompt)
-    delete timeoutPrompt;
-  timeoutPrompt=0;
-}
-
-bool PerformInteraction_request::set_timeout(unsigned int timeout_)
-{
-  if(timeout_>100000)  return false;
-  if(timeout_<5000)  return false;
-  delete timeout;
-  timeout=0;
-
-  timeout=new unsigned int(timeout_);
-  return true;
-}
-
-void PerformInteraction_request::reset_timeout(void)
-{
-  if(timeout)
-    delete timeout;
-  timeout=0;
-}
-
-bool PerformInteraction_request::set_vrHelp(const std::vector<VrHelpItem>& vrHelp_)
-{
-  unsigned int i=vrHelp_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!VrHelpItemMarshaller::checkIntegrityConst(vrHelp_[i]))   return false;
-  }
-  delete vrHelp;
-  vrHelp=0;
-
-  vrHelp=new std::vector<VrHelpItem>(vrHelp_);
-  return true;
-}
-
-void PerformInteraction_request::reset_vrHelp(void)
-{
-  if(vrHelp)
-    delete vrHelp;
-  vrHelp=0;
-}
-
-
-
-
-const std::string& PerformInteraction_request::get_initialText(void) const 
-{
-  return initialText;
-}
-
-const std::vector<TTSChunk>& PerformInteraction_request::get_initialPrompt(void) const 
-{
-  return initialPrompt;
-}
-
-const InteractionMode& PerformInteraction_request::get_interactionMode(void) const 
-{
-  return interactionMode;
-}
-
-const std::vector<unsigned int>& PerformInteraction_request::get_interactionChoiceSetIDList(void) const 
-{
-  return interactionChoiceSetIDList;
-}
-
-const std::vector<TTSChunk>* PerformInteraction_request::get_helpPrompt(void) const 
-{
-  return helpPrompt;
-}
-
-const std::vector<TTSChunk>* PerformInteraction_request::get_timeoutPrompt(void) const 
-{
-  return timeoutPrompt;
-}
-
-const unsigned int* PerformInteraction_request::get_timeout(void) const 
-{
-  return timeout;
-}
-
-const std::vector<VrHelpItem>* PerformInteraction_request::get_vrHelp(void) const 
-{
-  return vrHelp;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.cpp
deleted file mode 100644
index 1541973c9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h"
-#include "InteractionModeMarshaller.h"
-#include "TTSChunkMarshaller.h"
-#include "VrHelpItemMarshaller.h"
-
-#include "PerformInteraction_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PerformInteraction_requestMarshaller::checkIntegrity(PerformInteraction_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PerformInteraction_requestMarshaller::fromString(const std::string& s,PerformInteraction_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PerformInteraction_requestMarshaller::toString(const PerformInteraction_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformInteraction_requestMarshaller::checkIntegrityConst(const PerformInteraction_request& s)
-{
-  if(s.initialText.length()>500)  return false;
-  {
-    unsigned int i=s.initialPrompt.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.initialPrompt[i]))   return false;
-    }
-  }
-  if(!InteractionModeMarshaller::checkIntegrityConst(s.interactionMode))  return false;
-  {
-    unsigned int i=s.interactionChoiceSetIDList.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.interactionChoiceSetIDList[i]>2000000000)  return false;
-    }
-  }
-  if(s.helpPrompt)
-  {
-    unsigned int i=s.helpPrompt[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.helpPrompt[0][i]))   return false;
-    }
-  }
-  if(s.timeoutPrompt)
-  {
-    unsigned int i=s.timeoutPrompt[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.timeoutPrompt[0][i]))   return false;
-    }
-  }
-  if(s.timeout && *s.timeout>100000)  return false;
-  if(s.timeout && *s.timeout<5000)  return false;
-  if(s.vrHelp)
-  {
-    unsigned int i=s.vrHelp[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!VrHelpItemMarshaller::checkIntegrityConst(s.vrHelp[0][i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value PerformInteraction_requestMarshaller::toJSON(const PerformInteraction_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["initialText"]=Json::Value(e.initialText);
-
-  json["initialPrompt"]=Json::Value(Json::arrayValue);
-  json["initialPrompt"].resize(e.initialPrompt.size());
-  for(unsigned int i=0;i<e.initialPrompt.size();i++)
-    json["initialPrompt"][i]=TTSChunkMarshaller::toJSON(e.initialPrompt[i]);
-
-  json["interactionMode"]=InteractionModeMarshaller::toJSON(e.interactionMode);
-
-  json["interactionChoiceSetIDList"]=Json::Value(Json::arrayValue);
-  json["interactionChoiceSetIDList"].resize(e.interactionChoiceSetIDList.size());
-  for(unsigned int i=0;i<e.interactionChoiceSetIDList.size();i++)
-    json["interactionChoiceSetIDList"][i]=Json::Value(e.interactionChoiceSetIDList[i]);
-
-  if(e.helpPrompt)
-  {
-    unsigned int sz=e.helpPrompt->size();
-    json["helpPrompt"]=Json::Value(Json::arrayValue);
-    json["helpPrompt"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["helpPrompt"][i]=TTSChunkMarshaller::toJSON(e.helpPrompt[0][i]);
-  }
-
-  if(e.timeoutPrompt)
-  {
-    unsigned int sz=e.timeoutPrompt->size();
-    json["timeoutPrompt"]=Json::Value(Json::arrayValue);
-    json["timeoutPrompt"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["timeoutPrompt"][i]=TTSChunkMarshaller::toJSON(e.timeoutPrompt[0][i]);
-  }
-
-  if(e.timeout)
-    json["timeout"]=Json::Value(*e.timeout);
-
-  if(e.vrHelp)
-  {
-    unsigned int sz=e.vrHelp->size();
-    json["vrHelp"]=Json::Value(Json::arrayValue);
-    json["vrHelp"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["vrHelp"][i]=VrHelpItemMarshaller::toJSON(e.vrHelp[0][i]);
-  }
-
-  return json;
-}
-
-
-bool PerformInteraction_requestMarshaller::fromJSON(const Json::Value& json,PerformInteraction_request& c)
-{
-  if(c.helpPrompt)  delete c.helpPrompt;
-  c.helpPrompt=0;
-
-  if(c.timeoutPrompt)  delete c.timeoutPrompt;
-  c.timeoutPrompt=0;
-
-  if(c.timeout)  delete c.timeout;
-  c.timeout=0;
-
-  if(c.vrHelp)  delete c.vrHelp;
-  c.vrHelp=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("initialText"))  return false;
-    {
-      const Json::Value& j=json["initialText"];
-      if(!j.isString())  return false;
-      c.initialText=j.asString();
-    }
-    if(!json.isMember("initialPrompt"))  return false;
-    {
-      const Json::Value& j=json["initialPrompt"];
-      if(!j.isArray())  return false;
-      c.initialPrompt.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          TTSChunk t;
-          if(!TTSChunkMarshaller::fromJSON(j[i],t))
-            return false;
-          c.initialPrompt[i]=t;
-        }
-
-    }
-    if(!json.isMember("interactionMode"))  return false;
-    {
-      const Json::Value& j=json["interactionMode"];
-      if(!InteractionModeMarshaller::fromJSON(j,c.interactionMode))
-        return false;
-    }
-    if(!json.isMember("interactionChoiceSetIDList"))  return false;
-    {
-      const Json::Value& j=json["interactionChoiceSetIDList"];
-      if(!j.isArray())  return false;
-      c.interactionChoiceSetIDList.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isInt())
-          return false;
-        else
-          c.interactionChoiceSetIDList[i]=j[i].asInt();
-    }
-    if(json.isMember("helpPrompt"))
-    {
-      const Json::Value& j=json["helpPrompt"];
-      if(!j.isArray())  return false;
-      c.helpPrompt=new std::vector<TTSChunk>();
-      c.helpPrompt->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        TTSChunk t;
-        if(!TTSChunkMarshaller::fromJSON(j[i],t))
-          return false;
-        c.helpPrompt[0][i]=t;
-      }
-
-    }
-    if(json.isMember("timeoutPrompt"))
-    {
-      const Json::Value& j=json["timeoutPrompt"];
-      if(!j.isArray())  return false;
-      c.timeoutPrompt=new std::vector<TTSChunk>();
-      c.timeoutPrompt->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        TTSChunk t;
-        if(!TTSChunkMarshaller::fromJSON(j[i],t))
-          return false;
-        c.timeoutPrompt[0][i]=t;
-      }
-
-    }
-    if(json.isMember("timeout"))
-    {
-      const Json::Value& j=json["timeout"];
-      if(!j.isInt())  return false;
-      c.timeout=new unsigned int(j.asInt());
-    }
-    if(json.isMember("vrHelp"))
-    {
-      const Json::Value& j=json["vrHelp"];
-      if(!j.isArray())  return false;
-      c.vrHelp=new std::vector<VrHelpItem>();
-      c.vrHelp->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        VrHelpItem t;
-        if(!VrHelpItemMarshaller::fromJSON(j[i],t))
-          return false;
-        c.vrHelp[0][i]=t;
-      }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.h
deleted file mode 100644
index c41160c74..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PERFORMINTERACTION_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PERFORMINTERACTION_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct PerformInteraction_requestMarshaller
-  {
-    static bool checkIntegrity(PerformInteraction_request& e);
-    static bool checkIntegrityConst(const PerformInteraction_request& e);
-  
-    static bool fromString(const std::string& s,PerformInteraction_request& e);
-    static const std::string toString(const PerformInteraction_request& e);
-  
-    static bool fromJSON(const Json::Value& s,PerformInteraction_request& e);
-    static Json::Value toJSON(const PerformInteraction_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_response.cpp
deleted file mode 100644
index 380fdb50e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_response.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h"
-#include "PerformInteraction_responseMarshaller.h"
-#include "TriggerSourceMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-PerformInteraction_response& PerformInteraction_response::operator =(const PerformInteraction_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-    choiceID = c.choiceID ? new unsigned int(c.choiceID[0]) : 0;
-    triggerSource = c.triggerSource ? new TriggerSource(c.triggerSource[0]) : 0;
-
-    return *this;
-}
-
-
-PerformInteraction_response::~PerformInteraction_response(void)
-{
-    if (choiceID)
-    {
-        delete choiceID;
-    }
-    if (triggerSource)
-    {
-        delete triggerSource;
-    }
-}
-
-PerformInteraction_response::PerformInteraction_response(const PerformInteraction_response& c)
-{
-    *this = c;
-}
-
-bool PerformInteraction_response::checkIntegrity(void)
-{
-    return PerformInteraction_responseMarshaller::checkIntegrity(*this);
-}
-
-PerformInteraction_response::PerformInteraction_response(void)
-    : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-    , choiceID(0)
-    , triggerSource(0)
-{
-}
-
-bool PerformInteraction_response::set_choiceID(unsigned int choiceID_)
-{
-    if (choiceID_ > 2000000000)
-    {
-        return false;
-    }
-    delete choiceID;
-    choiceID = 0;
-
-    choiceID = new unsigned int(choiceID_);
-    return true;
-}
-
-void PerformInteraction_response::reset_choiceID(void)
-{
-    if (choiceID)
-    {
-        delete choiceID;
-    }
-    choiceID = 0;
-}
-
-bool PerformInteraction_response::set_triggerSource(const TriggerSource& triggerSource_)
-{
-    if (!TriggerSourceMarshaller::checkIntegrityConst(triggerSource_))
-    {
-        return false;
-    }
-    delete triggerSource;
-    triggerSource = 0;
-
-    triggerSource = new TriggerSource(triggerSource_);
-    return true;
-}
-
-void PerformInteraction_response::reset_triggerSource(void)
-{
-    if (triggerSource)
-    {
-        delete triggerSource;
-    }
-    triggerSource = 0;
-}
-
-const unsigned int* PerformInteraction_response::get_choiceID(void) const
-{
-    return choiceID;
-}
-
-const TriggerSource* PerformInteraction_response::get_triggerSource(void) const
-{
-    return triggerSource;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.cpp
deleted file mode 100644
index 55408aceb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h"
-#include "ResultMarshaller.h"
-#include "TriggerSourceMarshaller.h"
-
-#include "PerformInteraction_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PerformInteraction_responseMarshaller::checkIntegrity(PerformInteraction_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PerformInteraction_responseMarshaller::fromString(const std::string& s,PerformInteraction_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PerformInteraction_responseMarshaller::toString(const PerformInteraction_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PerformInteraction_responseMarshaller::checkIntegrityConst(const PerformInteraction_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  if(s.choiceID && *s.choiceID>2000000000)  return false;
-  if(s.triggerSource && !TriggerSourceMarshaller::checkIntegrityConst(*s.triggerSource))  return false;
-  return true;
-}
-
-Json::Value PerformInteraction_responseMarshaller::toJSON(const PerformInteraction_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  if(e.choiceID)
-    json["choiceID"]=Json::Value(*e.choiceID);
-
-  if(e.triggerSource)
-    json["triggerSource"]=TriggerSourceMarshaller::toJSON(*e.triggerSource);
-
-  return json;
-}
-
-
-bool PerformInteraction_responseMarshaller::fromJSON(const Json::Value& json,PerformInteraction_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  if(c.choiceID)  delete c.choiceID;
-  c.choiceID=0;
-
-  if(c.triggerSource)  delete c.triggerSource;
-  c.triggerSource=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-    if(json.isMember("choiceID"))
-    {
-      const Json::Value& j=json["choiceID"];
-      if(!j.isInt())  return false;
-      c.choiceID=new unsigned int(j.asInt());
-    }
-    if(json.isMember("triggerSource"))
-    {
-      const Json::Value& j=json["triggerSource"];
-      c.triggerSource=new TriggerSource();
-      if(!TriggerSourceMarshaller::fromJSON(j,c.triggerSource[0]))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.h
deleted file mode 100644
index 9de7a9e02..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PERFORMINTERACTION_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PERFORMINTERACTION_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct PerformInteraction_responseMarshaller
-  {
-    static bool checkIntegrity(PerformInteraction_response& e);
-    static bool checkIntegrityConst(const PerformInteraction_response& e);
-  
-    static bool fromString(const std::string& s,PerformInteraction_response& e);
-    static const std::string toString(const PerformInteraction_response& e);
-  
-    static bool fromJSON(const Json::Value& s,PerformInteraction_response& e);
-    static Json::Value toJSON(const PerformInteraction_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItem.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItem.cpp
deleted file mode 100644
index ec6d3ad97..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItem.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PermissionItem.h"
-#include "PermissionItemMarshaller.h"
-#include "HMIPermissionsMarshaller.h"
-#include "ParameterPermissionsMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-PermissionItem::PermissionItem(const PermissionItem& c)
-{
-  *this=c;
-}
-
-
-bool PermissionItem::checkIntegrity(void)
-{
-  return PermissionItemMarshaller::checkIntegrity(*this);
-}
-
-
-PermissionItem::PermissionItem(void)
-{
-}
-
-
-
-bool PermissionItem::set_hmiPermissions(const HMIPermissions& hmiPermissions_)
-{
-  if(!HMIPermissionsMarshaller::checkIntegrityConst(hmiPermissions_))   return false;
-  hmiPermissions=hmiPermissions_;
-  return true;
-}
-
-bool PermissionItem::set_parameterPermissions(const ParameterPermissions& parameterPermissions_)
-{
-  if(!ParameterPermissionsMarshaller::checkIntegrityConst(parameterPermissions_))   return false;
-  parameterPermissions=parameterPermissions_;
-  return true;
-}
-
-bool PermissionItem::set_rpcName(const std::string& rpcName_)
-{
-  if(rpcName_.length()>100)  return false;
-  rpcName=rpcName_;
-  return true;
-}
-
-
-
-
-const HMIPermissions& PermissionItem::get_hmiPermissions(void) const 
-{
-  return hmiPermissions;
-}
-
-
-const ParameterPermissions& PermissionItem::get_parameterPermissions(void) const 
-{
-  return parameterPermissions;
-}
-
-
-const std::string& PermissionItem::get_rpcName(void) const 
-{
-  return rpcName;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.cpp
deleted file mode 100644
index 1e8c75fd6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PermissionItem.h"
-#include "HMIPermissionsMarshaller.h"
-#include "ParameterPermissionsMarshaller.h"
-
-#include "PermissionItemMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PermissionItemMarshaller::checkIntegrity(PermissionItem& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PermissionItemMarshaller::fromString(const std::string& s,PermissionItem& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PermissionItemMarshaller::toString(const PermissionItem& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PermissionItemMarshaller::checkIntegrityConst(const PermissionItem& s)
-{
-  if(!HMIPermissionsMarshaller::checkIntegrityConst(s.hmiPermissions))  return false;
-  if(!ParameterPermissionsMarshaller::checkIntegrityConst(s.parameterPermissions))  return false;
-  if(s.rpcName.length()>100)  return false;
-  return true;
-}
-
-Json::Value PermissionItemMarshaller::toJSON(const PermissionItem& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["hmiPermissions"]=HMIPermissionsMarshaller::toJSON(e.hmiPermissions);
-
-  json["parameterPermissions"]=ParameterPermissionsMarshaller::toJSON(e.parameterPermissions);
-
-  json["rpcName"]=Json::Value(e.rpcName);
-
-
-  return json;
-}
-
-
-bool PermissionItemMarshaller::fromJSON(const Json::Value& json,PermissionItem& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("hmiPermissions"))  return false;
-    {
-      const Json::Value& j=json["hmiPermissions"];
-      if(!HMIPermissionsMarshaller::fromJSON(j,c.hmiPermissions))
-        return false;
-    }
-    if(!json.isMember("parameterPermissions"))  return false;
-    {
-      const Json::Value& j=json["parameterPermissions"];
-      if(!ParameterPermissionsMarshaller::fromJSON(j,c.parameterPermissions))
-        return false;
-    }
-    if(!json.isMember("rpcName"))  return false;
-    {
-      const Json::Value& j=json["rpcName"];
-      if(!j.isString())  return false;
-      c.rpcName=j.asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.h
deleted file mode 100644
index baf9a772c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionItemMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PERMISSIONITEMMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PERMISSIONITEMMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PermissionItem.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct PermissionItemMarshaller
-  {
-    static bool checkIntegrity(PermissionItem& e);
-    static bool checkIntegrityConst(const PermissionItem& e);
-  
-    static bool fromString(const std::string& s,PermissionItem& e);
-    static const std::string toString(const PermissionItem& e);
-  
-    static bool fromJSON(const Json::Value& s,PermissionItem& e);
-    static Json::Value toJSON(const PermissionItem& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.cpp
deleted file mode 100644
index e98b82f58..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/PermissionStatus.h"
-#include "PermissionStatusMarshaller.h"
-#include "PermissionStatusMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const PermissionStatus::PermissionStatusInternal PermissionStatusMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return PermissionStatus::INVALID_ENUM;
-  const struct PerfectHashTable* p=PermissionStatus_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<PermissionStatus::PermissionStatusInternal>(p->idx) : PermissionStatus::INVALID_ENUM;
-}
-
-
-bool PermissionStatusMarshaller::fromJSON(const Json::Value& s,PermissionStatus& e)
-{
-  e.mInternal=PermissionStatus::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=PermissionStatus::INVALID_ENUM);
-}
-
-
-Json::Value PermissionStatusMarshaller::toJSON(const PermissionStatus& e)
-{
-  if(e.mInternal==PermissionStatus::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool PermissionStatusMarshaller::fromString(const std::string& s,PermissionStatus& e)
-{
-  e.mInternal=PermissionStatus::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string PermissionStatusMarshaller::toString(const PermissionStatus& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==PermissionStatus::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable PermissionStatusMarshaller::mHashTable[4]=
-{
-  {"ALLOWED",0},
-  {"DISALLOWED",1},
-  {"USER_DISALLOWED",2},
-  {"USER_CONSENT_PENDING",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp
deleted file mode 100644
index 162260ec4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name PermissionStatus_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-ALLOWED,0
-DISALLOWED,1
-USER_DISALLOWED,2
-USER_CONSENT_PENDING,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.h
deleted file mode 100644
index 6ff13a367..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PERMISSIONSTATUSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PERMISSIONSTATUSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PermissionStatus.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for PermissionStatus
-
-  class PermissionStatusMarshaller
-  {
-  public:
-  
-    static std::string toName(const PermissionStatus& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(PermissionStatus& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=PermissionStatus::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(PermissionStatus& e)		{ return e.mInternal!=PermissionStatus::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const PermissionStatus& e)	{ return e.mInternal!=PermissionStatus::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,PermissionStatus& e);
-    static const std::string toString(const PermissionStatus& e);
-  
-    static bool fromJSON(const Json::Value& s,PermissionStatus& e);
-    static Json::Value toJSON(const PermissionStatus& e);
-  
-    static const char* getName(PermissionStatus::PermissionStatusInternal e)
-    {
-       return (e>=0 && e<4) ? mHashTable[e].name : NULL;
-    }
-  
-    static const PermissionStatus::PermissionStatusInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[4];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.inc
deleted file mode 100644
index 3e9834518..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.inc
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 20
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 20
-/* maximum key range = 14, duplicates = 0 */
-
-class PermissionStatus_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-PermissionStatus_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-PermissionStatus_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  7,  0,  0, 10,  0,  0,  0,
-       0, 15,  0,  0,  0,  0, 20
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp"
-      {"ALLOWED",0},
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp"
-      {"DISALLOWED",1},
-      {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp"
-      {"USER_DISALLOWED",2},
-      {""}, {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PermissionStatusMarshaller.gp"
-      {"USER_CONSENT_PENDING",3}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilities.cpp
deleted file mode 100644
index 5c5a32a02..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilities.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h"
-#include "PresetBankCapabilitiesMarshaller.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-PresetBankCapabilities::PresetBankCapabilities(const PresetBankCapabilities& c)
-{
-  *this=c;
-}
-
-
-bool PresetBankCapabilities::checkIntegrity(void)
-{
-  return PresetBankCapabilitiesMarshaller::checkIntegrity(*this);
-}
-
-
-PresetBankCapabilities::PresetBankCapabilities(void)
-{
-}
-
-
-
-bool PresetBankCapabilities::set_onScreenPresetsAvailable(bool onScreenPresetsAvailable_)
-{
-  onScreenPresetsAvailable=onScreenPresetsAvailable_;
-  return true;
-}
-
-
-
-
-bool PresetBankCapabilities::get_onScreenPresetsAvailable(void) const
-{
-  return onScreenPresetsAvailable;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.cpp
deleted file mode 100644
index a9b5efe8d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h"
-
-
-#include "PresetBankCapabilitiesMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PresetBankCapabilitiesMarshaller::checkIntegrity(PresetBankCapabilities& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PresetBankCapabilitiesMarshaller::fromString(const std::string& s,PresetBankCapabilities& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PresetBankCapabilitiesMarshaller::toString(const PresetBankCapabilities& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PresetBankCapabilitiesMarshaller::checkIntegrityConst(const PresetBankCapabilities& s)
-{
-  return true;
-}
-
-Json::Value PresetBankCapabilitiesMarshaller::toJSON(const PresetBankCapabilities& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["onScreenPresetsAvailable"]=Json::Value(e.onScreenPresetsAvailable);
-
-
-  return json;
-}
-
-
-bool PresetBankCapabilitiesMarshaller::fromJSON(const Json::Value& json,PresetBankCapabilities& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("onScreenPresetsAvailable"))  return false;
-    {
-      const Json::Value& j=json["onScreenPresetsAvailable"];
-      if(!j.isBool())  return false;
-      c.onScreenPresetsAvailable=j.asBool();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.h
deleted file mode 100644
index fd0c4a776..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PresetBankCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PRESETBANKCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PRESETBANKCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct PresetBankCapabilitiesMarshaller
-  {
-    static bool checkIntegrity(PresetBankCapabilities& e);
-    static bool checkIntegrityConst(const PresetBankCapabilities& e);
-  
-    static bool fromString(const std::string& s,PresetBankCapabilities& e);
-    static const std::string toString(const PresetBankCapabilities& e);
-  
-    static bool fromJSON(const Json::Value& s,PresetBankCapabilities& e);
-    static Json::Value toJSON(const PresetBankCapabilities& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_request.cpp
deleted file mode 100644
index 52260d301..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_request.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h"
-#include "PutFile_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "FileTypeMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-PutFile_request& PutFile_request::operator =(const PutFile_request& c)
-{
-  syncFileName= c.syncFileName;
-  fileType= c.fileType;
-  persistentFile= c.persistentFile ? new bool(c.persistentFile[0]) : 0;
-  fileData= c.fileData ? new std::string(c.fileData[0]) : 0;
-
-  return *this;
-}
-
-
-PutFile_request::~PutFile_request(void)
-{
-  if(persistentFile)
-    delete persistentFile;
-  if(fileData)
-    delete fileData;
-}
-
-
-PutFile_request::PutFile_request(const PutFile_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool PutFile_request::checkIntegrity(void)
-{
-  return PutFile_requestMarshaller::checkIntegrity(*this);
-}
-
-
-PutFile_request::PutFile_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      persistentFile(0),
-    fileData(0)
-{
-}
-
-
-
-bool PutFile_request::set_syncFileName(const std::string& syncFileName_)
-{
-  if(syncFileName_.length()>500)  return false;
-  syncFileName=syncFileName_;
-  return true;
-}
-
-bool PutFile_request::set_fileType(const FileType& fileType_)
-{
-  if(!FileTypeMarshaller::checkIntegrityConst(fileType_))   return false;
-  fileType=fileType_;
-  return true;
-}
-
-bool PutFile_request::set_persistentFile(bool persistentFile_)
-{
-  delete persistentFile;
-  persistentFile=0;
-
-  persistentFile=new bool(persistentFile_);
-  return true;
-}
-
-void PutFile_request::reset_persistentFile(void)
-{
-  if(persistentFile)
-    delete persistentFile;
-  persistentFile=0;
-}
-
-bool PutFile_request::set_fileData(const std::string& fileData_)
-{
-  delete fileData;
-  fileData=0;
-
-  fileData=new std::string(fileData_);
-  return true;
-}
-
-void PutFile_request::reset_fileData(void)
-{
-  if(fileData)
-    delete fileData;
-  fileData=0;
-}
-
-
-
-
-const std::string& PutFile_request::get_syncFileName(void) const 
-{
-  return syncFileName;
-}
-
-const FileType& PutFile_request::get_fileType(void) const 
-{
-  return fileType;
-}
-
-const bool* PutFile_request::get_persistentFile(void) const 
-{
-  return persistentFile;
-}
-
-const std::string* PutFile_request::get_fileData(void) const 
-{
-  return fileData;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.cpp
deleted file mode 100644
index d05375ace..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h"
-#include "FileTypeMarshaller.h"
-
-#include "PutFile_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PutFile_requestMarshaller::checkIntegrity(PutFile_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PutFile_requestMarshaller::fromString(const std::string& s,PutFile_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PutFile_requestMarshaller::toString(const PutFile_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PutFile_requestMarshaller::checkIntegrityConst(const PutFile_request& s)
-{
-  if(s.syncFileName.length()>500)  return false;
-  if(!FileTypeMarshaller::checkIntegrityConst(s.fileType))  return false;
-  return true;
-}
-
-Json::Value PutFile_requestMarshaller::toJSON(const PutFile_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["syncFileName"]=Json::Value(e.syncFileName);
-
-  json["fileType"]=FileTypeMarshaller::toJSON(e.fileType);
-
-  if(e.persistentFile)
-    json["persistentFile"]=Json::Value(*e.persistentFile);
-
-  if(e.fileData)
-    json["fileData"]=Json::Value(*e.fileData);
-
-  return json;
-}
-
-
-bool PutFile_requestMarshaller::fromJSON(const Json::Value& json,PutFile_request& c)
-{
-  if(c.persistentFile)  delete c.persistentFile;
-  c.persistentFile=0;
-
-  if(c.fileData)  delete c.fileData;
-  c.fileData=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("syncFileName"))  return false;
-    {
-      const Json::Value& j=json["syncFileName"];
-      if(!j.isString())  return false;
-      c.syncFileName=j.asString();
-    }
-    if(!json.isMember("fileType"))  return false;
-    {
-      const Json::Value& j=json["fileType"];
-      if(!FileTypeMarshaller::fromJSON(j,c.fileType))
-        return false;
-    }
-    if(json.isMember("persistentFile"))
-    {
-      const Json::Value& j=json["persistentFile"];
-      if(!j.isBool())  return false;
-      c.persistentFile=new bool(j.asBool());
-    }
-    if(json.isMember("fileData"))
-    {
-      const Json::Value& j=json["fileData"];
-      if(!j.isString())  return false;
-      c.fileData=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.h
deleted file mode 100644
index 73f081579..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PUTFILE_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PUTFILE_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct PutFile_requestMarshaller
-  {
-    static bool checkIntegrity(PutFile_request& e);
-    static bool checkIntegrityConst(const PutFile_request& e);
-  
-    static bool fromString(const std::string& s,PutFile_request& e);
-    static const std::string toString(const PutFile_request& e);
-  
-    static bool fromJSON(const Json::Value& s,PutFile_request& e);
-    static Json::Value toJSON(const PutFile_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_response.cpp
deleted file mode 100644
index 6d7180b77..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_response.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h"
-#include "PutFile_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-PutFile_response& PutFile_response::operator =(const PutFile_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    spaceAvailable = c.spaceAvailable;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-
-PutFile_response::~PutFile_response(void)
-{}
-
-PutFile_response::PutFile_response(const PutFile_response& c)
-{
-    *this = c;
-}
-
-bool PutFile_response::checkIntegrity(void)
-{
-    return PutFile_responseMarshaller::checkIntegrity(*this);
-}
-
-PutFile_response::PutFile_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
-
-bool PutFile_response::set_spaceAvailable(unsigned int spaceAvailable_)
-{
-    if (spaceAvailable_ > 2000000000)
-    {
-        return false;
-    }
-    spaceAvailable = spaceAvailable_;
-    return true;
-}
-
-unsigned int PutFile_response::get_spaceAvailable(void) const
-{
-    return spaceAvailable;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.cpp
deleted file mode 100644
index 1f6141b2f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h"
-#include "ResultMarshaller.h"
-
-#include "PutFile_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool PutFile_responseMarshaller::checkIntegrity(PutFile_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool PutFile_responseMarshaller::fromString(const std::string& s,PutFile_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string PutFile_responseMarshaller::toString(const PutFile_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool PutFile_responseMarshaller::checkIntegrityConst(const PutFile_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.spaceAvailable>2000000000)  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value PutFile_responseMarshaller::toJSON(const PutFile_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  json["spaceAvailable"]=Json::Value(e.spaceAvailable);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool PutFile_responseMarshaller::fromJSON(const Json::Value& json,PutFile_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(!json.isMember("spaceAvailable"))  return false;
-    {
-      const Json::Value& j=json["spaceAvailable"];
-      if(!j.isInt())  return false;
-      c.spaceAvailable=j.asInt();
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.h
deleted file mode 100644
index 4c2d9ca87..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_PUTFILE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_PUTFILE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct PutFile_responseMarshaller
-  {
-    static bool checkIntegrity(PutFile_response& e);
-    static bool checkIntegrityConst(const PutFile_response& e);
-  
-    static bool fromString(const std::string& s,PutFile_response& e);
-    static const std::string toString(const PutFile_response& e);
-  
-    static bool fromJSON(const Json::Value& s,PutFile_response& e);
-    static Json::Value toJSON(const PutFile_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_request.cpp
deleted file mode 100644
index c1db3fcfd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_request.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h"
-#include "ReadDID_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ReadDID_request& ReadDID_request::operator =(const ReadDID_request& c)
-{
-  ecuName= c.ecuName;
-  didLocation= c.didLocation;
-  encrypted= c.encrypted ? new bool(c.encrypted[0]) : 0;
-
-  return *this;
-}
-
-
-ReadDID_request::~ReadDID_request(void)
-{
-  if(encrypted)
-    delete encrypted;
-}
-
-
-ReadDID_request::ReadDID_request(const ReadDID_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool ReadDID_request::checkIntegrity(void)
-{
-  return ReadDID_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ReadDID_request::ReadDID_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      encrypted(0)
-{
-}
-
-
-
-bool ReadDID_request::set_ecuName(unsigned int ecuName_)
-{
-  if(ecuName_>65535)  return false;
-  ecuName=ecuName_;
-  return true;
-}
-
-bool ReadDID_request::set_didLocation(const std::vector<unsigned int>& didLocation_)
-{
-  unsigned int i=didLocation_.size();
-  if(i>1000 || i<0)  return false;
-  while(i--)
-  {
-    if(didLocation_[i]>65535)  return false;
-  }
-  didLocation=didLocation_;
-  return true;
-}
-
-bool ReadDID_request::set_encrypted(bool encrypted_)
-{
-  delete encrypted;
-  encrypted=0;
-
-  encrypted=new bool(encrypted_);
-  return true;
-}
-
-void ReadDID_request::reset_encrypted(void)
-{
-  if(encrypted)
-    delete encrypted;
-  encrypted=0;
-}
-
-
-
-
-unsigned int ReadDID_request::get_ecuName(void) const
-{
-  return ecuName;
-}
-
-const std::vector<unsigned int>& ReadDID_request::get_didLocation(void) const 
-{
-  return didLocation;
-}
-
-const bool* ReadDID_request::get_encrypted(void) const 
-{
-  return encrypted;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.cpp
deleted file mode 100644
index 648d415f8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h"
-
-
-#include "ReadDID_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ReadDID_requestMarshaller::checkIntegrity(ReadDID_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ReadDID_requestMarshaller::fromString(const std::string& s,ReadDID_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ReadDID_requestMarshaller::toString(const ReadDID_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ReadDID_requestMarshaller::checkIntegrityConst(const ReadDID_request& s)
-{
-  if(s.ecuName>65535)  return false;
-  {
-    unsigned int i=s.didLocation.size();
-    if(i>1000 || i<0)  return false;
-    while(i--)
-    {
-      if(s.didLocation[i]>65535)  return false;
-    }
-  }
-  return true;
-}
-
-Json::Value ReadDID_requestMarshaller::toJSON(const ReadDID_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["ecuName"]=Json::Value(e.ecuName);
-
-  json["didLocation"]=Json::Value(Json::arrayValue);
-  json["didLocation"].resize(e.didLocation.size());
-  for(unsigned int i=0;i<e.didLocation.size();i++)
-    json["didLocation"][i]=Json::Value(e.didLocation[i]);
-
-  if(e.encrypted)
-    json["encrypted"]=Json::Value(*e.encrypted);
-
-  return json;
-}
-
-
-bool ReadDID_requestMarshaller::fromJSON(const Json::Value& json,ReadDID_request& c)
-{
-  if(c.encrypted)  delete c.encrypted;
-  c.encrypted=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("ecuName"))  return false;
-    {
-      const Json::Value& j=json["ecuName"];
-      if(!j.isInt())  return false;
-      c.ecuName=j.asInt();
-    }
-    if(!json.isMember("didLocation"))  return false;
-    {
-      const Json::Value& j=json["didLocation"];
-      if(!j.isArray())  return false;
-      c.didLocation.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isInt())
-          return false;
-        else
-          c.didLocation[i]=j[i].asInt();
-    }
-    if(json.isMember("encrypted"))
-    {
-      const Json::Value& j=json["encrypted"];
-      if(!j.isBool())  return false;
-      c.encrypted=new bool(j.asBool());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.h
deleted file mode 100644
index efa5d39a1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_READDID_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_READDID_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ReadDID_requestMarshaller
-  {
-    static bool checkIntegrity(ReadDID_request& e);
-    static bool checkIntegrityConst(const ReadDID_request& e);
-  
-    static bool fromString(const std::string& s,ReadDID_request& e);
-    static const std::string toString(const ReadDID_request& e);
-  
-    static bool fromJSON(const Json::Value& s,ReadDID_request& e);
-    static Json::Value toJSON(const ReadDID_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_response.cpp
deleted file mode 100644
index be08c903e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_response.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h"
-#include "ReadDID_responseMarshaller.h"
-#include "VehicleDataResultCodeMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ReadDID_response& ReadDID_response::operator =(const ReadDID_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-    dataResult = c.dataResult ? new std::vector<VehicleDataResultCode>(c.dataResult[0]) : 0;
-    data = c.data ? new std::vector<std::string>(c.data[0]) : 0;
-
-    return *this;
-}
-
-ReadDID_response::~ReadDID_response(void)
-{
-    if (dataResult)
-    {
-        delete dataResult;
-    }
-    if (data)
-    {
-        delete data;
-    }
-}
-
-ReadDID_response::ReadDID_response(const ReadDID_response& c)
-{
-    *this = c;
-}
-
-bool ReadDID_response::checkIntegrity(void)
-{
-    return ReadDID_responseMarshaller::checkIntegrity(*this);
-}
-
-ReadDID_response::ReadDID_response(void)
-    : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-    , dataResult(0)
-    , data(0)
-{
-}
-
-bool ReadDID_response::set_dataResult(const std::vector<VehicleDataResultCode>& dataResult_)
-{
-    unsigned int i = dataResult_.size();
-    if (i > 1000 || i < 0)  // TODO(AK): unsigned int i < 0
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (!VehicleDataResultCodeMarshaller::checkIntegrityConst(dataResult_[i]))
-        {
-            return false;
-        }
-    }
-    delete dataResult;
-    dataResult = 0;
-
-    dataResult = new std::vector<VehicleDataResultCode>(dataResult_);
-    return true;
-}
-
-void ReadDID_response::reset_dataResult(void)
-{
-    if (dataResult)
-    {
-        delete dataResult;
-    }
-    dataResult = 0;
-}
-
-bool ReadDID_response::set_data(const std::vector<std::string>& data_)
-{
-    unsigned int i = data_.size();
-    if (i > 1000 || i < 0)  // TODO(AK): unsigned int i < 0
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (data_[i].length() > 5000)
-        {
-            return false;
-        }
-    }
-    delete data;
-    data = 0;
-
-    data = new std::vector<std::string>(data_);
-    return true;
-}
-
-void ReadDID_response::reset_data(void)
-{
-    if (data)
-    {
-        delete data;
-    }
-    data = 0;
-}
-
-const std::vector<VehicleDataResultCode>* ReadDID_response::get_dataResult(void) const
-{
-    return dataResult;
-}
-
-const std::vector<std::string>* ReadDID_response::get_data(void) const
-{
-    return data;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.cpp
deleted file mode 100644
index bfadc37b7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h"
-#include "ResultMarshaller.h"
-#include "VehicleDataResultCodeMarshaller.h"
-
-#include "ReadDID_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ReadDID_responseMarshaller::checkIntegrity(ReadDID_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ReadDID_responseMarshaller::fromString(const std::string& s,ReadDID_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ReadDID_responseMarshaller::toString(const ReadDID_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ReadDID_responseMarshaller::checkIntegrityConst(const ReadDID_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  if(s.dataResult)
-  {
-    unsigned int i=s.dataResult[0].size();
-    if(i>1000 || i<0)  return false;
-    while(i--)
-    {
-    if(!VehicleDataResultCodeMarshaller::checkIntegrityConst(s.dataResult[0][i]))   return false;
-    }
-  }
-  if(s.data)
-  {
-    unsigned int i=s.data[0].size();
-    if(i>1000 || i<0)  return false;
-    while(i--)
-    {
-      if(s.data[0][i].length()>5000)  return false;
-    }
-  }
-  return true;
-}
-
-Json::Value ReadDID_responseMarshaller::toJSON(const ReadDID_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  if(e.dataResult)
-  {
-    unsigned int sz=e.dataResult->size();
-    json["dataResult"]=Json::Value(Json::arrayValue);
-    json["dataResult"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["dataResult"][i]=VehicleDataResultCodeMarshaller::toJSON(e.dataResult[0][i]);
-  }
-
-  if(e.data)
-  {
-    unsigned int sz=e.data->size();
-    json["data"]=Json::Value(Json::arrayValue);
-    json["data"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["data"][i]=Json::Value(e.data[0][i]);
-  }
-
-  return json;
-}
-
-
-bool ReadDID_responseMarshaller::fromJSON(const Json::Value& json,ReadDID_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  if(c.dataResult)  delete c.dataResult;
-  c.dataResult=0;
-
-  if(c.data)  delete c.data;
-  c.data=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-    if(json.isMember("dataResult"))
-    {
-      const Json::Value& j=json["dataResult"];
-      if(!j.isArray())  return false;
-      c.dataResult=new std::vector<VehicleDataResultCode>();
-      c.dataResult->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        VehicleDataResultCode t;
-        if(!VehicleDataResultCodeMarshaller::fromJSON(j[i],t))
-          return false;
-        c.dataResult[0][i]=t;
-      }
-
-    }
-    if(json.isMember("data"))
-    {
-      const Json::Value& j=json["data"];
-      if(!j.isArray())  return false;
-      c.data=new std::vector<std::string>();
-      c.data->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.data[0][i]=j[i].asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.h
deleted file mode 100644
index 332ea17ad..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_READDID_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_READDID_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ReadDID_responseMarshaller
-  {
-    static bool checkIntegrity(ReadDID_response& e);
-    static bool checkIntegrityConst(const ReadDID_response& e);
-  
-    static bool fromString(const std::string& s,ReadDID_response& e);
-    static const std::string toString(const ReadDID_response& e);
-  
-    static bool fromJSON(const Json::Value& s,ReadDID_response& e);
-    static Json::Value toJSON(const ReadDID_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_request.cpp
deleted file mode 100644
index c79ab4b0f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_request.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h"
-#include "RegisterAppInterface_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "AppTypeMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "SyncMsgVersionMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-RegisterAppInterface_request& RegisterAppInterface_request::operator =(const RegisterAppInterface_request& c)
-{
-  syncMsgVersion= c.syncMsgVersion;
-  appName= c.appName;
-  ttsName= c.ttsName ? new std::vector<TTSChunk>(c.ttsName[0]) : 0;
-  ngnMediaScreenAppName= c.ngnMediaScreenAppName ? new std::string(c.ngnMediaScreenAppName[0]) : 0;
-  vrSynonyms= c.vrSynonyms ? new std::vector<std::string>(c.vrSynonyms[0]) : 0;
-  isMediaApplication= c.isMediaApplication;
-  languageDesired= c.languageDesired;
-  hmiDisplayLanguageDesired= c.hmiDisplayLanguageDesired;
-  appType= c.appType ? new std::vector<AppType>(c.appType[0]) : 0;
-  appID= c.appID;
-
-  return *this;
-}
-
-
-RegisterAppInterface_request::~RegisterAppInterface_request(void)
-{
-  if(ttsName)
-    delete ttsName;
-  if(ngnMediaScreenAppName)
-    delete ngnMediaScreenAppName;
-  if(vrSynonyms)
-    delete vrSynonyms;
-  if(appType)
-    delete appType;
-}
-
-
-RegisterAppInterface_request::RegisterAppInterface_request(const RegisterAppInterface_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool RegisterAppInterface_request::checkIntegrity(void)
-{
-  return RegisterAppInterface_requestMarshaller::checkIntegrity(*this);
-}
-
-
-RegisterAppInterface_request::RegisterAppInterface_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      ttsName(0),
-    ngnMediaScreenAppName(0),
-    vrSynonyms(0),
-    appType(0)
-{
-}
-
-
-
-bool RegisterAppInterface_request::set_syncMsgVersion(const SyncMsgVersion& syncMsgVersion_)
-{
-  if(!SyncMsgVersionMarshaller::checkIntegrityConst(syncMsgVersion_))   return false;
-  syncMsgVersion=syncMsgVersion_;
-  return true;
-}
-
-bool RegisterAppInterface_request::set_appName(const std::string& appName_)
-{
-  if(appName_.length()>100)  return false;
-  appName=appName_;
-  return true;
-}
-
-bool RegisterAppInterface_request::set_ttsName(const std::vector<TTSChunk>& ttsName_)
-{
-  unsigned int i=ttsName_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(ttsName_[i]))   return false;
-  }
-  delete ttsName;
-  ttsName=0;
-
-  ttsName=new std::vector<TTSChunk>(ttsName_);
-  return true;
-}
-
-void RegisterAppInterface_request::reset_ttsName(void)
-{
-  if(ttsName)
-    delete ttsName;
-  ttsName=0;
-}
-
-bool RegisterAppInterface_request::set_ngnMediaScreenAppName(const std::string& ngnMediaScreenAppName_)
-{
-  if(ngnMediaScreenAppName_.length()>100)  return false;
-  delete ngnMediaScreenAppName;
-  ngnMediaScreenAppName=0;
-
-  ngnMediaScreenAppName=new std::string(ngnMediaScreenAppName_);
-  return true;
-}
-
-void RegisterAppInterface_request::reset_ngnMediaScreenAppName(void)
-{
-  if(ngnMediaScreenAppName)
-    delete ngnMediaScreenAppName;
-  ngnMediaScreenAppName=0;
-}
-
-bool RegisterAppInterface_request::set_vrSynonyms(const std::vector<std::string>& vrSynonyms_)
-{
-  unsigned int i=vrSynonyms_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(vrSynonyms_[i].length()>40)  return false;
-  }
-  delete vrSynonyms;
-  vrSynonyms=0;
-
-  vrSynonyms=new std::vector<std::string>(vrSynonyms_);
-  return true;
-}
-
-void RegisterAppInterface_request::reset_vrSynonyms(void)
-{
-  if(vrSynonyms)
-    delete vrSynonyms;
-  vrSynonyms=0;
-}
-
-bool RegisterAppInterface_request::set_isMediaApplication(bool isMediaApplication_)
-{
-  isMediaApplication=isMediaApplication_;
-  return true;
-}
-
-bool RegisterAppInterface_request::set_languageDesired(const Language& languageDesired_)
-{
-  if(!LanguageMarshaller::checkIntegrityConst(languageDesired_))   return false;
-  languageDesired=languageDesired_;
-  return true;
-}
-
-bool RegisterAppInterface_request::set_hmiDisplayLanguageDesired(const Language& hmiDisplayLanguageDesired_)
-{
-  if(!LanguageMarshaller::checkIntegrityConst(hmiDisplayLanguageDesired_))   return false;
-  hmiDisplayLanguageDesired=hmiDisplayLanguageDesired_;
-  return true;
-}
-
-bool RegisterAppInterface_request::set_appType(const std::vector<AppType>& appType_)
-{
-  unsigned int i=appType_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!AppTypeMarshaller::checkIntegrityConst(appType_[i]))   return false;
-  }
-  delete appType;
-  appType=0;
-
-  appType=new std::vector<AppType>(appType_);
-  return true;
-}
-
-void RegisterAppInterface_request::reset_appType(void)
-{
-  if(appType)
-    delete appType;
-  appType=0;
-}
-
-bool RegisterAppInterface_request::set_appID(const std::string& appID_)
-{
-  if(appID_.length()>100)  return false;
-  appID=appID_;
-  return true;
-}
-
-
-
-
-const SyncMsgVersion& RegisterAppInterface_request::get_syncMsgVersion(void) const 
-{
-  return syncMsgVersion;
-}
-
-const std::string& RegisterAppInterface_request::get_appName(void) const 
-{
-  return appName;
-}
-
-const std::vector<TTSChunk>* RegisterAppInterface_request::get_ttsName(void) const 
-{
-  return ttsName;
-}
-
-const std::string* RegisterAppInterface_request::get_ngnMediaScreenAppName(void) const 
-{
-  return ngnMediaScreenAppName;
-}
-
-const std::vector<std::string>* RegisterAppInterface_request::get_vrSynonyms(void) const 
-{
-  return vrSynonyms;
-}
-
-bool RegisterAppInterface_request::get_isMediaApplication(void) const
-{
-  return isMediaApplication;
-}
-
-const Language& RegisterAppInterface_request::get_languageDesired(void) const 
-{
-  return languageDesired;
-}
-
-const Language& RegisterAppInterface_request::get_hmiDisplayLanguageDesired(void) const 
-{
-  return hmiDisplayLanguageDesired;
-}
-
-const std::vector<AppType>* RegisterAppInterface_request::get_appType(void) const 
-{
-  return appType;
-}
-
-const std::string& RegisterAppInterface_request::get_appID(void) const 
-{
-  return appID;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.cpp
deleted file mode 100644
index bbd481ebf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h"
-#include "AppTypeMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "SyncMsgVersionMarshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#include "RegisterAppInterface_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool RegisterAppInterface_requestMarshaller::checkIntegrity(RegisterAppInterface_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool RegisterAppInterface_requestMarshaller::fromString(const std::string& s,RegisterAppInterface_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string RegisterAppInterface_requestMarshaller::toString(const RegisterAppInterface_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool RegisterAppInterface_requestMarshaller::checkIntegrityConst(const RegisterAppInterface_request& s)
-{
-  if(!SyncMsgVersionMarshaller::checkIntegrityConst(s.syncMsgVersion))  return false;
-  if(s.appName.length()>100)  return false;
-  if(s.ttsName)
-  {
-    unsigned int i=s.ttsName[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.ttsName[0][i]))   return false;
-    }
-  }
-  if(s.ngnMediaScreenAppName && s.ngnMediaScreenAppName->length()>100)  return false;
-  if(s.vrSynonyms)
-  {
-    unsigned int i=s.vrSynonyms[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-      if(s.vrSynonyms[0][i].length()>40)  return false;
-    }
-  }
-  if(!LanguageMarshaller::checkIntegrityConst(s.languageDesired))  return false;
-  if(!LanguageMarshaller::checkIntegrityConst(s.hmiDisplayLanguageDesired))  return false;
-  if(s.appType)
-  {
-    unsigned int i=s.appType[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!AppTypeMarshaller::checkIntegrityConst(s.appType[0][i]))   return false;
-    }
-  }
-  if(s.appID.length()>100)  return false;
-  return true;
-}
-
-Json::Value RegisterAppInterface_requestMarshaller::toJSON(const RegisterAppInterface_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["syncMsgVersion"]=SyncMsgVersionMarshaller::toJSON(e.syncMsgVersion);
-
-  json["appName"]=Json::Value(e.appName);
-
-  if(e.ttsName)
-  {
-    unsigned int sz=e.ttsName->size();
-    json["ttsName"]=Json::Value(Json::arrayValue);
-    json["ttsName"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["ttsName"][i]=TTSChunkMarshaller::toJSON(e.ttsName[0][i]);
-  }
-
-  if(e.ngnMediaScreenAppName)
-    json["ngnMediaScreenAppName"]=Json::Value(*e.ngnMediaScreenAppName);
-
-  if(e.vrSynonyms)
-  {
-    unsigned int sz=e.vrSynonyms->size();
-    json["vrSynonyms"]=Json::Value(Json::arrayValue);
-    json["vrSynonyms"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["vrSynonyms"][i]=Json::Value(e.vrSynonyms[0][i]);
-  }
-
-  json["isMediaApplication"]=Json::Value(e.isMediaApplication);
-
-  json["languageDesired"]=LanguageMarshaller::toJSON(e.languageDesired);
-
-  json["hmiDisplayLanguageDesired"]=LanguageMarshaller::toJSON(e.hmiDisplayLanguageDesired);
-
-  if(e.appType)
-  {
-    unsigned int sz=e.appType->size();
-    json["appType"]=Json::Value(Json::arrayValue);
-    json["appType"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["appType"][i]=AppTypeMarshaller::toJSON(e.appType[0][i]);
-  }
-
-  json["appID"]=Json::Value(e.appID);
-
-  return json;
-}
-
-
-bool RegisterAppInterface_requestMarshaller::fromJSON(const Json::Value& json,RegisterAppInterface_request& c)
-{
-  if(c.ttsName)  delete c.ttsName;
-  c.ttsName=0;
-
-  if(c.ngnMediaScreenAppName)  delete c.ngnMediaScreenAppName;
-  c.ngnMediaScreenAppName=0;
-
-  if(c.vrSynonyms)  delete c.vrSynonyms;
-  c.vrSynonyms=0;
-
-  if(c.appType)  delete c.appType;
-  c.appType=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("syncMsgVersion"))  return false;
-    {
-      const Json::Value& j=json["syncMsgVersion"];
-      if(!SyncMsgVersionMarshaller::fromJSON(j,c.syncMsgVersion))
-        return false;
-    }
-    if(!json.isMember("appName"))  return false;
-    {
-      const Json::Value& j=json["appName"];
-      if(!j.isString())  return false;
-      c.appName=j.asString();
-    }
-    if(json.isMember("ttsName"))
-    {
-      const Json::Value& j=json["ttsName"];
-      if(!j.isArray())  return false;
-      c.ttsName=new std::vector<TTSChunk>();
-      c.ttsName->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        TTSChunk t;
-        if(!TTSChunkMarshaller::fromJSON(j[i],t))
-          return false;
-        c.ttsName[0][i]=t;
-      }
-
-    }
-    if(json.isMember("ngnMediaScreenAppName"))
-    {
-      const Json::Value& j=json["ngnMediaScreenAppName"];
-      if(!j.isString())  return false;
-      c.ngnMediaScreenAppName=new std::string(j.asString());
-    }
-    if(json.isMember("vrSynonyms"))
-    {
-      const Json::Value& j=json["vrSynonyms"];
-      if(!j.isArray())  return false;
-      c.vrSynonyms=new std::vector<std::string>();
-      c.vrSynonyms->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.vrSynonyms[0][i]=j[i].asString();
-    }
-    if(!json.isMember("isMediaApplication"))  return false;
-    {
-      const Json::Value& j=json["isMediaApplication"];
-      if(!j.isBool())  return false;
-      c.isMediaApplication=j.asBool();
-    }
-    if(!json.isMember("languageDesired"))  return false;
-    {
-      const Json::Value& j=json["languageDesired"];
-      if(!LanguageMarshaller::fromJSON(j,c.languageDesired))
-        return false;
-    }
-    if(!json.isMember("hmiDisplayLanguageDesired"))  return false;
-    {
-      const Json::Value& j=json["hmiDisplayLanguageDesired"];
-      if(!LanguageMarshaller::fromJSON(j,c.hmiDisplayLanguageDesired))
-        return false;
-    }
-    if(json.isMember("appType"))
-    {
-      const Json::Value& j=json["appType"];
-      if(!j.isArray())  return false;
-      c.appType=new std::vector<AppType>();
-      c.appType->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        AppType t;
-        if(!AppTypeMarshaller::fromJSON(j[i],t))
-          return false;
-        c.appType[0][i]=t;
-      }
-
-    }
-    if(!json.isMember("appID"))  return false;
-    {
-      const Json::Value& j=json["appID"];
-      if(!j.isString())  return false;
-      c.appID=j.asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.h
deleted file mode 100644
index 7dcd66db2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_REGISTERAPPINTERFACE_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_REGISTERAPPINTERFACE_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct RegisterAppInterface_requestMarshaller
-  {
-    static bool checkIntegrity(RegisterAppInterface_request& e);
-    static bool checkIntegrityConst(const RegisterAppInterface_request& e);
-  
-    static bool fromString(const std::string& s,RegisterAppInterface_request& e);
-    static const std::string toString(const RegisterAppInterface_request& e);
-  
-    static bool fromJSON(const Json::Value& s,RegisterAppInterface_request& e);
-    static Json::Value toJSON(const RegisterAppInterface_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_response.cpp
deleted file mode 100644
index ecd938a0f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_response.cpp
+++ /dev/null
@@ -1,491 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h"
-#include "RegisterAppInterface_responseMarshaller.h"
-#include "ButtonCapabilitiesMarshaller.h"
-#include "DisplayCapabilitiesMarshaller.h"
-#include "HmiZoneCapabilitiesMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "PresetBankCapabilitiesMarshaller.h"
-#include "SoftButtonCapabilitiesMarshaller.h"
-#include "SpeechCapabilitiesMarshaller.h"
-#include "SyncMsgVersionMarshaller.h"
-#include "VehicleTypeMarshaller.h"
-#include "VrCapabilitiesMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-RegisterAppInterface_response& RegisterAppInterface_response::operator =(const RegisterAppInterface_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-    syncMsgVersion = c.syncMsgVersion ? new SyncMsgVersion(c.syncMsgVersion[0]) : 0;
-    language = c.language ? new Language(c.language[0]) : 0;
-    hmiDisplayLanguage = c.hmiDisplayLanguage ? new Language(c.hmiDisplayLanguage[0]) : 0;
-    displayCapabilities = c.displayCapabilities ? new DisplayCapabilities(c.displayCapabilities[0]) : 0;
-    buttonCapabilities = c.buttonCapabilities ? new std::vector<ButtonCapabilities>(c.buttonCapabilities[0]) : 0;
-    softButtonCapabilities = c.softButtonCapabilities ? new std::vector<SoftButtonCapabilities>(c.softButtonCapabilities[0]) : 0;
-    presetBankCapabilities = c.presetBankCapabilities ? new PresetBankCapabilities(c.presetBankCapabilities[0]) : 0;
-    hmiZoneCapabilities = c.hmiZoneCapabilities ? new std::vector<HmiZoneCapabilities>(c.hmiZoneCapabilities[0]) : 0;
-    speechCapabilities = c.speechCapabilities ? new std::vector<SpeechCapabilities>(c.speechCapabilities[0]) : 0;
-    vrCapabilities = c.vrCapabilities ? new std::vector<VrCapabilities>(c.vrCapabilities[0]) : 0;
-    vehicleType = c.vehicleType ? new VehicleType(c.vehicleType[0]) : 0;
-
-    return *this;
-}
-
-RegisterAppInterface_response::~RegisterAppInterface_response(void)
-{
-    if (syncMsgVersion)
-    {
-        delete syncMsgVersion;
-    }
-    if (language)
-    {
-        delete language;
-    }
-    if (hmiDisplayLanguage)
-    {
-        delete hmiDisplayLanguage;
-    }
-    if (displayCapabilities)
-    {
-        delete displayCapabilities;
-    }
-    if (buttonCapabilities)
-    {
-        delete buttonCapabilities;
-    }
-    if (softButtonCapabilities)
-    {
-        delete softButtonCapabilities;
-    }
-    if (presetBankCapabilities)
-    {
-        delete presetBankCapabilities;
-    }
-    if (hmiZoneCapabilities)
-    {
-        delete hmiZoneCapabilities;
-    }
-    if (speechCapabilities)
-    {
-        delete speechCapabilities;
-    }
-    if (vrCapabilities)
-    {
-        delete vrCapabilities;
-    }
-    if (vehicleType)
-    {
-        delete vehicleType;
-    }
-}
-
-RegisterAppInterface_response::RegisterAppInterface_response(const RegisterAppInterface_response& c)
-{
-    *this = c;
-}
-
-bool RegisterAppInterface_response::checkIntegrity(void)
-{
-    return RegisterAppInterface_responseMarshaller::checkIntegrity(*this);
-}
-
-RegisterAppInterface_response::RegisterAppInterface_response(void)
-    : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-    , syncMsgVersion(0)
-    , language(0)
-    , hmiDisplayLanguage(0)
-    , displayCapabilities(0)
-    , buttonCapabilities(0)
-    , softButtonCapabilities(0)
-    , presetBankCapabilities(0)
-    , hmiZoneCapabilities(0)
-    , speechCapabilities(0)
-    , vrCapabilities(0)
-    , vehicleType(0)
-{
-}
-
-bool RegisterAppInterface_response::set_syncMsgVersion(const SyncMsgVersion& syncMsgVersion_)
-{
-    if (!SyncMsgVersionMarshaller::checkIntegrityConst(syncMsgVersion_))
-    {
-        return false;
-    }
-    delete syncMsgVersion;
-    syncMsgVersion = 0;
-
-    syncMsgVersion = new SyncMsgVersion(syncMsgVersion_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_syncMsgVersion(void)
-{
-    if (syncMsgVersion)
-    {
-        delete syncMsgVersion;
-    }
-    syncMsgVersion = 0;
-}
-
-bool RegisterAppInterface_response::set_language(const Language& language_)
-{
-    if (!LanguageMarshaller::checkIntegrityConst(language_))
-    {
-        return false;
-    }
-    delete language;
-    language = 0;
-
-    language = new Language(language_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_language(void)
-{
-    if (language)
-    {
-        delete language;
-    }
-    language = 0;
-}
-
-bool RegisterAppInterface_response::set_hmiDisplayLanguage(const Language& hmiDisplayLanguage_)
-{
-    if (!LanguageMarshaller::checkIntegrityConst(hmiDisplayLanguage_))
-    {
-        return false;
-    }
-    delete hmiDisplayLanguage;
-    hmiDisplayLanguage = 0;
-
-    hmiDisplayLanguage = new Language(hmiDisplayLanguage_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_hmiDisplayLanguage(void)
-{
-    if (hmiDisplayLanguage)
-    {
-        delete hmiDisplayLanguage;
-    }
-    hmiDisplayLanguage = 0;
-}
-
-bool RegisterAppInterface_response::set_displayCapabilities(const DisplayCapabilities& displayCapabilities_)
-{
-    if (!DisplayCapabilitiesMarshaller::checkIntegrityConst(displayCapabilities_))
-    {
-        return false;
-    }
-    delete displayCapabilities;
-    displayCapabilities = 0;
-
-    displayCapabilities = new DisplayCapabilities(displayCapabilities_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_displayCapabilities(void)
-{
-    if (displayCapabilities)
-    {
-        delete displayCapabilities;
-    }
-    displayCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_buttonCapabilities(const std::vector<ButtonCapabilities>& buttonCapabilities_)
-{
-    unsigned int i = buttonCapabilities_.size();
-    if (i > 100 || i < 1)
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (!ButtonCapabilitiesMarshaller::checkIntegrityConst(buttonCapabilities_[i]))
-        {
-            return false;
-        }
-    }
-    delete buttonCapabilities;
-    buttonCapabilities = 0;
-
-    buttonCapabilities = new std::vector<ButtonCapabilities>(buttonCapabilities_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_buttonCapabilities(void)
-{
-    if (buttonCapabilities)
-    {
-        delete buttonCapabilities;
-    }
-    buttonCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_softButtonCapabilities(const std::vector<SoftButtonCapabilities>& softButtonCapabilities_)
-{
-    unsigned int i = softButtonCapabilities_.size();
-    if (i > 100 || i < 1)
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (!SoftButtonCapabilitiesMarshaller::checkIntegrityConst(softButtonCapabilities_[i]))
-        {
-            return false;
-        }
-    }
-    delete softButtonCapabilities;
-    softButtonCapabilities = 0;
-
-    softButtonCapabilities = new std::vector<SoftButtonCapabilities>(softButtonCapabilities_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_softButtonCapabilities(void)
-{
-    if (softButtonCapabilities)
-    {
-        delete softButtonCapabilities;
-    }
-    softButtonCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_presetBankCapabilities(const PresetBankCapabilities& presetBankCapabilities_)
-{
-    if (!PresetBankCapabilitiesMarshaller::checkIntegrityConst(presetBankCapabilities_))
-    {
-        return false;
-    }
-    delete presetBankCapabilities;
-    presetBankCapabilities = 0;
-
-    presetBankCapabilities = new PresetBankCapabilities(presetBankCapabilities_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_presetBankCapabilities(void)
-{
-    if (presetBankCapabilities)
-    {
-        delete presetBankCapabilities;
-    }
-    presetBankCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_hmiZoneCapabilities(const std::vector<HmiZoneCapabilities>& hmiZoneCapabilities_)
-{
-    unsigned int i = hmiZoneCapabilities_.size();
-    if (i > 100 || i < 1)
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (!HmiZoneCapabilitiesMarshaller::checkIntegrityConst(hmiZoneCapabilities_[i]))
-        {
-            return false;
-        }
-    }
-    delete hmiZoneCapabilities;
-    hmiZoneCapabilities = 0;
-
-    hmiZoneCapabilities = new std::vector<HmiZoneCapabilities>(hmiZoneCapabilities_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_hmiZoneCapabilities(void)
-{
-    if (hmiZoneCapabilities)
-    {
-        delete hmiZoneCapabilities;
-    }
-    hmiZoneCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_speechCapabilities(const std::vector<SpeechCapabilities>& speechCapabilities_)
-{
-    unsigned int i = speechCapabilities_.size();
-    if (i > 100 || i < 1)
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (!SpeechCapabilitiesMarshaller::checkIntegrityConst(speechCapabilities_[i]))
-        {
-            return false;
-        }
-    }
-    delete speechCapabilities;
-    speechCapabilities = 0;
-
-    speechCapabilities = new std::vector<SpeechCapabilities>(speechCapabilities_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_speechCapabilities(void)
-{
-    if (speechCapabilities)
-    {
-        delete speechCapabilities;
-    }
-    speechCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_vrCapabilities(const std::vector<VrCapabilities>& vrCapabilities_)
-{
-    unsigned int i = vrCapabilities_.size();
-    if (i > 100 || i < 1)
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (!VrCapabilitiesMarshaller::checkIntegrityConst(vrCapabilities_[i]))
-        {
-            return false;
-        }
-    }
-    delete vrCapabilities;
-    vrCapabilities = 0;
-
-    vrCapabilities = new std::vector<VrCapabilities>(vrCapabilities_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_vrCapabilities(void)
-{
-    if (vrCapabilities)
-    {
-        delete vrCapabilities;
-    }
-    vrCapabilities = 0;
-}
-
-bool RegisterAppInterface_response::set_vehicleType(const VehicleType& vehicleType_)
-{
-    if (!VehicleTypeMarshaller::checkIntegrityConst(vehicleType_))
-    {
-        return false;
-    }
-    delete vehicleType;
-    vehicleType = 0;
-
-    vehicleType = new VehicleType(vehicleType_);
-    return true;
-}
-
-void RegisterAppInterface_response::reset_vehicleType(void)
-{
-    if (vehicleType)
-    {
-        delete vehicleType;
-    }
-    vehicleType = 0;
-}
-
-const SyncMsgVersion* RegisterAppInterface_response::get_syncMsgVersion(void) const
-{
-    return syncMsgVersion;
-}
-
-const Language* RegisterAppInterface_response::get_language(void) const
-{
-    return language;
-}
-
-const Language* RegisterAppInterface_response::get_hmiDisplayLanguage(void) const
-{
-    return hmiDisplayLanguage;
-}
-
-const DisplayCapabilities* RegisterAppInterface_response::get_displayCapabilities(void) const
-{
-    return displayCapabilities;
-}
-
-const std::vector<ButtonCapabilities>* RegisterAppInterface_response::get_buttonCapabilities(void) const
-{
-    return buttonCapabilities;
-}
-
-const std::vector<SoftButtonCapabilities>* RegisterAppInterface_response::get_softButtonCapabilities(void) const
-{
-    return softButtonCapabilities;
-}
-
-const PresetBankCapabilities* RegisterAppInterface_response::get_presetBankCapabilities(void) const
-{
-    return presetBankCapabilities;
-}
-
-const std::vector<HmiZoneCapabilities>* RegisterAppInterface_response::get_hmiZoneCapabilities(void) const
-{
-    return hmiZoneCapabilities;
-}
-
-const std::vector<SpeechCapabilities>* RegisterAppInterface_response::get_speechCapabilities(void) const
-{
-    return speechCapabilities;
-}
-
-const std::vector<VrCapabilities>* RegisterAppInterface_response::get_vrCapabilities(void) const
-{
-    return vrCapabilities;
-}
-
-const VehicleType* RegisterAppInterface_response::get_vehicleType(void) const
-{
-    return vehicleType;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.cpp
deleted file mode 100644
index 1cafea7c9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h"
-#include "ButtonCapabilitiesMarshaller.h"
-#include "DisplayCapabilitiesMarshaller.h"
-#include "HmiZoneCapabilitiesMarshaller.h"
-#include "LanguageMarshaller.h"
-#include "PresetBankCapabilitiesMarshaller.h"
-#include "ResultMarshaller.h"
-#include "SoftButtonCapabilitiesMarshaller.h"
-#include "SpeechCapabilitiesMarshaller.h"
-#include "SyncMsgVersionMarshaller.h"
-#include "VehicleTypeMarshaller.h"
-#include "VrCapabilitiesMarshaller.h"
-
-#include "RegisterAppInterface_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool RegisterAppInterface_responseMarshaller::checkIntegrity(RegisterAppInterface_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool RegisterAppInterface_responseMarshaller::fromString(const std::string& s,RegisterAppInterface_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string RegisterAppInterface_responseMarshaller::toString(const RegisterAppInterface_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool RegisterAppInterface_responseMarshaller::checkIntegrityConst(const RegisterAppInterface_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  if(s.syncMsgVersion && !SyncMsgVersionMarshaller::checkIntegrityConst(*s.syncMsgVersion))  return false;
-  if(s.language && !LanguageMarshaller::checkIntegrityConst(*s.language))  return false;
-  if(s.hmiDisplayLanguage && !LanguageMarshaller::checkIntegrityConst(*s.hmiDisplayLanguage))  return false;
-  if(s.displayCapabilities && !DisplayCapabilitiesMarshaller::checkIntegrityConst(*s.displayCapabilities))  return false;
-  if(s.buttonCapabilities)
-  {
-    unsigned int i=s.buttonCapabilities[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!ButtonCapabilitiesMarshaller::checkIntegrityConst(s.buttonCapabilities[0][i]))   return false;
-    }
-  }
-  if(s.softButtonCapabilities)
-  {
-    unsigned int i=s.softButtonCapabilities[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!SoftButtonCapabilitiesMarshaller::checkIntegrityConst(s.softButtonCapabilities[0][i]))   return false;
-    }
-  }
-  if(s.presetBankCapabilities && !PresetBankCapabilitiesMarshaller::checkIntegrityConst(*s.presetBankCapabilities))  return false;
-  if(s.hmiZoneCapabilities)
-  {
-    unsigned int i=s.hmiZoneCapabilities[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!HmiZoneCapabilitiesMarshaller::checkIntegrityConst(s.hmiZoneCapabilities[0][i]))   return false;
-    }
-  }
-  if(s.speechCapabilities)
-  {
-    unsigned int i=s.speechCapabilities[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!SpeechCapabilitiesMarshaller::checkIntegrityConst(s.speechCapabilities[0][i]))   return false;
-    }
-  }
-  if(s.vrCapabilities)
-  {
-    unsigned int i=s.vrCapabilities[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!VrCapabilitiesMarshaller::checkIntegrityConst(s.vrCapabilities[0][i]))   return false;
-    }
-  }
-  if(s.vehicleType && !VehicleTypeMarshaller::checkIntegrityConst(*s.vehicleType))  return false;
-  return true;
-}
-
-Json::Value RegisterAppInterface_responseMarshaller::toJSON(const RegisterAppInterface_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  if(e.syncMsgVersion)
-    json["syncMsgVersion"]=SyncMsgVersionMarshaller::toJSON(*e.syncMsgVersion);
-
-  if(e.language)
-    json["language"]=LanguageMarshaller::toJSON(*e.language);
-
-  if(e.hmiDisplayLanguage)
-    json["hmiDisplayLanguage"]=LanguageMarshaller::toJSON(*e.hmiDisplayLanguage);
-
-  if(e.displayCapabilities)
-    json["displayCapabilities"]=DisplayCapabilitiesMarshaller::toJSON(*e.displayCapabilities);
-
-  if(e.buttonCapabilities)
-  {
-    unsigned int sz=e.buttonCapabilities->size();
-    json["buttonCapabilities"]=Json::Value(Json::arrayValue);
-    json["buttonCapabilities"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["buttonCapabilities"][i]=ButtonCapabilitiesMarshaller::toJSON(e.buttonCapabilities[0][i]);
-  }
-
-  if(e.softButtonCapabilities)
-  {
-    unsigned int sz=e.softButtonCapabilities->size();
-    json["softButtonCapabilities"]=Json::Value(Json::arrayValue);
-    json["softButtonCapabilities"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["softButtonCapabilities"][i]=SoftButtonCapabilitiesMarshaller::toJSON(e.softButtonCapabilities[0][i]);
-  }
-
-  if(e.presetBankCapabilities)
-    json["presetBankCapabilities"]=PresetBankCapabilitiesMarshaller::toJSON(*e.presetBankCapabilities);
-
-  if(e.hmiZoneCapabilities)
-  {
-    unsigned int sz=e.hmiZoneCapabilities->size();
-    json["hmiZoneCapabilities"]=Json::Value(Json::arrayValue);
-    json["hmiZoneCapabilities"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["hmiZoneCapabilities"][i]=HmiZoneCapabilitiesMarshaller::toJSON(e.hmiZoneCapabilities[0][i]);
-  }
-
-  if(e.speechCapabilities)
-  {
-    unsigned int sz=e.speechCapabilities->size();
-    json["speechCapabilities"]=Json::Value(Json::arrayValue);
-    json["speechCapabilities"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["speechCapabilities"][i]=SpeechCapabilitiesMarshaller::toJSON(e.speechCapabilities[0][i]);
-  }
-
-  if(e.vrCapabilities)
-  {
-    unsigned int sz=e.vrCapabilities->size();
-    json["vrCapabilities"]=Json::Value(Json::arrayValue);
-    json["vrCapabilities"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["vrCapabilities"][i]=VrCapabilitiesMarshaller::toJSON(e.vrCapabilities[0][i]);
-  }
-
-  if(e.vehicleType)
-    json["vehicleType"]=VehicleTypeMarshaller::toJSON(*e.vehicleType);
-
-  return json;
-}
-
-
-bool RegisterAppInterface_responseMarshaller::fromJSON(const Json::Value& json,RegisterAppInterface_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  if(c.syncMsgVersion)  delete c.syncMsgVersion;
-  c.syncMsgVersion=0;
-
-  if(c.language)  delete c.language;
-  c.language=0;
-
-  if(c.hmiDisplayLanguage)  delete c.hmiDisplayLanguage;
-  c.hmiDisplayLanguage=0;
-
-  if(c.displayCapabilities)  delete c.displayCapabilities;
-  c.displayCapabilities=0;
-
-  if(c.buttonCapabilities)  delete c.buttonCapabilities;
-  c.buttonCapabilities=0;
-
-  if(c.softButtonCapabilities)  delete c.softButtonCapabilities;
-  c.softButtonCapabilities=0;
-
-  if(c.presetBankCapabilities)  delete c.presetBankCapabilities;
-  c.presetBankCapabilities=0;
-
-  if(c.hmiZoneCapabilities)  delete c.hmiZoneCapabilities;
-  c.hmiZoneCapabilities=0;
-
-  if(c.speechCapabilities)  delete c.speechCapabilities;
-  c.speechCapabilities=0;
-
-  if(c.vrCapabilities)  delete c.vrCapabilities;
-  c.vrCapabilities=0;
-
-  if(c.vehicleType)  delete c.vehicleType;
-  c.vehicleType=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-    if(json.isMember("syncMsgVersion"))
-    {
-      const Json::Value& j=json["syncMsgVersion"];
-      c.syncMsgVersion=new SyncMsgVersion();
-      if(!SyncMsgVersionMarshaller::fromJSON(j,c.syncMsgVersion[0]))
-        return false;
-    }
-    if(json.isMember("language"))
-    {
-      const Json::Value& j=json["language"];
-      c.language=new Language();
-      if(!LanguageMarshaller::fromJSON(j,c.language[0]))
-        return false;
-    }
-    if(json.isMember("hmiDisplayLanguage"))
-    {
-      const Json::Value& j=json["hmiDisplayLanguage"];
-      c.hmiDisplayLanguage=new Language();
-      if(!LanguageMarshaller::fromJSON(j,c.hmiDisplayLanguage[0]))
-        return false;
-    }
-    if(json.isMember("displayCapabilities"))
-    {
-      const Json::Value& j=json["displayCapabilities"];
-      c.displayCapabilities=new DisplayCapabilities();
-      if(!DisplayCapabilitiesMarshaller::fromJSON(j,c.displayCapabilities[0]))
-        return false;
-    }
-    if(json.isMember("buttonCapabilities"))
-    {
-      const Json::Value& j=json["buttonCapabilities"];
-      if(!j.isArray())  return false;
-      c.buttonCapabilities=new std::vector<ButtonCapabilities>();
-      c.buttonCapabilities->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        ButtonCapabilities t;
-        if(!ButtonCapabilitiesMarshaller::fromJSON(j[i],t))
-          return false;
-        c.buttonCapabilities[0][i]=t;
-      }
-
-    }
-    if(json.isMember("softButtonCapabilities"))
-    {
-      const Json::Value& j=json["softButtonCapabilities"];
-      if(!j.isArray())  return false;
-      c.softButtonCapabilities=new std::vector<SoftButtonCapabilities>();
-      c.softButtonCapabilities->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        SoftButtonCapabilities t;
-        if(!SoftButtonCapabilitiesMarshaller::fromJSON(j[i],t))
-          return false;
-        c.softButtonCapabilities[0][i]=t;
-      }
-
-    }
-    if(json.isMember("presetBankCapabilities"))
-    {
-      const Json::Value& j=json["presetBankCapabilities"];
-      c.presetBankCapabilities=new PresetBankCapabilities();
-      if(!PresetBankCapabilitiesMarshaller::fromJSON(j,c.presetBankCapabilities[0]))
-        return false;
-    }
-    if(json.isMember("hmiZoneCapabilities"))
-    {
-      const Json::Value& j=json["hmiZoneCapabilities"];
-      if(!j.isArray())  return false;
-      c.hmiZoneCapabilities=new std::vector<HmiZoneCapabilities>();
-      c.hmiZoneCapabilities->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        HmiZoneCapabilities t;
-        if(!HmiZoneCapabilitiesMarshaller::fromJSON(j[i],t))
-          return false;
-        c.hmiZoneCapabilities[0][i]=t;
-      }
-
-    }
-    if(json.isMember("speechCapabilities"))
-    {
-      const Json::Value& j=json["speechCapabilities"];
-      if(!j.isArray())  return false;
-      c.speechCapabilities=new std::vector<SpeechCapabilities>();
-      c.speechCapabilities->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        SpeechCapabilities t;
-        if(!SpeechCapabilitiesMarshaller::fromJSON(j[i],t))
-          return false;
-        c.speechCapabilities[0][i]=t;
-      }
-
-    }
-    if(json.isMember("vrCapabilities"))
-    {
-      const Json::Value& j=json["vrCapabilities"];
-      if(!j.isArray())  return false;
-      c.vrCapabilities=new std::vector<VrCapabilities>();
-      c.vrCapabilities->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        VrCapabilities t;
-        if(!VrCapabilitiesMarshaller::fromJSON(j[i],t))
-          return false;
-        c.vrCapabilities[0][i]=t;
-      }
-
-    }
-    if(json.isMember("vehicleType"))
-    {
-      const Json::Value& j=json["vehicleType"];
-      c.vehicleType=new VehicleType();
-      if(!VehicleTypeMarshaller::fromJSON(j,c.vehicleType[0]))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.h
deleted file mode 100644
index a50253191..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_REGISTERAPPINTERFACE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_REGISTERAPPINTERFACE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct RegisterAppInterface_responseMarshaller
-  {
-    static bool checkIntegrity(RegisterAppInterface_response& e);
-    static bool checkIntegrityConst(const RegisterAppInterface_response& e);
-  
-    static bool fromString(const std::string& s,RegisterAppInterface_response& e);
-    static const std::string toString(const RegisterAppInterface_response& e);
-  
-    static bool fromJSON(const Json::Value& s,RegisterAppInterface_response& e);
-    static Json::Value toJSON(const RegisterAppInterface_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_request.cpp
deleted file mode 100644
index 251160cca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_request.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h"
-#include "ResetGlobalProperties_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "GlobalPropertyMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-ResetGlobalProperties_request::~ResetGlobalProperties_request(void)
-{
-}
-
-
-ResetGlobalProperties_request::ResetGlobalProperties_request(const ResetGlobalProperties_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool ResetGlobalProperties_request::checkIntegrity(void)
-{
-  return ResetGlobalProperties_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ResetGlobalProperties_request::ResetGlobalProperties_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool ResetGlobalProperties_request::set_properties(const std::vector<GlobalProperty>& properties_)
-{
-  unsigned int i=properties_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!GlobalPropertyMarshaller::checkIntegrityConst(properties_[i]))   return false;
-  }
-  properties=properties_;
-  return true;
-}
-
-
-
-
-const std::vector<GlobalProperty>& ResetGlobalProperties_request::get_properties(void) const 
-{
-  return properties;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.cpp
deleted file mode 100644
index fc8a853b9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h"
-#include "GlobalPropertyMarshaller.h"
-
-#include "ResetGlobalProperties_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ResetGlobalProperties_requestMarshaller::checkIntegrity(ResetGlobalProperties_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ResetGlobalProperties_requestMarshaller::fromString(const std::string& s,ResetGlobalProperties_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ResetGlobalProperties_requestMarshaller::toString(const ResetGlobalProperties_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ResetGlobalProperties_requestMarshaller::checkIntegrityConst(const ResetGlobalProperties_request& s)
-{
-  {
-    unsigned int i=s.properties.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!GlobalPropertyMarshaller::checkIntegrityConst(s.properties[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value ResetGlobalProperties_requestMarshaller::toJSON(const ResetGlobalProperties_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["properties"]=Json::Value(Json::arrayValue);
-  json["properties"].resize(e.properties.size());
-  for(unsigned int i=0;i<e.properties.size();i++)
-    json["properties"][i]=GlobalPropertyMarshaller::toJSON(e.properties[i]);
-
-  return json;
-}
-
-
-bool ResetGlobalProperties_requestMarshaller::fromJSON(const Json::Value& json,ResetGlobalProperties_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("properties"))  return false;
-    {
-      const Json::Value& j=json["properties"];
-      if(!j.isArray())  return false;
-      for(unsigned int i=0; i<j.size(); i++)
-      {
-        GlobalProperty t;
-        if(GlobalPropertyMarshaller::fromJSON(j[i],t))
-        {
-          c.properties.push_back(t);
-        }
-      }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.h
deleted file mode 100644
index fb08f9713..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_RESETGLOBALPROPERTIES_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_RESETGLOBALPROPERTIES_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ResetGlobalProperties_requestMarshaller
-  {
-    static bool checkIntegrity(ResetGlobalProperties_request& e);
-    static bool checkIntegrityConst(const ResetGlobalProperties_request& e);
-  
-    static bool fromString(const std::string& s,ResetGlobalProperties_request& e);
-    static const std::string toString(const ResetGlobalProperties_request& e);
-  
-    static bool fromJSON(const Json::Value& s,ResetGlobalProperties_request& e);
-    static Json::Value toJSON(const ResetGlobalProperties_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_response.cpp
deleted file mode 100644
index c54df2c5b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h"
-#include "ResetGlobalProperties_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ResetGlobalProperties_response& ResetGlobalProperties_response::operator =(const ResetGlobalProperties_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-ResetGlobalProperties_response::~ResetGlobalProperties_response(void)
-{}
-
-ResetGlobalProperties_response::ResetGlobalProperties_response(const ResetGlobalProperties_response& c)
-{
-    *this = c;
-}
-
-bool ResetGlobalProperties_response::checkIntegrity(void)
-{
-    return ResetGlobalProperties_responseMarshaller::checkIntegrity(*this);
-}
-
-ResetGlobalProperties_response::ResetGlobalProperties_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.cpp
deleted file mode 100644
index ba19bd424..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h"
-#include "ResultMarshaller.h"
-
-#include "ResetGlobalProperties_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ResetGlobalProperties_responseMarshaller::checkIntegrity(ResetGlobalProperties_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ResetGlobalProperties_responseMarshaller::fromString(const std::string& s,ResetGlobalProperties_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ResetGlobalProperties_responseMarshaller::toString(const ResetGlobalProperties_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ResetGlobalProperties_responseMarshaller::checkIntegrityConst(const ResetGlobalProperties_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value ResetGlobalProperties_responseMarshaller::toJSON(const ResetGlobalProperties_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool ResetGlobalProperties_responseMarshaller::fromJSON(const Json::Value& json,ResetGlobalProperties_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.h
deleted file mode 100644
index 0f639fabb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_RESETGLOBALPROPERTIES_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_RESETGLOBALPROPERTIES_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ResetGlobalProperties_responseMarshaller
-  {
-    static bool checkIntegrity(ResetGlobalProperties_response& e);
-    static bool checkIntegrityConst(const ResetGlobalProperties_response& e);
-  
-    static bool fromString(const std::string& s,ResetGlobalProperties_response& e);
-    static const std::string toString(const ResetGlobalProperties_response& e);
-  
-    static bool fromJSON(const Json::Value& s,ResetGlobalProperties_response& e);
-    static Json::Value toJSON(const ResetGlobalProperties_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Result.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Result.cpp
deleted file mode 100644
index ae46b617c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Result.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Result.h"
-#include "ResetGlobalProperties_responseMarshaller.h"
-
-// TODO(AK): remove this after new code generation
-#include "../include/JSONHandler/SDLRPCObjects/V1/Result.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 1;
-}
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-Result::Result() : mInternal(INVALID_ENUM)
-{}
-
-Result::Result(ResultInternal e) : mInternal(e)
-{}
-
-Result::Result(const Result& result)
-{
-    mInternal = result.mInternal;
-}
-
-Result::ResultInternal Result::get(void) const
-{
-    return mInternal;
-}
-void Result::set(ResultInternal e)
-{
-    mInternal = e;
-}
-
-// TODO(AK): remove this after new code generation
-Result::operator NsSmartDeviceLinkRPC::Result()
-{
-    return NsSmartDeviceLinkRPC::Result(
-               static_cast<NsSmartDeviceLinkRPC::Result::ResultInternal>(mInternal));
-}
-
-// TODO(AK): remove this after new code generation
-Result& Result::operator= (const Result& result)
-{
-    mInternal = result.mInternal;
-    return *this;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.cpp
deleted file mode 100644
index cd7d6d1db..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/Result.h"
-#include "ResultMarshaller.h"
-#include "ResultMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const Result::ResultInternal ResultMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return Result::INVALID_ENUM;
-  const struct PerfectHashTable* p=Result_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<Result::ResultInternal>(p->idx) : Result::INVALID_ENUM;
-}
-
-
-bool ResultMarshaller::fromJSON(const Json::Value& s,Result& e)
-{
-  e.mInternal=Result::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=Result::INVALID_ENUM);
-}
-
-
-Json::Value ResultMarshaller::toJSON(const Result& e)
-{
-  if(e.mInternal==Result::INVALID_ENUM)
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool ResultMarshaller::fromString(const std::string& s,Result& e)
-{
-  e.mInternal=Result::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string ResultMarshaller::toString(const Result& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==Result::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable ResultMarshaller::mHashTable[30]=
-{
-  {"SUCCESS",0},
-  {"INVALID_DATA",1},
-  {"UNSUPPORTED_REQUEST",2},
-  {"OUT_OF_MEMORY",3},
-  {"TOO_MANY_PENDING_REQUESTS",4},
-  {"INVALID_ID",5},
-  {"DUPLICATE_NAME",6},
-  {"TOO_MANY_APPLICATIONS",7},
-  {"APPLICATION_REGISTERED_ALREADY",8},
-  {"UNSUPPORTED_VERSION",9},
-  {"WRONG_LANGUAGE",10},
-  {"APPLICATION_NOT_REGISTERED",11},
-  {"IN_USE",12},
-  {"SUBSCRIBED_ALREADY",13},
-  {"REJECTED",14},
-  {"ABORTED",15},
-  {"IGNORED",16},
-  {"UNSUPPORTED_BUTTON",17},
-  {"FILE_NOT_FOUND",18},
-  {"GENERIC_ERROR",19},
-  {"VEHICLE_DATA_NOT_ALLOWED",20},
-  {"VEHICLE_DATA_NOT_AVAILABLE",21},
-  {"DISALLOWED",22},
-  {"USER_DISALLOWED",23},
-  {"TIMED_OUT",24},
-  {"CANCEL_ROUTE",25},
-  {"CLOSED",26},
-  {"ENCRYPTED",27},
-  {"WARNINGS",28},
-  {"RETRY", 29}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp
deleted file mode 100644
index 16fa2d935..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp
+++ /dev/null
@@ -1,46 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name Result_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-SUCCESS,0
-INVALID_DATA,1
-UNSUPPORTED_REQUEST,2
-OUT_OF_MEMORY,3
-TOO_MANY_PENDING_REQUESTS,4
-INVALID_ID,5
-DUPLICATE_NAME,6
-TOO_MANY_APPLICATIONS,7
-APPLICATION_REGISTERED_ALREADY,8
-UNSUPPORTED_VERSION,9
-WRONG_LANGUAGE,10
-APPLICATION_NOT_REGISTERED,11
-IN_USE,12
-SUBSCRIBED_ALREADY,13
-REJECTED,14
-ABORTED,15
-IGNORED,16
-UNSUPPORTED_BUTTON,17
-FILE_NOT_FOUND,18
-GENERIC_ERROR,19
-VEHICLE_DATA_NOT_ALLOWED,20
-VEHICLE_DATA_NOT_AVAILABLE,21
-DISALLOWED,22
-USER_DISALLOWED,23
-TIMED_OUT,24
-CANCEL_ROUTE,25
-CLOSED,26
-ENCRYPTED,27
-WARNINGS,28
-RETRY,29
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.h
deleted file mode 100644
index 0e9212f80..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_RESULTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_RESULTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Result.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for Result
-
-  class ResultMarshaller
-  {
-  public:
-
-    static std::string toName(const Result& e) 	{ return getName(e.mInternal) ?: ""; }
-
-    static bool fromName(Result& e,const std::string& s)
-    {
-      return (e.mInternal=getIndex(s.c_str()))!=Result::INVALID_ENUM;
-    }
-
-    static bool checkIntegrity(Result& e)		{ return e.mInternal!=Result::INVALID_ENUM; }
-    static bool checkIntegrityConst(const Result& e)	{ return e.mInternal!=Result::INVALID_ENUM; }
-
-    static bool fromString(const std::string& s,Result& e);
-    static const std::string toString(const Result& e);
-
-    static bool fromJSON(const Json::Value& s,Result& e);
-    static Json::Value toJSON(const Result& e);
-
-    static const char* getName(Result::ResultInternal e)
-    {
-       return (e>=0 && e<30) ? mHashTable[e].name : NULL;
-    }
-
-    static const Result::ResultInternal getIndex(const char* s);
-
-    static const PerfectHashTable mHashTable[30];
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.inc
deleted file mode 100644
index 310215d55..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.inc
+++ /dev/null
@@ -1,234 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp  */
-/* Computed positions: -k'1,13' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 30
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 30
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 50
-/* maximum key range = 46, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class Result_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Result_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 20,  5, 10,  5, 23,
-       0, 20, 51,  0, 51, 51,  0, 15,  0,  5,
-      51, 51,  0, 10,  0,  0,  5,  5, 51,  0,
-      51, 51, 51, 51, 51,  0, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[12]];
-      /*FALLTHROUGH*/
-      case 12:
-      case 11:
-      case 10:
-      case 9:
-      case 8:
-      case 7:
-      case 6:
-      case 5:
-      case 4:
-      case 3:
-      case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-Result_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  5,  6,  7,  8,  9, 10,  0, 12,  8,
-      14, 10,  6,  7, 13, 19, 15, 21, 12, 18, 19,  0,  0,  7,
-      18, 24, 25, 26,  9, 13, 14,  0,  0,  0,  0, 14,  0,  0,
-       0,  0,  0,  0, 26,  0,  0,  0, 30
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""},
-#line 46 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"RETRY",29},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"IN_USE",12},
-#line 33 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"IGNORED",16},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"REJECTED",14},
-#line 41 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"TIMED_OUT",24},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"INVALID_ID",5},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"INVALID_DATA",1},
-#line 45 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"WARNINGS",28},
-#line 35 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"FILE_NOT_FOUND",18},
-#line 39 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"DISALLOWED",22},
-#line 43 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"CLOSED",26},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"SUCCESS",0},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"OUT_OF_MEMORY",3},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"UNSUPPORTED_REQUEST",2},
-#line 40 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"USER_DISALLOWED",23},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"TOO_MANY_APPLICATIONS",7},
-#line 42 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"CANCEL_ROUTE",25},
-#line 34 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"UNSUPPORTED_BUTTON",17},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"UNSUPPORTED_VERSION",9},
-      {""}, {""},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"ABORTED",15},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"SUBSCRIBED_ALREADY",13},
-#line 37 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"VEHICLE_DATA_NOT_ALLOWED",20},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"TOO_MANY_PENDING_REQUESTS",4},
-#line 38 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"VEHICLE_DATA_NOT_AVAILABLE",21},
-#line 44 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"ENCRYPTED",27},
-#line 36 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"GENERIC_ERROR",19},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"DUPLICATE_NAME",6},
-      {""}, {""}, {""}, {""},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"WRONG_LANGUAGE",10},
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"APPLICATION_NOT_REGISTERED",11},
-      {""}, {""}, {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ResultMarshaller.gp"
-      {"APPLICATION_REGISTERED_ALREADY",8}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.cpp
deleted file mode 100644
index 008bce3e5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/SamplingRate.h"
-#include "SamplingRateMarshaller.h"
-#include "SamplingRateMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const SamplingRate::SamplingRateInternal SamplingRateMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return SamplingRate::INVALID_ENUM;
-  const struct PerfectHashTable* p=SamplingRate_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<SamplingRate::SamplingRateInternal>(p->idx) : SamplingRate::INVALID_ENUM;
-}
-
-
-bool SamplingRateMarshaller::fromJSON(const Json::Value& s,SamplingRate& e)
-{
-  e.mInternal=SamplingRate::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=SamplingRate::INVALID_ENUM);
-}
-
-
-Json::Value SamplingRateMarshaller::toJSON(const SamplingRate& e)
-{
-  if(e.mInternal==SamplingRate::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SamplingRateMarshaller::fromString(const std::string& s,SamplingRate& e)
-{
-  e.mInternal=SamplingRate::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string SamplingRateMarshaller::toString(const SamplingRate& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==SamplingRate::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SamplingRateMarshaller::mHashTable[4]=
-{
-  {"8KHZ",0},
-  {"16KHZ",1},
-  {"22KHZ",2},
-  {"44KHZ",3}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp
deleted file mode 100644
index 19c4cafd4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp
+++ /dev/null
@@ -1,20 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SamplingRate_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-8KHZ,0
-16KHZ,1
-22KHZ,2
-44KHZ,3
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.h
deleted file mode 100644
index 36c17fcbc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SAMPLINGRATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SAMPLINGRATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SamplingRate.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for SamplingRate
-
-  class SamplingRateMarshaller
-  {
-  public:
-  
-    static std::string toName(const SamplingRate& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(SamplingRate& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=SamplingRate::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(SamplingRate& e)		{ return e.mInternal!=SamplingRate::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const SamplingRate& e)	{ return e.mInternal!=SamplingRate::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,SamplingRate& e);
-    static const std::string toString(const SamplingRate& e);
-  
-    static bool fromJSON(const Json::Value& s,SamplingRate& e);
-    static Json::Value toJSON(const SamplingRate& e);
-  
-    static const char* getName(SamplingRate::SamplingRateInternal e)
-    {
-       return (e>=0 && e<4) ? mHashTable[e].name : NULL;
-    }
-  
-    static const SamplingRate::SamplingRateInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[4];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.inc
deleted file mode 100644
index 8a74146ac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.inc
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp  */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 4
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 10
-/* maximum key range = 7, duplicates = 0 */
-
-class SamplingRate_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-SamplingRate_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11,  2,
-       5, 11,  0, 11, 11, 11,  0, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-SamplingRate_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  5,  0,  5,  0,  0,  5
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp"
-      {"8KHZ",0},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp"
-      {"44KHZ",3},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp"
-      {"16KHZ",1},
-      {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SamplingRateMarshaller.gp"
-      {"22KHZ",2}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_request.cpp
deleted file mode 100644
index f0a5290e4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_request.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h"
-#include "ScrollableMessage_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "SoftButtonMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ScrollableMessage_request& ScrollableMessage_request::operator =(const ScrollableMessage_request& c)
-{
-  scrollableMessageBody= c.scrollableMessageBody;
-  timeout= c.timeout ? new unsigned int(c.timeout[0]) : 0;
-  softButtons= c.softButtons ? new std::vector<SoftButton>(c.softButtons[0]) : 0;
-
-  return *this;
-}
-
-
-ScrollableMessage_request::~ScrollableMessage_request(void)
-{
-  if(timeout)
-    delete timeout;
-  if(softButtons)
-    delete softButtons;
-}
-
-
-ScrollableMessage_request::ScrollableMessage_request(const ScrollableMessage_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool ScrollableMessage_request::checkIntegrity(void)
-{
-  return ScrollableMessage_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ScrollableMessage_request::ScrollableMessage_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      timeout(0),
-    softButtons(0)
-{
-}
-
-
-
-bool ScrollableMessage_request::set_scrollableMessageBody(const std::string& scrollableMessageBody_)
-{
-  if(scrollableMessageBody_.length()>500)  return false;
-  scrollableMessageBody=scrollableMessageBody_;
-  return true;
-}
-
-bool ScrollableMessage_request::set_timeout(unsigned int timeout_)
-{
-  if(timeout_>65535)  return false;
-  delete timeout;
-  timeout=0;
-
-  timeout=new unsigned int(timeout_);
-  return true;
-}
-
-void ScrollableMessage_request::reset_timeout(void)
-{
-  if(timeout)
-    delete timeout;
-  timeout=0;
-}
-
-bool ScrollableMessage_request::set_softButtons(const std::vector<SoftButton>& softButtons_)
-{
-  unsigned int i=softButtons_.size();
-  if(i>8 || i<0)  return false;
-  while(i--)
-  {
-    if(!SoftButtonMarshaller::checkIntegrityConst(softButtons_[i]))   return false;
-  }
-  delete softButtons;
-  softButtons=0;
-
-  softButtons=new std::vector<SoftButton>(softButtons_);
-  return true;
-}
-
-void ScrollableMessage_request::reset_softButtons(void)
-{
-  if(softButtons)
-    delete softButtons;
-  softButtons=0;
-}
-
-
-
-
-const std::string& ScrollableMessage_request::get_scrollableMessageBody(void) const 
-{
-  return scrollableMessageBody;
-}
-
-const unsigned int* ScrollableMessage_request::get_timeout(void) const 
-{
-  return timeout;
-}
-
-const std::vector<SoftButton>* ScrollableMessage_request::get_softButtons(void) const 
-{
-  return softButtons;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.cpp
deleted file mode 100644
index b5e923742..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h"
-#include "SoftButtonMarshaller.h"
-
-#include "ScrollableMessage_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ScrollableMessage_requestMarshaller::checkIntegrity(ScrollableMessage_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ScrollableMessage_requestMarshaller::fromString(const std::string& s,ScrollableMessage_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ScrollableMessage_requestMarshaller::toString(const ScrollableMessage_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ScrollableMessage_requestMarshaller::checkIntegrityConst(const ScrollableMessage_request& s)
-{
-  if(s.scrollableMessageBody.length()>500)  return false;
-  if(s.timeout && *s.timeout>65535)  return false;
-  if(s.softButtons)
-  {
-    unsigned int i=s.softButtons[0].size();
-    if(i>8 || i<0)  return false;
-    while(i--)
-    {
-    if(!SoftButtonMarshaller::checkIntegrityConst(s.softButtons[0][i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value ScrollableMessage_requestMarshaller::toJSON(const ScrollableMessage_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["scrollableMessageBody"]=Json::Value(e.scrollableMessageBody);
-
-  if(e.timeout)
-    json["timeout"]=Json::Value(*e.timeout);
-
-  if(e.softButtons)
-  {
-    unsigned int sz=e.softButtons->size();
-    json["softButtons"]=Json::Value(Json::arrayValue);
-    json["softButtons"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["softButtons"][i]=SoftButtonMarshaller::toJSON(e.softButtons[0][i]);
-  }
-
-  return json;
-}
-
-
-bool ScrollableMessage_requestMarshaller::fromJSON(const Json::Value& json,ScrollableMessage_request& c)
-{
-  if(c.timeout)  delete c.timeout;
-  c.timeout=0;
-
-  if(c.softButtons)  delete c.softButtons;
-  c.softButtons=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("scrollableMessageBody"))  return false;
-    {
-      const Json::Value& j=json["scrollableMessageBody"];
-      if(!j.isString())  return false;
-      c.scrollableMessageBody=j.asString();
-    }
-    if(json.isMember("timeout"))
-    {
-      const Json::Value& j=json["timeout"];
-      if(!j.isInt())  return false;
-      c.timeout=new unsigned int(j.asInt());
-    }
-    if(json.isMember("softButtons"))
-    {
-      const Json::Value& j=json["softButtons"];
-      if(!j.isArray())  return false;
-      c.softButtons=new std::vector<SoftButton>();
-      c.softButtons->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        SoftButton t;
-        if(!SoftButtonMarshaller::fromJSON(j[i],t))
-          return false;
-        c.softButtons[0][i]=t;
-      }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.h
deleted file mode 100644
index 5039596ed..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SCROLLABLEMESSAGE_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SCROLLABLEMESSAGE_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ScrollableMessage_requestMarshaller
-  {
-    static bool checkIntegrity(ScrollableMessage_request& e);
-    static bool checkIntegrityConst(const ScrollableMessage_request& e);
-  
-    static bool fromString(const std::string& s,ScrollableMessage_request& e);
-    static const std::string toString(const ScrollableMessage_request& e);
-  
-    static bool fromJSON(const Json::Value& s,ScrollableMessage_request& e);
-    static Json::Value toJSON(const ScrollableMessage_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_response.cpp
deleted file mode 100644
index e49b0fcdc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h"
-#include "ScrollableMessage_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-ScrollableMessage_response& ScrollableMessage_response::operator =(const ScrollableMessage_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-ScrollableMessage_response::~ScrollableMessage_response(void)
-{}
-
-ScrollableMessage_response::ScrollableMessage_response(const ScrollableMessage_response& c)
-{
-    *this = c;
-}
-
-bool ScrollableMessage_response::checkIntegrity(void)
-{
-    return ScrollableMessage_responseMarshaller::checkIntegrity(*this);
-}
-
-ScrollableMessage_response::ScrollableMessage_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.cpp
deleted file mode 100644
index 05895caa8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h"
-#include "ResultMarshaller.h"
-
-#include "ScrollableMessage_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ScrollableMessage_responseMarshaller::checkIntegrity(ScrollableMessage_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ScrollableMessage_responseMarshaller::fromString(const std::string& s,ScrollableMessage_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ScrollableMessage_responseMarshaller::toString(const ScrollableMessage_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ScrollableMessage_responseMarshaller::checkIntegrityConst(const ScrollableMessage_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  return true;
-}
-
-Json::Value ScrollableMessage_responseMarshaller::toJSON(const ScrollableMessage_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  return json;
-}
-
-
-bool ScrollableMessage_responseMarshaller::fromJSON(const Json::Value& json,ScrollableMessage_response& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.h
deleted file mode 100644
index efab3e398..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SCROLLABLEMESSAGE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SCROLLABLEMESSAGE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ScrollableMessage_responseMarshaller
-  {
-    static bool checkIntegrity(ScrollableMessage_response& e);
-    static bool checkIntegrityConst(const ScrollableMessage_response& e);
-  
-    static bool fromString(const std::string& s,ScrollableMessage_response& e);
-    static const std::string toString(const ScrollableMessage_response& e);
-  
-    static bool fromJSON(const Json::Value& s,ScrollableMessage_response& e);
-    static Json::Value toJSON(const ScrollableMessage_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_request.cpp
deleted file mode 100644
index 4bce103d1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_request.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h"
-#include "SetAppIcon_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SetAppIcon_request::~SetAppIcon_request(void)
-{
-}
-
-
-SetAppIcon_request::SetAppIcon_request(const SetAppIcon_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool SetAppIcon_request::checkIntegrity(void)
-{
-  return SetAppIcon_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SetAppIcon_request::SetAppIcon_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool SetAppIcon_request::set_syncFileName(const std::string& syncFileName_)
-{
-  if(syncFileName_.length()>500)  return false;
-  syncFileName=syncFileName_;
-  return true;
-}
-
-
-
-
-const std::string& SetAppIcon_request::get_syncFileName(void) const 
-{
-  return syncFileName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.cpp
deleted file mode 100644
index 149d4c9d9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h"
-
-
-#include "SetAppIcon_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetAppIcon_requestMarshaller::checkIntegrity(SetAppIcon_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetAppIcon_requestMarshaller::fromString(const std::string& s,SetAppIcon_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetAppIcon_requestMarshaller::toString(const SetAppIcon_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetAppIcon_requestMarshaller::checkIntegrityConst(const SetAppIcon_request& s)
-{
-  if(s.syncFileName.length()>500)  return false;
-  return true;
-}
-
-Json::Value SetAppIcon_requestMarshaller::toJSON(const SetAppIcon_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["syncFileName"]=Json::Value(e.syncFileName);
-
-  return json;
-}
-
-
-bool SetAppIcon_requestMarshaller::fromJSON(const Json::Value& json,SetAppIcon_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("syncFileName"))  return false;
-    {
-      const Json::Value& j=json["syncFileName"];
-      if(!j.isString())  return false;
-      c.syncFileName=j.asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.h
deleted file mode 100644
index 7f1b7c65f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETAPPICON_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETAPPICON_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SetAppIcon_requestMarshaller
-  {
-    static bool checkIntegrity(SetAppIcon_request& e);
-    static bool checkIntegrityConst(const SetAppIcon_request& e);
-  
-    static bool fromString(const std::string& s,SetAppIcon_request& e);
-    static const std::string toString(const SetAppIcon_request& e);
-  
-    static bool fromJSON(const Json::Value& s,SetAppIcon_request& e);
-    static Json::Value toJSON(const SetAppIcon_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_response.cpp
deleted file mode 100644
index 6186216b3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h"
-#include "SetAppIcon_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SetAppIcon_response& SetAppIcon_response::operator =(const SetAppIcon_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-SetAppIcon_response::~SetAppIcon_response(void)
-{}
-
-SetAppIcon_response::SetAppIcon_response(const SetAppIcon_response& c)
-{
-    *this = c;
-}
-
-bool SetAppIcon_response::checkIntegrity(void)
-{
-    return SetAppIcon_responseMarshaller::checkIntegrity(*this);
-}
-
-SetAppIcon_response::SetAppIcon_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.cpp
deleted file mode 100644
index 40b944378..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h"
-#include "ResultMarshaller.h"
-
-#include "SetAppIcon_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetAppIcon_responseMarshaller::checkIntegrity(SetAppIcon_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetAppIcon_responseMarshaller::fromString(const std::string& s,SetAppIcon_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetAppIcon_responseMarshaller::toString(const SetAppIcon_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetAppIcon_responseMarshaller::checkIntegrityConst(const SetAppIcon_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value SetAppIcon_responseMarshaller::toJSON(const SetAppIcon_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool SetAppIcon_responseMarshaller::fromJSON(const Json::Value& json,SetAppIcon_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.h
deleted file mode 100644
index 7af2b0adf..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETAPPICON_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETAPPICON_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SetAppIcon_responseMarshaller
-  {
-    static bool checkIntegrity(SetAppIcon_response& e);
-    static bool checkIntegrityConst(const SetAppIcon_response& e);
-  
-    static bool fromString(const std::string& s,SetAppIcon_response& e);
-    static const std::string toString(const SetAppIcon_response& e);
-  
-    static bool fromJSON(const Json::Value& s,SetAppIcon_response& e);
-    static Json::Value toJSON(const SetAppIcon_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_request.cpp
deleted file mode 100644
index dfa9d2190..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_request.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h"
-#include "SetDisplayLayout_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SetDisplayLayout_request::~SetDisplayLayout_request(void)
-{
-}
-
-
-SetDisplayLayout_request::SetDisplayLayout_request(const SetDisplayLayout_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool SetDisplayLayout_request::checkIntegrity(void)
-{
-  return SetDisplayLayout_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SetDisplayLayout_request::SetDisplayLayout_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool SetDisplayLayout_request::set_displayLayout(const std::string& displayLayout_)
-{
-  displayLayout=displayLayout_;
-  return true;
-}
-
-
-
-
-const std::string& SetDisplayLayout_request::get_displayLayout(void) const 
-{
-  return displayLayout;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.cpp
deleted file mode 100644
index 955f03cad..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h"
-
-
-#include "SetDisplayLayout_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetDisplayLayout_requestMarshaller::checkIntegrity(SetDisplayLayout_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetDisplayLayout_requestMarshaller::fromString(const std::string& s,SetDisplayLayout_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetDisplayLayout_requestMarshaller::toString(const SetDisplayLayout_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetDisplayLayout_requestMarshaller::checkIntegrityConst(const SetDisplayLayout_request& s)
-{
-  return true;
-}
-
-Json::Value SetDisplayLayout_requestMarshaller::toJSON(const SetDisplayLayout_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["displayLayout"]=Json::Value(e.displayLayout);
-
-  return json;
-}
-
-
-bool SetDisplayLayout_requestMarshaller::fromJSON(const Json::Value& json,SetDisplayLayout_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("displayLayout"))  return false;
-    {
-      const Json::Value& j=json["displayLayout"];
-      if(!j.isString())  return false;
-      c.displayLayout=j.asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.h
deleted file mode 100644
index 1ac3cb412..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETDISPLAYLAYOUT_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETDISPLAYLAYOUT_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SetDisplayLayout_requestMarshaller
-  {
-    static bool checkIntegrity(SetDisplayLayout_request& e);
-    static bool checkIntegrityConst(const SetDisplayLayout_request& e);
-  
-    static bool fromString(const std::string& s,SetDisplayLayout_request& e);
-    static const std::string toString(const SetDisplayLayout_request& e);
-  
-    static bool fromJSON(const Json::Value& s,SetDisplayLayout_request& e);
-    static Json::Value toJSON(const SetDisplayLayout_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_response.cpp
deleted file mode 100644
index 6c5dcc011..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_response.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h"
-#include "SetDisplayLayout_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SetDisplayLayout_response& SetDisplayLayout_response::operator =(const SetDisplayLayout_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-
-SetDisplayLayout_response::~SetDisplayLayout_response(void)
-{}
-
-
-SetDisplayLayout_response::SetDisplayLayout_response(const SetDisplayLayout_response& c)
-{
-    *this = c;
-}
-
-bool SetDisplayLayout_response::checkIntegrity(void)
-{
-    return SetDisplayLayout_responseMarshaller::checkIntegrity(*this);
-}
-
-SetDisplayLayout_response::SetDisplayLayout_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.cpp
deleted file mode 100644
index 38e98195d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h"
-#include "ResultMarshaller.h"
-
-#include "SetDisplayLayout_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetDisplayLayout_responseMarshaller::checkIntegrity(SetDisplayLayout_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetDisplayLayout_responseMarshaller::fromString(const std::string& s,SetDisplayLayout_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetDisplayLayout_responseMarshaller::toString(const SetDisplayLayout_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetDisplayLayout_responseMarshaller::checkIntegrityConst(const SetDisplayLayout_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value SetDisplayLayout_responseMarshaller::toJSON(const SetDisplayLayout_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool SetDisplayLayout_responseMarshaller::fromJSON(const Json::Value& json,SetDisplayLayout_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.h
deleted file mode 100644
index c3b423675..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETDISPLAYLAYOUT_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETDISPLAYLAYOUT_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SetDisplayLayout_responseMarshaller
-  {
-    static bool checkIntegrity(SetDisplayLayout_response& e);
-    static bool checkIntegrityConst(const SetDisplayLayout_response& e);
-  
-    static bool fromString(const std::string& s,SetDisplayLayout_response& e);
-    static const std::string toString(const SetDisplayLayout_response& e);
-  
-    static bool fromJSON(const Json::Value& s,SetDisplayLayout_response& e);
-    static Json::Value toJSON(const SetDisplayLayout_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_request.cpp
deleted file mode 100644
index cc35f2511..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_request.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h"
-#include "SetGlobalProperties_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "TTSChunkMarshaller.h"
-#include "VrHelpItemMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SetGlobalProperties_request& SetGlobalProperties_request::operator =(const SetGlobalProperties_request& c)
-{
-  helpPrompt= c.helpPrompt ? new std::vector<TTSChunk>(c.helpPrompt[0]) : 0;
-  timeoutPrompt= c.timeoutPrompt ? new std::vector<TTSChunk>(c.timeoutPrompt[0]) : 0;
-  vrHelpTitle= c.vrHelpTitle ? new std::string(c.vrHelpTitle[0]) : 0;
-  vrHelp= c.vrHelp ? new std::vector<VrHelpItem>(c.vrHelp[0]) : 0;
-
-  return *this;
-}
-
-
-SetGlobalProperties_request::~SetGlobalProperties_request(void)
-{
-  if(helpPrompt)
-    delete helpPrompt;
-  if(timeoutPrompt)
-    delete timeoutPrompt;
-  if(vrHelpTitle)
-    delete vrHelpTitle;
-  if(vrHelp)
-    delete vrHelp;
-}
-
-
-SetGlobalProperties_request::SetGlobalProperties_request(const SetGlobalProperties_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool SetGlobalProperties_request::checkIntegrity(void)
-{
-  return SetGlobalProperties_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SetGlobalProperties_request::SetGlobalProperties_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      helpPrompt(0),
-    timeoutPrompt(0),
-    vrHelpTitle(0),
-    vrHelp(0)
-{
-}
-
-
-
-bool SetGlobalProperties_request::set_helpPrompt(const std::vector<TTSChunk>& helpPrompt_)
-{
-  unsigned int i=helpPrompt_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(helpPrompt_[i]))   return false;
-  }
-  delete helpPrompt;
-  helpPrompt=0;
-
-  helpPrompt=new std::vector<TTSChunk>(helpPrompt_);
-  return true;
-}
-
-void SetGlobalProperties_request::reset_helpPrompt(void)
-{
-  if(helpPrompt)
-    delete helpPrompt;
-  helpPrompt=0;
-}
-
-bool SetGlobalProperties_request::set_timeoutPrompt(const std::vector<TTSChunk>& timeoutPrompt_)
-{
-  unsigned int i=timeoutPrompt_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(timeoutPrompt_[i]))   return false;
-  }
-  delete timeoutPrompt;
-  timeoutPrompt=0;
-
-  timeoutPrompt=new std::vector<TTSChunk>(timeoutPrompt_);
-  return true;
-}
-
-void SetGlobalProperties_request::reset_timeoutPrompt(void)
-{
-  if(timeoutPrompt)
-    delete timeoutPrompt;
-  timeoutPrompt=0;
-}
-
-bool SetGlobalProperties_request::set_vrHelpTitle(const std::string& vrHelpTitle_)
-{
-  if(vrHelpTitle_.length()>500)  return false;
-  delete vrHelpTitle;
-  vrHelpTitle=0;
-
-  vrHelpTitle=new std::string(vrHelpTitle_);
-  return true;
-}
-
-void SetGlobalProperties_request::reset_vrHelpTitle(void)
-{
-  if(vrHelpTitle)
-    delete vrHelpTitle;
-  vrHelpTitle=0;
-}
-
-bool SetGlobalProperties_request::set_vrHelp(const std::vector<VrHelpItem>& vrHelp_)
-{
-  unsigned int i=vrHelp_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!VrHelpItemMarshaller::checkIntegrityConst(vrHelp_[i]))   return false;
-  }
-  delete vrHelp;
-  vrHelp=0;
-
-  vrHelp=new std::vector<VrHelpItem>(vrHelp_);
-  return true;
-}
-
-void SetGlobalProperties_request::reset_vrHelp(void)
-{
-  if(vrHelp)
-    delete vrHelp;
-  vrHelp=0;
-}
-
-
-
-
-const std::vector<TTSChunk>* SetGlobalProperties_request::get_helpPrompt(void) const 
-{
-  return helpPrompt;
-}
-
-const std::vector<TTSChunk>* SetGlobalProperties_request::get_timeoutPrompt(void) const 
-{
-  return timeoutPrompt;
-}
-
-const std::string* SetGlobalProperties_request::get_vrHelpTitle(void) const 
-{
-  return vrHelpTitle;
-}
-
-const std::vector<VrHelpItem>* SetGlobalProperties_request::get_vrHelp(void) const 
-{
-  return vrHelp;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.cpp
deleted file mode 100644
index 2d98fa3c5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h"
-#include "TTSChunkMarshaller.h"
-#include "VrHelpItemMarshaller.h"
-
-#include "SetGlobalProperties_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetGlobalProperties_requestMarshaller::checkIntegrity(SetGlobalProperties_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetGlobalProperties_requestMarshaller::fromString(const std::string& s,SetGlobalProperties_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetGlobalProperties_requestMarshaller::toString(const SetGlobalProperties_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetGlobalProperties_requestMarshaller::checkIntegrityConst(const SetGlobalProperties_request& s)
-{
-  if(s.helpPrompt)
-  {
-    unsigned int i=s.helpPrompt[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.helpPrompt[0][i]))   return false;
-    }
-  }
-  if(s.timeoutPrompt)
-  {
-    unsigned int i=s.timeoutPrompt[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.timeoutPrompt[0][i]))   return false;
-    }
-  }
-  if(s.vrHelpTitle && s.vrHelpTitle->length()>500)  return false;
-  if(s.vrHelp)
-  {
-    unsigned int i=s.vrHelp[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!VrHelpItemMarshaller::checkIntegrityConst(s.vrHelp[0][i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value SetGlobalProperties_requestMarshaller::toJSON(const SetGlobalProperties_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  if(e.helpPrompt)
-  {
-    unsigned int sz=e.helpPrompt->size();
-    json["helpPrompt"]=Json::Value(Json::arrayValue);
-    json["helpPrompt"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["helpPrompt"][i]=TTSChunkMarshaller::toJSON(e.helpPrompt[0][i]);
-  }
-
-  if(e.timeoutPrompt)
-  {
-    unsigned int sz=e.timeoutPrompt->size();
-    json["timeoutPrompt"]=Json::Value(Json::arrayValue);
-    json["timeoutPrompt"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["timeoutPrompt"][i]=TTSChunkMarshaller::toJSON(e.timeoutPrompt[0][i]);
-  }
-
-  if(e.vrHelpTitle)
-    json["vrHelpTitle"]=Json::Value(*e.vrHelpTitle);
-
-  if(e.vrHelp)
-  {
-    unsigned int sz=e.vrHelp->size();
-    json["vrHelp"]=Json::Value(Json::arrayValue);
-    json["vrHelp"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["vrHelp"][i]=VrHelpItemMarshaller::toJSON(e.vrHelp[0][i]);
-  }
-
-  return json;
-}
-
-
-bool SetGlobalProperties_requestMarshaller::fromJSON(const Json::Value& json,SetGlobalProperties_request& c)
-{
-  if(c.helpPrompt)  delete c.helpPrompt;
-  c.helpPrompt=0;
-
-  if(c.timeoutPrompt)  delete c.timeoutPrompt;
-  c.timeoutPrompt=0;
-
-  if(c.vrHelpTitle)  delete c.vrHelpTitle;
-  c.vrHelpTitle=0;
-
-  if(c.vrHelp)  delete c.vrHelp;
-  c.vrHelp=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(json.isMember("helpPrompt"))
-    {
-      const Json::Value& j=json["helpPrompt"];
-      if(!j.isArray())  return false;
-      c.helpPrompt=new std::vector<TTSChunk>();
-      c.helpPrompt->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        TTSChunk t;
-        if(!TTSChunkMarshaller::fromJSON(j[i],t))
-          return false;
-        c.helpPrompt[0][i]=t;
-      }
-
-    }
-    if(json.isMember("timeoutPrompt"))
-    {
-      const Json::Value& j=json["timeoutPrompt"];
-      if(!j.isArray())  return false;
-      c.timeoutPrompt=new std::vector<TTSChunk>();
-      c.timeoutPrompt->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        TTSChunk t;
-        if(!TTSChunkMarshaller::fromJSON(j[i],t))
-          return false;
-        c.timeoutPrompt[0][i]=t;
-      }
-
-    }
-    if(json.isMember("vrHelpTitle"))
-    {
-      const Json::Value& j=json["vrHelpTitle"];
-      if(!j.isString())  return false;
-      c.vrHelpTitle=new std::string(j.asString());
-    }
-    if(json.isMember("vrHelp"))
-    {
-      const Json::Value& j=json["vrHelp"];
-      if(!j.isArray())  return false;
-      c.vrHelp=new std::vector<VrHelpItem>();
-      c.vrHelp->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        VrHelpItem t;
-        if(!VrHelpItemMarshaller::fromJSON(j[i],t))
-          return false;
-        c.vrHelp[0][i]=t;
-      }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.h
deleted file mode 100644
index c5d884e2f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETGLOBALPROPERTIES_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETGLOBALPROPERTIES_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SetGlobalProperties_requestMarshaller
-  {
-    static bool checkIntegrity(SetGlobalProperties_request& e);
-    static bool checkIntegrityConst(const SetGlobalProperties_request& e);
-  
-    static bool fromString(const std::string& s,SetGlobalProperties_request& e);
-    static const std::string toString(const SetGlobalProperties_request& e);
-  
-    static bool fromJSON(const Json::Value& s,SetGlobalProperties_request& e);
-    static Json::Value toJSON(const SetGlobalProperties_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_response.cpp
deleted file mode 100644
index ec636a05f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h"
-#include "SetGlobalProperties_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SetGlobalProperties_response& SetGlobalProperties_response::operator =(const SetGlobalProperties_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-SetGlobalProperties_response::~SetGlobalProperties_response(void)
-{}
-
-SetGlobalProperties_response::SetGlobalProperties_response(const SetGlobalProperties_response& c)
-{
-    *this = c;
-}
-
-bool SetGlobalProperties_response::checkIntegrity(void)
-{
-    return SetGlobalProperties_responseMarshaller::checkIntegrity(*this);
-}
-
-SetGlobalProperties_response::SetGlobalProperties_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.cpp
deleted file mode 100644
index 5f7d188d0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h"
-#include "ResultMarshaller.h"
-
-#include "SetGlobalProperties_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetGlobalProperties_responseMarshaller::checkIntegrity(SetGlobalProperties_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetGlobalProperties_responseMarshaller::fromString(const std::string& s,SetGlobalProperties_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetGlobalProperties_responseMarshaller::toString(const SetGlobalProperties_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetGlobalProperties_responseMarshaller::checkIntegrityConst(const SetGlobalProperties_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value SetGlobalProperties_responseMarshaller::toJSON(const SetGlobalProperties_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool SetGlobalProperties_responseMarshaller::fromJSON(const Json::Value& json,SetGlobalProperties_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.h
deleted file mode 100644
index ace55e9f8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETGLOBALPROPERTIES_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETGLOBALPROPERTIES_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SetGlobalProperties_responseMarshaller
-  {
-    static bool checkIntegrity(SetGlobalProperties_response& e);
-    static bool checkIntegrityConst(const SetGlobalProperties_response& e);
-  
-    static bool fromString(const std::string& s,SetGlobalProperties_response& e);
-    static const std::string toString(const SetGlobalProperties_response& e);
-  
-    static bool fromJSON(const Json::Value& s,SetGlobalProperties_response& e);
-    static Json::Value toJSON(const SetGlobalProperties_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_request.cpp
deleted file mode 100644
index c338a3134..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_request.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h"
-#include "SetMediaClockTimer_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "StartTimeMarshaller.h"
-#include "UpdateModeMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SetMediaClockTimer_request& SetMediaClockTimer_request::operator =(const SetMediaClockTimer_request& c)
-{
-  startTime= c.startTime ? new StartTime(c.startTime[0]) : 0;
-  updateMode= c.updateMode;
-
-  return *this;
-}
-
-
-SetMediaClockTimer_request::~SetMediaClockTimer_request(void)
-{
-  if(startTime)
-    delete startTime;
-}
-
-
-SetMediaClockTimer_request::SetMediaClockTimer_request(const SetMediaClockTimer_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool SetMediaClockTimer_request::checkIntegrity(void)
-{
-  return SetMediaClockTimer_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SetMediaClockTimer_request::SetMediaClockTimer_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      startTime(0)
-{
-}
-
-
-
-bool SetMediaClockTimer_request::set_startTime(const StartTime& startTime_)
-{
-  if(!StartTimeMarshaller::checkIntegrityConst(startTime_))   return false;
-  delete startTime;
-  startTime=0;
-
-  startTime=new StartTime(startTime_);
-  return true;
-}
-
-void SetMediaClockTimer_request::reset_startTime(void)
-{
-  if(startTime)
-    delete startTime;
-  startTime=0;
-}
-
-bool SetMediaClockTimer_request::set_updateMode(const UpdateMode& updateMode_)
-{
-  if(!UpdateModeMarshaller::checkIntegrityConst(updateMode_))   return false;
-  updateMode=updateMode_;
-  return true;
-}
-
-
-
-
-const StartTime* SetMediaClockTimer_request::get_startTime(void) const 
-{
-  return startTime;
-}
-
-const UpdateMode& SetMediaClockTimer_request::get_updateMode(void) const 
-{
-  return updateMode;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.cpp
deleted file mode 100644
index 84acf6e4a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h"
-#include "StartTimeMarshaller.h"
-#include "UpdateModeMarshaller.h"
-
-#include "SetMediaClockTimer_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetMediaClockTimer_requestMarshaller::checkIntegrity(SetMediaClockTimer_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetMediaClockTimer_requestMarshaller::fromString(const std::string& s,SetMediaClockTimer_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetMediaClockTimer_requestMarshaller::toString(const SetMediaClockTimer_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetMediaClockTimer_requestMarshaller::checkIntegrityConst(const SetMediaClockTimer_request& s)
-{
-  if(s.startTime && !StartTimeMarshaller::checkIntegrityConst(*s.startTime))  return false;
-  if(!UpdateModeMarshaller::checkIntegrityConst(s.updateMode))  return false;
-  return true;
-}
-
-Json::Value SetMediaClockTimer_requestMarshaller::toJSON(const SetMediaClockTimer_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  if(e.startTime)
-    json["startTime"]=StartTimeMarshaller::toJSON(*e.startTime);
-
-  json["updateMode"]=UpdateModeMarshaller::toJSON(e.updateMode);
-
-  return json;
-}
-
-
-bool SetMediaClockTimer_requestMarshaller::fromJSON(const Json::Value& json,SetMediaClockTimer_request& c)
-{
-  if(c.startTime)  delete c.startTime;
-  c.startTime=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(json.isMember("startTime"))
-    {
-      const Json::Value& j=json["startTime"];
-      c.startTime=new StartTime();
-      if(!StartTimeMarshaller::fromJSON(j,c.startTime[0]))
-        return false;
-    }
-    if(!json.isMember("updateMode"))  return false;
-    {
-      const Json::Value& j=json["updateMode"];
-      if(!UpdateModeMarshaller::fromJSON(j,c.updateMode))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.h
deleted file mode 100644
index 9512edfba..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETMEDIACLOCKTIMER_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETMEDIACLOCKTIMER_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SetMediaClockTimer_requestMarshaller
-  {
-    static bool checkIntegrity(SetMediaClockTimer_request& e);
-    static bool checkIntegrityConst(const SetMediaClockTimer_request& e);
-  
-    static bool fromString(const std::string& s,SetMediaClockTimer_request& e);
-    static const std::string toString(const SetMediaClockTimer_request& e);
-  
-    static bool fromJSON(const Json::Value& s,SetMediaClockTimer_request& e);
-    static Json::Value toJSON(const SetMediaClockTimer_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_response.cpp
deleted file mode 100644
index 0367f6a24..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h"
-#include "SetMediaClockTimer_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SetMediaClockTimer_response& SetMediaClockTimer_response::operator =(const SetMediaClockTimer_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-SetMediaClockTimer_response::~SetMediaClockTimer_response(void)
-{}
-
-SetMediaClockTimer_response::SetMediaClockTimer_response(const SetMediaClockTimer_response& c)
-{
-    *this = c;
-}
-
-bool SetMediaClockTimer_response::checkIntegrity(void)
-{
-    return SetMediaClockTimer_responseMarshaller::checkIntegrity(*this);
-}
-
-SetMediaClockTimer_response::SetMediaClockTimer_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.cpp
deleted file mode 100644
index d4309d168..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h"
-#include "ResultMarshaller.h"
-
-#include "SetMediaClockTimer_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SetMediaClockTimer_responseMarshaller::checkIntegrity(SetMediaClockTimer_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SetMediaClockTimer_responseMarshaller::fromString(const std::string& s,SetMediaClockTimer_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SetMediaClockTimer_responseMarshaller::toString(const SetMediaClockTimer_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SetMediaClockTimer_responseMarshaller::checkIntegrityConst(const SetMediaClockTimer_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value SetMediaClockTimer_responseMarshaller::toJSON(const SetMediaClockTimer_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool SetMediaClockTimer_responseMarshaller::fromJSON(const Json::Value& json,SetMediaClockTimer_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.h
deleted file mode 100644
index c18001fbd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SETMEDIACLOCKTIMER_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SETMEDIACLOCKTIMER_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SetMediaClockTimer_responseMarshaller
-  {
-    static bool checkIntegrity(SetMediaClockTimer_response& e);
-    static bool checkIntegrityConst(const SetMediaClockTimer_response& e);
-  
-    static bool fromString(const std::string& s,SetMediaClockTimer_response& e);
-    static const std::string toString(const SetMediaClockTimer_response& e);
-  
-    static bool fromJSON(const Json::Value& s,SetMediaClockTimer_response& e);
-    static Json::Value toJSON(const SetMediaClockTimer_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_request.cpp
deleted file mode 100644
index 38896f853..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_request.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h"
-#include "ShowConstantTBT_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ImageMarshaller.h"
-#include "SoftButtonMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ShowConstantTBT_request& ShowConstantTBT_request::operator =(const ShowConstantTBT_request& c)
-{
-  navigationText1= c.navigationText1 ? new std::string(c.navigationText1[0]) : 0;
-  navigationText2= c.navigationText2 ? new std::string(c.navigationText2[0]) : 0;
-  eta= c.eta ? new std::string(c.eta[0]) : 0;
-  totalDistance= c.totalDistance ? new std::string(c.totalDistance[0]) : 0;
-  turnIcon= c.turnIcon;
-  distanceToManeuver= c.distanceToManeuver;
-  distanceToManeuverScale= c.distanceToManeuverScale;
-  maneuverComplete= c.maneuverComplete ? new bool(c.maneuverComplete[0]) : 0;
-  softButtons= c.softButtons;
-
-  return *this;
-}
-
-
-ShowConstantTBT_request::~ShowConstantTBT_request(void)
-{
-  if(navigationText1)
-    delete navigationText1;
-  if(navigationText2)
-    delete navigationText2;
-  if(eta)
-    delete eta;
-  if(totalDistance)
-    delete totalDistance;
-  if(maneuverComplete)
-    delete maneuverComplete;
-}
-
-
-ShowConstantTBT_request::ShowConstantTBT_request(const ShowConstantTBT_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool ShowConstantTBT_request::checkIntegrity(void)
-{
-  return ShowConstantTBT_requestMarshaller::checkIntegrity(*this);
-}
-
-
-ShowConstantTBT_request::ShowConstantTBT_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      navigationText1(0),
-    navigationText2(0),
-    eta(0),
-    totalDistance(0),
-    maneuverComplete(0)
-{
-}
-
-
-
-bool ShowConstantTBT_request::set_navigationText1(const std::string& navigationText1_)
-{
-  if(navigationText1_.length()>500)  return false;
-  delete navigationText1;
-  navigationText1=0;
-
-  navigationText1=new std::string(navigationText1_);
-  return true;
-}
-
-void ShowConstantTBT_request::reset_navigationText1(void)
-{
-  if(navigationText1)
-    delete navigationText1;
-  navigationText1=0;
-}
-
-bool ShowConstantTBT_request::set_navigationText2(const std::string& navigationText2_)
-{
-  if(navigationText2_.length()>500)  return false;
-  delete navigationText2;
-  navigationText2=0;
-
-  navigationText2=new std::string(navigationText2_);
-  return true;
-}
-
-void ShowConstantTBT_request::reset_navigationText2(void)
-{
-  if(navigationText2)
-    delete navigationText2;
-  navigationText2=0;
-}
-
-bool ShowConstantTBT_request::set_eta(const std::string& eta_)
-{
-  if(eta_.length()>500)  return false;
-  delete eta;
-  eta=0;
-
-  eta=new std::string(eta_);
-  return true;
-}
-
-void ShowConstantTBT_request::reset_eta(void)
-{
-  if(eta)
-    delete eta;
-  eta=0;
-}
-
-bool ShowConstantTBT_request::set_totalDistance(const std::string& totalDistance_)
-{
-  if(totalDistance_.length()>500)  return false;
-  delete totalDistance;
-  totalDistance=0;
-
-  totalDistance=new std::string(totalDistance_);
-  return true;
-}
-
-void ShowConstantTBT_request::reset_totalDistance(void)
-{
-  if(totalDistance)
-    delete totalDistance;
-  totalDistance=0;
-}
-
-bool ShowConstantTBT_request::set_turnIcon(const Image& turnIcon_)
-{
-  if(!ImageMarshaller::checkIntegrityConst(turnIcon_))   return false;
-  turnIcon=turnIcon_;
-  return true;
-}
-
-bool ShowConstantTBT_request::set_distanceToManeuver(float distanceToManeuver_)
-{
-  if(distanceToManeuver_>1000000000)  return false;
-  if(distanceToManeuver_<0)  return false;
-  distanceToManeuver=distanceToManeuver_;
-  return true;
-}
-
-bool ShowConstantTBT_request::set_distanceToManeuverScale(float distanceToManeuverScale_)
-{
-  if(distanceToManeuverScale_>1000000000)  return false;
-  if(distanceToManeuverScale_<0)  return false;
-  distanceToManeuverScale=distanceToManeuverScale_;
-  return true;
-}
-
-bool ShowConstantTBT_request::set_maneuverComplete(bool maneuverComplete_)
-{
-  delete maneuverComplete;
-  maneuverComplete=0;
-
-  maneuverComplete=new bool(maneuverComplete_);
-  return true;
-}
-
-void ShowConstantTBT_request::reset_maneuverComplete(void)
-{
-  if(maneuverComplete)
-    delete maneuverComplete;
-  maneuverComplete=0;
-}
-
-bool ShowConstantTBT_request::set_softButtons(const std::vector<SoftButton>& softButtons_)
-{
-  unsigned int i=softButtons_.size();
-  if(i>3 || i<0)  return false;
-  while(i--)
-  {
-    if(!SoftButtonMarshaller::checkIntegrityConst(softButtons_[i]))   return false;
-  }
-  softButtons=softButtons_;
-  return true;
-}
-
-
-
-
-const std::string* ShowConstantTBT_request::get_navigationText1(void) const 
-{
-  return navigationText1;
-}
-
-const std::string* ShowConstantTBT_request::get_navigationText2(void) const 
-{
-  return navigationText2;
-}
-
-const std::string* ShowConstantTBT_request::get_eta(void) const 
-{
-  return eta;
-}
-
-const std::string* ShowConstantTBT_request::get_totalDistance(void) const 
-{
-  return totalDistance;
-}
-
-const Image& ShowConstantTBT_request::get_turnIcon(void) const 
-{
-  return turnIcon;
-}
-
-float ShowConstantTBT_request::get_distanceToManeuver(void) const
-{
-  return distanceToManeuver;
-}
-
-float ShowConstantTBT_request::get_distanceToManeuverScale(void) const
-{
-  return distanceToManeuverScale;
-}
-
-const bool* ShowConstantTBT_request::get_maneuverComplete(void) const 
-{
-  return maneuverComplete;
-}
-
-const std::vector<SoftButton>& ShowConstantTBT_request::get_softButtons(void) const 
-{
-  return softButtons;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.cpp
deleted file mode 100644
index 4ccb3959b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h"
-#include "ImageMarshaller.h"
-#include "SoftButtonMarshaller.h"
-
-#include "ShowConstantTBT_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ShowConstantTBT_requestMarshaller::checkIntegrity(ShowConstantTBT_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ShowConstantTBT_requestMarshaller::fromString(const std::string& s,ShowConstantTBT_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ShowConstantTBT_requestMarshaller::toString(const ShowConstantTBT_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ShowConstantTBT_requestMarshaller::checkIntegrityConst(const ShowConstantTBT_request& s)
-{
-  if(s.navigationText1 && s.navigationText1->length()>500)  return false;
-  if(s.navigationText2 && s.navigationText2->length()>500)  return false;
-  if(s.eta && s.eta->length()>500)  return false;
-  if(s.totalDistance && s.totalDistance->length()>500)  return false;
-  if(!ImageMarshaller::checkIntegrityConst(s.turnIcon))  return false;
-  if(s.distanceToManeuver>1000000000)  return false;
-  if(s.distanceToManeuver<0)  return false;
-  if(s.distanceToManeuverScale>1000000000)  return false;
-  if(s.distanceToManeuverScale<0)  return false;
-  {
-    unsigned int i=s.softButtons.size();
-    if(i>3 || i<0)  return false;
-    while(i--)
-    {
-    if(!SoftButtonMarshaller::checkIntegrityConst(s.softButtons[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value ShowConstantTBT_requestMarshaller::toJSON(const ShowConstantTBT_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  if(e.navigationText1)
-    json["navigationText1"]=Json::Value(*e.navigationText1);
-
-  if(e.navigationText2)
-    json["navigationText2"]=Json::Value(*e.navigationText2);
-
-  if(e.eta)
-    json["eta"]=Json::Value(*e.eta);
-
-  if(e.totalDistance)
-    json["totalDistance"]=Json::Value(*e.totalDistance);
-
-  json["turnIcon"]=ImageMarshaller::toJSON(e.turnIcon);
-
-  json["distanceToManeuver"]=Json::Value(e.distanceToManeuver);
-
-  json["distanceToManeuverScale"]=Json::Value(e.distanceToManeuverScale);
-
-  if(e.maneuverComplete)
-    json["maneuverComplete"]=Json::Value(*e.maneuverComplete);
-
-  json["softButtons"]=Json::Value(Json::arrayValue);
-  json["softButtons"].resize(e.softButtons.size());
-  for(unsigned int i=0;i<e.softButtons.size();i++)
-    json["softButtons"][i]=SoftButtonMarshaller::toJSON(e.softButtons[i]);
-
-  return json;
-}
-
-
-bool ShowConstantTBT_requestMarshaller::fromJSON(const Json::Value& json,ShowConstantTBT_request& c)
-{
-  if(c.navigationText1)  delete c.navigationText1;
-  c.navigationText1=0;
-
-  if(c.navigationText2)  delete c.navigationText2;
-  c.navigationText2=0;
-
-  if(c.eta)  delete c.eta;
-  c.eta=0;
-
-  if(c.totalDistance)  delete c.totalDistance;
-  c.totalDistance=0;
-
-  if(c.maneuverComplete)  delete c.maneuverComplete;
-  c.maneuverComplete=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(json.isMember("navigationText1"))
-    {
-      const Json::Value& j=json["navigationText1"];
-      if(!j.isString())  return false;
-      c.navigationText1=new std::string(j.asString());
-    }
-    if(json.isMember("navigationText2"))
-    {
-      const Json::Value& j=json["navigationText2"];
-      if(!j.isString())  return false;
-      c.navigationText2=new std::string(j.asString());
-    }
-    if(json.isMember("eta"))
-    {
-      const Json::Value& j=json["eta"];
-      if(!j.isString())  return false;
-      c.eta=new std::string(j.asString());
-    }
-    if(json.isMember("totalDistance"))
-    {
-      const Json::Value& j=json["totalDistance"];
-      if(!j.isString())  return false;
-      c.totalDistance=new std::string(j.asString());
-    }
-    if(!json.isMember("turnIcon"))  return false;
-    {
-      const Json::Value& j=json["turnIcon"];
-      if(!ImageMarshaller::fromJSON(j,c.turnIcon))
-        return false;
-    }
-    if(!json.isMember("distanceToManeuver"))  return false;
-    {
-      const Json::Value& j=json["distanceToManeuver"];
-      if(!j.isNumeric())  return false;
-      c.distanceToManeuver=j.asDouble();
-    }
-    if(!json.isMember("distanceToManeuverScale"))  return false;
-    {
-      const Json::Value& j=json["distanceToManeuverScale"];
-      if(!j.isNumeric())  return false;
-      c.distanceToManeuverScale=j.asDouble();
-    }
-    if(json.isMember("maneuverComplete"))
-    {
-      const Json::Value& j=json["maneuverComplete"];
-      if(!j.isBool())  return false;
-      c.maneuverComplete=new bool(j.asBool());
-    }
-    if(!json.isMember("softButtons"))  return false;
-    {
-      const Json::Value& j=json["softButtons"];
-      if(!j.isArray())  return false;
-      c.softButtons.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          SoftButton t;
-          if(!SoftButtonMarshaller::fromJSON(j[i],t))
-            return false;
-          c.softButtons[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.h
deleted file mode 100644
index c5a1976a7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SHOWCONSTANTTBT_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SHOWCONSTANTTBT_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ShowConstantTBT_requestMarshaller
-  {
-    static bool checkIntegrity(ShowConstantTBT_request& e);
-    static bool checkIntegrityConst(const ShowConstantTBT_request& e);
-  
-    static bool fromString(const std::string& s,ShowConstantTBT_request& e);
-    static const std::string toString(const ShowConstantTBT_request& e);
-  
-    static bool fromJSON(const Json::Value& s,ShowConstantTBT_request& e);
-    static Json::Value toJSON(const ShowConstantTBT_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_response.cpp
deleted file mode 100644
index 02be0cf75..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h"
-#include "ShowConstantTBT_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-ShowConstantTBT_response& ShowConstantTBT_response::operator =(const ShowConstantTBT_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-ShowConstantTBT_response::~ShowConstantTBT_response(void)
-{}
-
-ShowConstantTBT_response::ShowConstantTBT_response(const ShowConstantTBT_response& c)
-{
-    *this = c;
-}
-
-bool ShowConstantTBT_response::checkIntegrity(void)
-{
-    return ShowConstantTBT_responseMarshaller::checkIntegrity(*this);
-}
-
-ShowConstantTBT_response::ShowConstantTBT_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.cpp
deleted file mode 100644
index d0f8eb235..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h"
-#include "ResultMarshaller.h"
-
-#include "ShowConstantTBT_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool ShowConstantTBT_responseMarshaller::checkIntegrity(ShowConstantTBT_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool ShowConstantTBT_responseMarshaller::fromString(const std::string& s,ShowConstantTBT_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string ShowConstantTBT_responseMarshaller::toString(const ShowConstantTBT_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool ShowConstantTBT_responseMarshaller::checkIntegrityConst(const ShowConstantTBT_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value ShowConstantTBT_responseMarshaller::toJSON(const ShowConstantTBT_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool ShowConstantTBT_responseMarshaller::fromJSON(const Json::Value& json,ShowConstantTBT_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.h
deleted file mode 100644
index 0748d4fd7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SHOWCONSTANTTBT_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SHOWCONSTANTTBT_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct ShowConstantTBT_responseMarshaller
-  {
-    static bool checkIntegrity(ShowConstantTBT_response& e);
-    static bool checkIntegrityConst(const ShowConstantTBT_response& e);
-  
-    static bool fromString(const std::string& s,ShowConstantTBT_response& e);
-    static const std::string toString(const ShowConstantTBT_response& e);
-  
-    static bool fromJSON(const Json::Value& s,ShowConstantTBT_response& e);
-    static Json::Value toJSON(const ShowConstantTBT_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_request.cpp
deleted file mode 100644
index 4904e3fa8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_request.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_request.h"
-#include "Show_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ImageMarshaller.h"
-#include "SoftButtonMarshaller.h"
-#include "TextAlignmentMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Show_request& Show_request::operator =(const Show_request& c)
-{
-  mainField1= c.mainField1 ? new std::string(c.mainField1[0]) : 0;
-  mainField2= c.mainField2 ? new std::string(c.mainField2[0]) : 0;
-  mainField3= c.mainField3 ? new std::string(c.mainField3[0]) : 0;
-  mainField4= c.mainField4 ? new std::string(c.mainField4[0]) : 0;
-  alignment= c.alignment ? new TextAlignment(c.alignment[0]) : 0;
-  statusBar= c.statusBar ? new std::string(c.statusBar[0]) : 0;
-  mediaClock= c.mediaClock ? new std::string(c.mediaClock[0]) : 0;
-  mediaTrack= c.mediaTrack ? new std::string(c.mediaTrack[0]) : 0;
-  graphic= c.graphic ? new Image(c.graphic[0]) : 0;
-  softButtons= c.softButtons ? new std::vector<SoftButton>(c.softButtons[0]) : 0;
-  customPresets= c.customPresets ? new std::vector<std::string>(c.customPresets[0]) : 0;
-
-  return *this;
-}
-
-
-Show_request::~Show_request(void)
-{
-  if(mainField1)
-    delete mainField1;
-  if(mainField2)
-    delete mainField2;
-  if(mainField3)
-    delete mainField3;
-  if(mainField4)
-    delete mainField4;
-  if(alignment)
-    delete alignment;
-  if(statusBar)
-    delete statusBar;
-  if(mediaClock)
-    delete mediaClock;
-  if(mediaTrack)
-    delete mediaTrack;
-  if(graphic)
-    delete graphic;
-  if(softButtons)
-    delete softButtons;
-  if(customPresets)
-    delete customPresets;
-}
-
-
-Show_request::Show_request(const Show_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool Show_request::checkIntegrity(void)
-{
-  return Show_requestMarshaller::checkIntegrity(*this);
-}
-
-
-Show_request::Show_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      mainField1(0),
-    mainField2(0),
-    mainField3(0),
-    mainField4(0),
-    alignment(0),
-    statusBar(0),
-    mediaClock(0),
-    mediaTrack(0),
-    graphic(0),
-    softButtons(0),
-    customPresets(0)
-{
-}
-
-
-
-bool Show_request::set_mainField1(const std::string& mainField1_)
-{
-  if(mainField1_.length()>500)  return false;
-  delete mainField1;
-  mainField1=0;
-
-  mainField1=new std::string(mainField1_);
-  return true;
-}
-
-void Show_request::reset_mainField1(void)
-{
-  if(mainField1)
-    delete mainField1;
-  mainField1=0;
-}
-
-bool Show_request::set_mainField2(const std::string& mainField2_)
-{
-  if(mainField2_.length()>500)  return false;
-  delete mainField2;
-  mainField2=0;
-
-  mainField2=new std::string(mainField2_);
-  return true;
-}
-
-void Show_request::reset_mainField2(void)
-{
-  if(mainField2)
-    delete mainField2;
-  mainField2=0;
-}
-
-bool Show_request::set_mainField3(const std::string& mainField3_)
-{
-  if(mainField3_.length()>500)  return false;
-  delete mainField3;
-  mainField3=0;
-
-  mainField3=new std::string(mainField3_);
-  return true;
-}
-
-void Show_request::reset_mainField3(void)
-{
-  if(mainField3)
-    delete mainField3;
-  mainField3=0;
-}
-
-bool Show_request::set_mainField4(const std::string& mainField4_)
-{
-  if(mainField4_.length()>500)  return false;
-  delete mainField4;
-  mainField4=0;
-
-  mainField4=new std::string(mainField4_);
-  return true;
-}
-
-void Show_request::reset_mainField4(void)
-{
-  if(mainField4)
-    delete mainField4;
-  mainField4=0;
-}
-
-bool Show_request::set_alignment(const TextAlignment& alignment_)
-{
-  if(!TextAlignmentMarshaller::checkIntegrityConst(alignment_))   return false;
-  delete alignment;
-  alignment=0;
-
-  alignment=new TextAlignment(alignment_);
-  return true;
-}
-
-void Show_request::reset_alignment(void)
-{
-  if(alignment)
-    delete alignment;
-  alignment=0;
-}
-
-bool Show_request::set_statusBar(const std::string& statusBar_)
-{
-  if(statusBar_.length()>500)  return false;
-  delete statusBar;
-  statusBar=0;
-
-  statusBar=new std::string(statusBar_);
-  return true;
-}
-
-void Show_request::reset_statusBar(void)
-{
-  if(statusBar)
-    delete statusBar;
-  statusBar=0;
-}
-
-bool Show_request::set_mediaClock(const std::string& mediaClock_)
-{
-  if(mediaClock_.length()>500)  return false;
-  delete mediaClock;
-  mediaClock=0;
-
-  mediaClock=new std::string(mediaClock_);
-  return true;
-}
-
-void Show_request::reset_mediaClock(void)
-{
-  if(mediaClock)
-    delete mediaClock;
-  mediaClock=0;
-}
-
-bool Show_request::set_mediaTrack(const std::string& mediaTrack_)
-{
-  if(mediaTrack_.length()>500)  return false;
-  delete mediaTrack;
-  mediaTrack=0;
-
-  mediaTrack=new std::string(mediaTrack_);
-  return true;
-}
-
-void Show_request::reset_mediaTrack(void)
-{
-  if(mediaTrack)
-    delete mediaTrack;
-  mediaTrack=0;
-}
-
-bool Show_request::set_graphic(const Image& graphic_)
-{
-  if(!ImageMarshaller::checkIntegrityConst(graphic_))   return false;
-  delete graphic;
-  graphic=0;
-
-  graphic=new Image(graphic_);
-  return true;
-}
-
-void Show_request::reset_graphic(void)
-{
-  if(graphic)
-    delete graphic;
-  graphic=0;
-}
-
-bool Show_request::set_softButtons(const std::vector<SoftButton>& softButtons_)
-{
-  unsigned int i=softButtons_.size();
-  if(i>8 || i<0)  return false;
-  while(i--)
-  {
-    if(!SoftButtonMarshaller::checkIntegrityConst(softButtons_[i]))   return false;
-  }
-  delete softButtons;
-  softButtons=0;
-
-  softButtons=new std::vector<SoftButton>(softButtons_);
-  return true;
-}
-
-void Show_request::reset_softButtons(void)
-{
-  if(softButtons)
-    delete softButtons;
-  softButtons=0;
-}
-
-bool Show_request::set_customPresets(const std::vector<std::string>& customPresets_)
-{
-  unsigned int i=customPresets_.size();
-  if(i>6 || i<0)  return false;
-  while(i--)
-  {
-    if(customPresets_[i].length()>500)  return false;
-  }
-  delete customPresets;
-  customPresets=0;
-
-  customPresets=new std::vector<std::string>(customPresets_);
-  return true;
-}
-
-void Show_request::reset_customPresets(void)
-{
-  if(customPresets)
-    delete customPresets;
-  customPresets=0;
-}
-
-
-
-
-const std::string* Show_request::get_mainField1(void) const 
-{
-  return mainField1;
-}
-
-const std::string* Show_request::get_mainField2(void) const 
-{
-  return mainField2;
-}
-
-const std::string* Show_request::get_mainField3(void) const 
-{
-  return mainField3;
-}
-
-const std::string* Show_request::get_mainField4(void) const 
-{
-  return mainField4;
-}
-
-const TextAlignment* Show_request::get_alignment(void) const 
-{
-  return alignment;
-}
-
-const std::string* Show_request::get_statusBar(void) const 
-{
-  return statusBar;
-}
-
-const std::string* Show_request::get_mediaClock(void) const 
-{
-  return mediaClock;
-}
-
-const std::string* Show_request::get_mediaTrack(void) const 
-{
-  return mediaTrack;
-}
-
-const Image* Show_request::get_graphic(void) const 
-{
-  return graphic;
-}
-
-const std::vector<SoftButton>* Show_request::get_softButtons(void) const 
-{
-  return softButtons;
-}
-
-const std::vector<std::string>* Show_request::get_customPresets(void) const 
-{
-  return customPresets;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.cpp
deleted file mode 100644
index 83eb71e38..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_request.h"
-#include "ImageMarshaller.h"
-#include "SoftButtonMarshaller.h"
-#include "TextAlignmentMarshaller.h"
-
-#include "Show_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Show_requestMarshaller::checkIntegrity(Show_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Show_requestMarshaller::fromString(const std::string& s,Show_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Show_requestMarshaller::toString(const Show_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Show_requestMarshaller::checkIntegrityConst(const Show_request& s)
-{
-  if(s.mainField1 && s.mainField1->length()>500)  return false;
-  if(s.mainField2 && s.mainField2->length()>500)  return false;
-  if(s.mainField3 && s.mainField3->length()>500)  return false;
-  if(s.mainField4 && s.mainField4->length()>500)  return false;
-  if(s.alignment && !TextAlignmentMarshaller::checkIntegrityConst(*s.alignment))  return false;
-  if(s.statusBar && s.statusBar->length()>500)  return false;
-  if(s.mediaClock && s.mediaClock->length()>500)  return false;
-  if(s.mediaTrack && s.mediaTrack->length()>500)  return false;
-  if(s.graphic && !ImageMarshaller::checkIntegrityConst(*s.graphic))  return false;
-  if(s.softButtons)
-  {
-    unsigned int i=s.softButtons[0].size();
-    if(i>8 || i<0)  return false;
-    while(i--)
-    {
-    if(!SoftButtonMarshaller::checkIntegrityConst(s.softButtons[0][i]))   return false;
-    }
-  }
-  if(s.customPresets)
-  {
-    unsigned int i=s.customPresets[0].size();
-    if(i>6 || i<0)  return false;
-    while(i--)
-    {
-      if(s.customPresets[0][i].length()>500)  return false;
-    }
-  }
-  return true;
-}
-
-Json::Value Show_requestMarshaller::toJSON(const Show_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  if(e.mainField1)
-    json["mainField1"]=Json::Value(*e.mainField1);
-
-  if(e.mainField2)
-    json["mainField2"]=Json::Value(*e.mainField2);
-
-  if(e.mainField3)
-    json["mainField3"]=Json::Value(*e.mainField3);
-
-  if(e.mainField4)
-    json["mainField4"]=Json::Value(*e.mainField4);
-
-  if(e.alignment)
-    json["alignment"]=TextAlignmentMarshaller::toJSON(*e.alignment);
-
-  if(e.statusBar)
-    json["statusBar"]=Json::Value(*e.statusBar);
-
-  if(e.mediaClock)
-    json["mediaClock"]=Json::Value(*e.mediaClock);
-
-  if(e.mediaTrack)
-    json["mediaTrack"]=Json::Value(*e.mediaTrack);
-
-  if(e.graphic)
-    json["graphic"]=ImageMarshaller::toJSON(*e.graphic);
-
-  if(e.softButtons)
-  {
-    unsigned int sz=e.softButtons->size();
-    json["softButtons"]=Json::Value(Json::arrayValue);
-    json["softButtons"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["softButtons"][i]=SoftButtonMarshaller::toJSON(e.softButtons[0][i]);
-  }
-
-  if(e.customPresets)
-  {
-    unsigned int sz=e.customPresets->size();
-    json["customPresets"]=Json::Value(Json::arrayValue);
-    json["customPresets"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["customPresets"][i]=Json::Value(e.customPresets[0][i]);
-  }
-
-  return json;
-}
-
-
-bool Show_requestMarshaller::fromJSON(const Json::Value& json,Show_request& c)
-{
-  if(c.mainField1)  delete c.mainField1;
-  c.mainField1=0;
-
-  if(c.mainField2)  delete c.mainField2;
-  c.mainField2=0;
-
-  if(c.mainField3)  delete c.mainField3;
-  c.mainField3=0;
-
-  if(c.mainField4)  delete c.mainField4;
-  c.mainField4=0;
-
-  if(c.alignment)  delete c.alignment;
-  c.alignment=0;
-
-  if(c.statusBar)  delete c.statusBar;
-  c.statusBar=0;
-
-  if(c.mediaClock)  delete c.mediaClock;
-  c.mediaClock=0;
-
-  if(c.mediaTrack)  delete c.mediaTrack;
-  c.mediaTrack=0;
-
-  if(c.graphic)  delete c.graphic;
-  c.graphic=0;
-
-  if(c.softButtons)  delete c.softButtons;
-  c.softButtons=0;
-
-  if(c.customPresets)  delete c.customPresets;
-  c.customPresets=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(json.isMember("mainField1"))
-    {
-      const Json::Value& j=json["mainField1"];
-      if(!j.isString())  return false;
-      c.mainField1=new std::string(j.asString());
-    }
-    if(json.isMember("mainField2"))
-    {
-      const Json::Value& j=json["mainField2"];
-      if(!j.isString())  return false;
-      c.mainField2=new std::string(j.asString());
-    }
-    if(json.isMember("mainField3"))
-    {
-      const Json::Value& j=json["mainField3"];
-      if(!j.isString())  return false;
-      c.mainField3=new std::string(j.asString());
-    }
-    if(json.isMember("mainField4"))
-    {
-      const Json::Value& j=json["mainField4"];
-      if(!j.isString())  return false;
-      c.mainField4=new std::string(j.asString());
-    }
-    if(json.isMember("alignment"))
-    {
-      const Json::Value& j=json["alignment"];
-      c.alignment=new TextAlignment();
-      if(!TextAlignmentMarshaller::fromJSON(j,c.alignment[0]))
-        return false;
-    }
-    if(json.isMember("statusBar"))
-    {
-      const Json::Value& j=json["statusBar"];
-      if(!j.isString())  return false;
-      c.statusBar=new std::string(j.asString());
-    }
-    if(json.isMember("mediaClock"))
-    {
-      const Json::Value& j=json["mediaClock"];
-      if(!j.isString())  return false;
-      c.mediaClock=new std::string(j.asString());
-    }
-    if(json.isMember("mediaTrack"))
-    {
-      const Json::Value& j=json["mediaTrack"];
-      if(!j.isString())  return false;
-      c.mediaTrack=new std::string(j.asString());
-    }
-    if(json.isMember("graphic"))
-    {
-      const Json::Value& j=json["graphic"];
-      c.graphic=new Image();
-      if(!ImageMarshaller::fromJSON(j,c.graphic[0]))
-        return false;
-    }
-    if(json.isMember("softButtons"))
-    {
-      const Json::Value& j=json["softButtons"];
-      if(!j.isArray())  return false;
-      c.softButtons=new std::vector<SoftButton>();
-      c.softButtons->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        SoftButton t;
-        if(!SoftButtonMarshaller::fromJSON(j[i],t))
-          return false;
-        c.softButtons[0][i]=t;
-      }
-
-    }
-    if(json.isMember("customPresets"))
-    {
-      const Json::Value& j=json["customPresets"];
-      if(!j.isArray())  return false;
-      c.customPresets=new std::vector<std::string>();
-      c.customPresets->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.customPresets[0][i]=j[i].asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.h
deleted file mode 100644
index 6907f79a0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SHOW_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SHOW_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct Show_requestMarshaller
-  {
-    static bool checkIntegrity(Show_request& e);
-    static bool checkIntegrityConst(const Show_request& e);
-  
-    static bool fromString(const std::string& s,Show_request& e);
-    static const std::string toString(const Show_request& e);
-  
-    static bool fromJSON(const Json::Value& s,Show_request& e);
-    static Json::Value toJSON(const Show_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_response.cpp
deleted file mode 100644
index 420e8e3d8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_response.h"
-#include "Show_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Show_response& Show_response::operator =(const Show_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-Show_response::~Show_response(void)
-{}
-
-Show_response::Show_response(const Show_response& c)
-{
-    *this = c;
-}
-
-bool Show_response::checkIntegrity(void)
-{
-    return Show_responseMarshaller::checkIntegrity(*this);
-}
-
-Show_response::Show_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.cpp
deleted file mode 100644
index bda81a476..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_response.h"
-#include "ResultMarshaller.h"
-
-#include "Show_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Show_responseMarshaller::checkIntegrity(Show_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Show_responseMarshaller::fromString(const std::string& s,Show_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Show_responseMarshaller::toString(const Show_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Show_responseMarshaller::checkIntegrityConst(const Show_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value Show_responseMarshaller::toJSON(const Show_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool Show_responseMarshaller::fromJSON(const Json::Value& json,Show_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.h
deleted file mode 100644
index 5bd3e025d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SHOW_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SHOW_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Show_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct Show_responseMarshaller
-  {
-    static bool checkIntegrity(Show_response& e);
-    static bool checkIntegrityConst(const Show_response& e);
-  
-    static bool fromString(const std::string& s,Show_response& e);
-    static const std::string toString(const Show_response& e);
-  
-    static bool fromJSON(const Json::Value& s,Show_response& e);
-    static Json::Value toJSON(const Show_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.cpp
deleted file mode 100644
index 12a3a6118..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/SingleTirePressureStatus.h"
-#include "SingleTirePressureStatusMarshaller.h"
-#include "SingleTirePressureStatusMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const SingleTirePressureStatus::SingleTirePressureStatusInternal SingleTirePressureStatusMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return SingleTirePressureStatus::INVALID_ENUM;
-  const struct PerfectHashTable* p=SingleTirePressureStatus_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<SingleTirePressureStatus::SingleTirePressureStatusInternal>(p->idx) : SingleTirePressureStatus::INVALID_ENUM;
-}
-
-
-bool SingleTirePressureStatusMarshaller::fromJSON(const Json::Value& s,SingleTirePressureStatus& e)
-{
-  e.mInternal=SingleTirePressureStatus::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=SingleTirePressureStatus::INVALID_ENUM);
-}
-
-
-Json::Value SingleTirePressureStatusMarshaller::toJSON(const SingleTirePressureStatus& e)
-{
-  if(e.mInternal==SingleTirePressureStatus::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SingleTirePressureStatusMarshaller::fromString(const std::string& s,SingleTirePressureStatus& e)
-{
-  e.mInternal=SingleTirePressureStatus::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string SingleTirePressureStatusMarshaller::toString(const SingleTirePressureStatus& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==SingleTirePressureStatus::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SingleTirePressureStatusMarshaller::mHashTable[5]=
-{
-  {"UNKNOWN",0},
-  {"NORMAL",1},
-  {"LOW",2},
-  {"FAULT",3},
-  {"NOT_SUPPORTED",4}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp
deleted file mode 100644
index 568cc2b93..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp
+++ /dev/null
@@ -1,21 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SingleTirePressureStatus_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-UNKNOWN,0
-NORMAL,1
-LOW,2
-FAULT,3
-NOT_SUPPORTED,4
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.h
deleted file mode 100644
index c84ebdba8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SINGLETIREPRESSURESTATUSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SINGLETIREPRESSURESTATUSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SingleTirePressureStatus.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for SingleTirePressureStatus
-
-  class SingleTirePressureStatusMarshaller
-  {
-  public:
-  
-    static std::string toName(const SingleTirePressureStatus& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(SingleTirePressureStatus& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=SingleTirePressureStatus::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(SingleTirePressureStatus& e)		{ return e.mInternal!=SingleTirePressureStatus::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const SingleTirePressureStatus& e)	{ return e.mInternal!=SingleTirePressureStatus::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,SingleTirePressureStatus& e);
-    static const std::string toString(const SingleTirePressureStatus& e);
-  
-    static bool fromJSON(const Json::Value& s,SingleTirePressureStatus& e);
-    static Json::Value toJSON(const SingleTirePressureStatus& e);
-  
-    static const char* getName(SingleTirePressureStatus::SingleTirePressureStatusInternal e)
-    {
-       return (e>=0 && e<5) ? mHashTable[e].name : NULL;
-    }
-  
-    static const SingleTirePressureStatus::SingleTirePressureStatusInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[5];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.inc
deleted file mode 100644
index 1704e4a70..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.inc
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 5
-#define MIN_WORD_LENGTH 3
-#define MAX_WORD_LENGTH 13
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 13
-/* maximum key range = 11, duplicates = 0 */
-
-class SingleTirePressureStatus_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-SingleTirePressureStatus_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-SingleTirePressureStatus_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  3,  0,  5,  6,  7,  0,  0,  0,  0,  0, 13
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp"
-      {"LOW",2},
-      {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp"
-      {"FAULT",3},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp"
-      {"NORMAL",1},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp"
-      {"UNKNOWN",0},
-      {""}, {""}, {""}, {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTirePressureStatusMarshaller.gp"
-      {"NOT_SUPPORTED",4}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatus.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatus.cpp
deleted file mode 100644
index 997eb9dde..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatus.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SingleTireStatus.h"
-#include "SingleTireStatusMarshaller.h"
-#include "SingleTirePressureStatusMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SingleTireStatus::SingleTireStatus(const SingleTireStatus& c)
-{
-  *this=c;
-}
-
-
-bool SingleTireStatus::checkIntegrity(void)
-{
-  return SingleTireStatusMarshaller::checkIntegrity(*this);
-}
-
-
-SingleTireStatus::SingleTireStatus(void)
-{
-}
-
-
-
-bool SingleTireStatus::set_pressure(unsigned int pressure_)
-{
-  if(pressure_>255)  return false;
-  pressure=pressure_;
-  return true;
-}
-
-bool SingleTireStatus::set_status(const SingleTirePressureStatus& status_)
-{
-  if(!SingleTirePressureStatusMarshaller::checkIntegrityConst(status_))   return false;
-  status=status_;
-  return true;
-}
-
-
-
-
-unsigned int SingleTireStatus::get_pressure(void) const
-{
-  return pressure;
-}
-
-
-const SingleTirePressureStatus& SingleTireStatus::get_status(void) const 
-{
-  return status;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.cpp
deleted file mode 100644
index 445335d5d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SingleTireStatus.h"
-#include "SingleTirePressureStatusMarshaller.h"
-
-#include "SingleTireStatusMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SingleTireStatusMarshaller::checkIntegrity(SingleTireStatus& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SingleTireStatusMarshaller::fromString(const std::string& s,SingleTireStatus& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SingleTireStatusMarshaller::toString(const SingleTireStatus& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SingleTireStatusMarshaller::checkIntegrityConst(const SingleTireStatus& s)
-{
-  if(s.pressure>255)  return false;
-  if(!SingleTirePressureStatusMarshaller::checkIntegrityConst(s.status))  return false;
-  return true;
-}
-
-Json::Value SingleTireStatusMarshaller::toJSON(const SingleTireStatus& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["pressure"]=Json::Value(e.pressure);
-
-  json["status"]=SingleTirePressureStatusMarshaller::toJSON(e.status);
-
-
-  return json;
-}
-
-
-bool SingleTireStatusMarshaller::fromJSON(const Json::Value& json,SingleTireStatus& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("pressure"))  return false;
-    {
-      const Json::Value& j=json["pressure"];
-      if(!j.isInt())  return false;
-      c.pressure=j.asInt();
-    }
-    if(!json.isMember("status"))  return false;
-    {
-      const Json::Value& j=json["status"];
-      if(!SingleTirePressureStatusMarshaller::fromJSON(j,c.status))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.h
deleted file mode 100644
index 86dc330a9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SingleTireStatusMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SINGLETIRESTATUSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SINGLETIRESTATUSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SingleTireStatus.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SingleTireStatusMarshaller
-  {
-    static bool checkIntegrity(SingleTireStatus& e);
-    static bool checkIntegrityConst(const SingleTireStatus& e);
-  
-    static bool fromString(const std::string& s,SingleTireStatus& e);
-    static const std::string toString(const SingleTireStatus& e);
-  
-    static bool fromJSON(const Json::Value& s,SingleTireStatus& e);
-    static Json::Value toJSON(const SingleTireStatus& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_request.cpp
deleted file mode 100644
index e44ee76c7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_request.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_request.h"
-#include "Slider_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Slider_request& Slider_request::operator =(const Slider_request& c)
-{
-  numTicks= c.numTicks;
-  position= c.position;
-  sliderHeader= c.sliderHeader;
-  sliderFooter= c.sliderFooter ? new std::vector<std::string>(c.sliderFooter[0]) : 0;
-  timeout= c.timeout;
-
-  return *this;
-}
-
-
-Slider_request::~Slider_request(void)
-{
-  if(sliderFooter)
-    delete sliderFooter;
-}
-
-
-Slider_request::Slider_request(const Slider_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool Slider_request::checkIntegrity(void)
-{
-  return Slider_requestMarshaller::checkIntegrity(*this);
-}
-
-
-Slider_request::Slider_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION),
-      sliderFooter(0)
-{
-}
-
-
-
-bool Slider_request::set_numTicks(unsigned int numTicks_)
-{
-  if(numTicks_>26)  return false;
-  if(numTicks_<2)  return false;
-  numTicks=numTicks_;
-  return true;
-}
-
-bool Slider_request::set_position(unsigned int position_)
-{
-  if(position_>26)  return false;
-  if(position_<1)  return false;
-  position=position_;
-  return true;
-}
-
-bool Slider_request::set_sliderHeader(const std::string& sliderHeader_)
-{
-  if(sliderHeader_.length()>500)  return false;
-  sliderHeader=sliderHeader_;
-  return true;
-}
-
-bool Slider_request::set_sliderFooter(const std::vector<std::string>& sliderFooter_)
-{
-  unsigned int i=sliderFooter_.size();
-  if(i>26 || i<1)  return false;
-  while(i--)
-  {
-    if(sliderFooter_[i].length()>500)  return false;
-  }
-  delete sliderFooter;
-  sliderFooter=0;
-
-  sliderFooter=new std::vector<std::string>(sliderFooter_);
-  return true;
-}
-
-void Slider_request::reset_sliderFooter(void)
-{
-  if(sliderFooter)
-    delete sliderFooter;
-  sliderFooter=0;
-}
-
-bool Slider_request::set_timeout(unsigned int timeout_)
-{
-  if(timeout_>65535)  return false;
-  timeout=timeout_;
-  return true;
-}
-
-
-
-
-unsigned int Slider_request::get_numTicks(void) const
-{
-  return numTicks;
-}
-
-unsigned int Slider_request::get_position(void) const
-{
-  return position;
-}
-
-const std::string& Slider_request::get_sliderHeader(void) const 
-{
-  return sliderHeader;
-}
-
-const std::vector<std::string>* Slider_request::get_sliderFooter(void) const 
-{
-  return sliderFooter;
-}
-
-unsigned int Slider_request::get_timeout(void) const
-{
-  return timeout;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.cpp
deleted file mode 100644
index ee7808a65..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_request.h"
-
-
-#include "Slider_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Slider_requestMarshaller::checkIntegrity(Slider_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Slider_requestMarshaller::fromString(const std::string& s,Slider_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Slider_requestMarshaller::toString(const Slider_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Slider_requestMarshaller::checkIntegrityConst(const Slider_request& s)
-{
-  if(s.numTicks>26)  return false;
-  if(s.numTicks<2)  return false;
-  if(s.position>26)  return false;
-  if(s.position<1)  return false;
-  if(s.sliderHeader.length()>500)  return false;
-  if(s.sliderFooter)
-  {
-    unsigned int i=s.sliderFooter[0].size();
-    if(i>26 || i<1)  return false;
-    while(i--)
-    {
-      if(s.sliderFooter[0][i].length()>500)  return false;
-    }
-  }
-  if(s.timeout>65535)  return false;
-  return true;
-}
-
-Json::Value Slider_requestMarshaller::toJSON(const Slider_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["numTicks"]=Json::Value(e.numTicks);
-
-  json["position"]=Json::Value(e.position);
-
-  json["sliderHeader"]=Json::Value(e.sliderHeader);
-
-  if(e.sliderFooter)
-  {
-    unsigned int sz=e.sliderFooter->size();
-    json["sliderFooter"]=Json::Value(Json::arrayValue);
-    json["sliderFooter"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["sliderFooter"][i]=Json::Value(e.sliderFooter[0][i]);
-  }
-
-  json["timeout"]=Json::Value(e.timeout);
-
-  return json;
-}
-
-
-bool Slider_requestMarshaller::fromJSON(const Json::Value& json,Slider_request& c)
-{
-  if(c.sliderFooter)  delete c.sliderFooter;
-  c.sliderFooter=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("numTicks"))  return false;
-    {
-      const Json::Value& j=json["numTicks"];
-      if(!j.isInt())  return false;
-      c.numTicks=j.asInt();
-    }
-    if(!json.isMember("position"))  return false;
-    {
-      const Json::Value& j=json["position"];
-      if(!j.isInt())  return false;
-      c.position=j.asInt();
-    }
-    if(!json.isMember("sliderHeader"))  return false;
-    {
-      const Json::Value& j=json["sliderHeader"];
-      if(!j.isString())  return false;
-      c.sliderHeader=j.asString();
-    }
-    if(json.isMember("sliderFooter"))
-    {
-      const Json::Value& j=json["sliderFooter"];
-      if(!j.isArray())  return false;
-      c.sliderFooter=new std::vector<std::string>();
-      c.sliderFooter->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        if(!j[i].isString())
-          return false;
-        else
-          c.sliderFooter[0][i]=j[i].asString();
-    }
-    if(!json.isMember("timeout"))  return false;
-    {
-      const Json::Value& j=json["timeout"];
-      if(!j.isInt())  return false;
-      c.timeout=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.h
deleted file mode 100644
index 65baf68c1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SLIDER_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SLIDER_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct Slider_requestMarshaller
-  {
-    static bool checkIntegrity(Slider_request& e);
-    static bool checkIntegrityConst(const Slider_request& e);
-  
-    static bool fromString(const std::string& s,Slider_request& e);
-    static const std::string toString(const Slider_request& e);
-  
-    static bool fromJSON(const Json::Value& s,Slider_request& e);
-    static Json::Value toJSON(const Slider_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_response.cpp
deleted file mode 100644
index 6c9bc9a64..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_response.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_response.h"
-#include "Slider_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Slider_response& Slider_response::operator =(const Slider_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    sliderPosition = c.sliderPosition;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-Slider_response::~Slider_response(void)
-{}
-
-Slider_response::Slider_response(const Slider_response& c)
-{
-    *this = c;
-}
-
-bool Slider_response::checkIntegrity(void)
-{
-    return Slider_responseMarshaller::checkIntegrity(*this);
-}
-
-Slider_response::Slider_response(void)
-  : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-  , sliderPosition(1)
-{}
-
-bool Slider_response::set_sliderPosition(unsigned int sliderPosition_)
-{
-    if (sliderPosition_ > 26)
-    {
-        return false;
-    }
-    if (sliderPosition_ < 1)
-    {
-        return false;
-    }
-    sliderPosition = sliderPosition_;
-    return true;
-}
-
-unsigned int Slider_response::get_sliderPosition(void) const
-{
-    return sliderPosition;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.cpp
deleted file mode 100644
index 4632270b7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_response.h"
-#include "ResultMarshaller.h"
-
-#include "Slider_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Slider_responseMarshaller::checkIntegrity(Slider_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Slider_responseMarshaller::fromString(const std::string& s,Slider_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Slider_responseMarshaller::toString(const Slider_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Slider_responseMarshaller::checkIntegrityConst(const Slider_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.sliderPosition>26)  return false;
-  if(s.sliderPosition<1)  return false;
-  return true;
-}
-
-Json::Value Slider_responseMarshaller::toJSON(const Slider_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  json["sliderPosition"]=Json::Value(e.sliderPosition);
-
-  return json;
-}
-
-
-bool Slider_responseMarshaller::fromJSON(const Json::Value& json,Slider_response& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(!json.isMember("sliderPosition"))  return false;
-    {
-      const Json::Value& j=json["sliderPosition"];
-      if(!j.isInt())  return false;
-      c.sliderPosition=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.h
deleted file mode 100644
index 52da1caac..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SLIDER_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SLIDER_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Slider_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct Slider_responseMarshaller
-  {
-    static bool checkIntegrity(Slider_response& e);
-    static bool checkIntegrityConst(const Slider_response& e);
-  
-    static bool fromString(const std::string& s,Slider_response& e);
-    static const std::string toString(const Slider_response& e);
-  
-    static bool fromJSON(const Json::Value& s,Slider_response& e);
-    static Json::Value toJSON(const Slider_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButton.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButton.cpp
deleted file mode 100644
index f10929c19..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButton.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButton.h"
-#include "SoftButtonMarshaller.h"
-#include "ImageMarshaller.h"
-#include "SoftButtonTypeMarshaller.h"
-#include "SystemActionMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SoftButton& SoftButton::operator =(const SoftButton& c)
-{
-  image=c.image ? new Image(c.image[0]) : 0;
-  isHighlighted=c.isHighlighted;
-  softButtonID=c.softButtonID;
-  systemAction=c.systemAction;
-  text=c.text ? new std::string(c.text[0]) : 0;
-  type=c.type;
-
-  return *this;
-}
-
-
-SoftButton::~SoftButton(void)
-{
-  if(image)
-    delete image;
-  if(text)
-    delete text;
-}
-
-
-SoftButton::SoftButton(const SoftButton& c)
-{
-  *this=c;
-}
-
-
-bool SoftButton::checkIntegrity(void)
-{
-  return SoftButtonMarshaller::checkIntegrity(*this);
-}
-
-
-SoftButton::SoftButton(void) :
-    image(0),
-    text(0)
-{
-}
-
-
-
-bool SoftButton::set_image(const Image& image_)
-{
-  if(!ImageMarshaller::checkIntegrityConst(image_))   return false;
-  delete image;
-  image=0;
-
-  image=new Image(image_);
-  return true;
-}
-
-void SoftButton::reset_image(void)
-{
-  if(image)
-    delete image;
-  image=0;
-}
-
-bool SoftButton::set_isHighlighted(bool isHighlighted_)
-{
-  isHighlighted=isHighlighted_;
-  return true;
-}
-
-bool SoftButton::set_softButtonID(unsigned int softButtonID_)
-{
-  if(softButtonID_>65536)  return false;
-  softButtonID=softButtonID_;
-  return true;
-}
-
-bool SoftButton::set_systemAction(const SystemAction& systemAction_)
-{
-  if(!SystemActionMarshaller::checkIntegrityConst(systemAction_))   return false;
-  systemAction=systemAction_;
-  return true;
-}
-
-bool SoftButton::set_text(const std::string& text_)
-{
-  if(text_.length()>500)  return false;
-  delete text;
-  text=0;
-
-  text=new std::string(text_);
-  return true;
-}
-
-void SoftButton::reset_text(void)
-{
-  if(text)
-    delete text;
-  text=0;
-}
-
-bool SoftButton::set_type(const SoftButtonType& type_)
-{
-  if(!SoftButtonTypeMarshaller::checkIntegrityConst(type_))   return false;
-  type=type_;
-  return true;
-}
-
-
-
-
-const Image* SoftButton::get_image(void) const 
-{
-  return image;
-}
-
-
-bool SoftButton::get_isHighlighted(void) const
-{
-  return isHighlighted;
-}
-
-
-unsigned int SoftButton::get_softButtonID(void) const
-{
-  return softButtonID;
-}
-
-
-const SystemAction& SoftButton::get_systemAction(void) const 
-{
-  return systemAction;
-}
-
-
-const std::string* SoftButton::get_text(void) const 
-{
-  return text;
-}
-
-
-const SoftButtonType& SoftButton::get_type(void) const 
-{
-  return type;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilities.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilities.cpp
deleted file mode 100644
index 283a6ba4e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilities.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h"
-#include "SoftButtonCapabilitiesMarshaller.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SoftButtonCapabilities::SoftButtonCapabilities(const SoftButtonCapabilities& c)
-{
-  *this=c;
-}
-
-
-bool SoftButtonCapabilities::checkIntegrity(void)
-{
-  return SoftButtonCapabilitiesMarshaller::checkIntegrity(*this);
-}
-
-
-SoftButtonCapabilities::SoftButtonCapabilities(void)
-{
-}
-
-
-
-bool SoftButtonCapabilities::set_imageSupported(bool imageSupported_)
-{
-  imageSupported=imageSupported_;
-  return true;
-}
-
-bool SoftButtonCapabilities::set_longPressAvailable(bool longPressAvailable_)
-{
-  longPressAvailable=longPressAvailable_;
-  return true;
-}
-
-bool SoftButtonCapabilities::set_shortPressAvailable(bool shortPressAvailable_)
-{
-  shortPressAvailable=shortPressAvailable_;
-  return true;
-}
-
-bool SoftButtonCapabilities::set_upDownAvailable(bool upDownAvailable_)
-{
-  upDownAvailable=upDownAvailable_;
-  return true;
-}
-
-
-
-
-bool SoftButtonCapabilities::get_imageSupported(void) const
-{
-  return imageSupported;
-}
-
-
-bool SoftButtonCapabilities::get_longPressAvailable(void) const
-{
-  return longPressAvailable;
-}
-
-
-bool SoftButtonCapabilities::get_shortPressAvailable(void) const
-{
-  return shortPressAvailable;
-}
-
-
-bool SoftButtonCapabilities::get_upDownAvailable(void) const
-{
-  return upDownAvailable;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.cpp
deleted file mode 100644
index fe0b0ac68..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h"
-
-
-#include "SoftButtonCapabilitiesMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SoftButtonCapabilitiesMarshaller::checkIntegrity(SoftButtonCapabilities& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SoftButtonCapabilitiesMarshaller::fromString(const std::string& s,SoftButtonCapabilities& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SoftButtonCapabilitiesMarshaller::toString(const SoftButtonCapabilities& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SoftButtonCapabilitiesMarshaller::checkIntegrityConst(const SoftButtonCapabilities& s)
-{
-  return true;
-}
-
-Json::Value SoftButtonCapabilitiesMarshaller::toJSON(const SoftButtonCapabilities& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["imageSupported"]=Json::Value(e.imageSupported);
-
-  json["longPressAvailable"]=Json::Value(e.longPressAvailable);
-
-  json["shortPressAvailable"]=Json::Value(e.shortPressAvailable);
-
-  json["upDownAvailable"]=Json::Value(e.upDownAvailable);
-
-
-  return json;
-}
-
-
-bool SoftButtonCapabilitiesMarshaller::fromJSON(const Json::Value& json,SoftButtonCapabilities& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("imageSupported"))  return false;
-    {
-      const Json::Value& j=json["imageSupported"];
-      if(!j.isBool())  return false;
-      c.imageSupported=j.asBool();
-    }
-    if(!json.isMember("longPressAvailable"))  return false;
-    {
-      const Json::Value& j=json["longPressAvailable"];
-      if(!j.isBool())  return false;
-      c.longPressAvailable=j.asBool();
-    }
-    if(!json.isMember("shortPressAvailable"))  return false;
-    {
-      const Json::Value& j=json["shortPressAvailable"];
-      if(!j.isBool())  return false;
-      c.shortPressAvailable=j.asBool();
-    }
-    if(!json.isMember("upDownAvailable"))  return false;
-    {
-      const Json::Value& j=json["upDownAvailable"];
-      if(!j.isBool())  return false;
-      c.upDownAvailable=j.asBool();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.h
deleted file mode 100644
index 1393dcedd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SOFTBUTTONCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SOFTBUTTONCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SoftButtonCapabilitiesMarshaller
-  {
-    static bool checkIntegrity(SoftButtonCapabilities& e);
-    static bool checkIntegrityConst(const SoftButtonCapabilities& e);
-  
-    static bool fromString(const std::string& s,SoftButtonCapabilities& e);
-    static const std::string toString(const SoftButtonCapabilities& e);
-  
-    static bool fromJSON(const Json::Value& s,SoftButtonCapabilities& e);
-    static Json::Value toJSON(const SoftButtonCapabilities& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.cpp
deleted file mode 100644
index 7703cd5ba..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButton.h"
-#include "ImageMarshaller.h"
-#include "SoftButtonTypeMarshaller.h"
-#include "SystemActionMarshaller.h"
-
-#include "SoftButtonMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SoftButtonMarshaller::checkIntegrity(SoftButton& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SoftButtonMarshaller::fromString(const std::string& s,SoftButton& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SoftButtonMarshaller::toString(const SoftButton& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SoftButtonMarshaller::checkIntegrityConst(const SoftButton& s)
-{
-  if(s.image && !ImageMarshaller::checkIntegrityConst(*s.image))  return false;
-  if(s.softButtonID>65536)  return false;
-  if(!SystemActionMarshaller::checkIntegrityConst(s.systemAction))  return false;
-  if(s.text && s.text->length()>500)  return false;
-  if(!SoftButtonTypeMarshaller::checkIntegrityConst(s.type))  return false;
-  return true;
-}
-
-Json::Value SoftButtonMarshaller::toJSON(const SoftButton& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  if(e.image)
-    json["image"]=ImageMarshaller::toJSON(*e.image);
-
-  json["isHighlighted"]=Json::Value(e.isHighlighted);
-
-  json["softButtonID"]=Json::Value(e.softButtonID);
-
-  json["systemAction"]=SystemActionMarshaller::toJSON(e.systemAction);
-
-  if(e.text)
-    json["text"]=Json::Value(*e.text);
-
-  json["type"]=SoftButtonTypeMarshaller::toJSON(e.type);
-
-
-  return json;
-}
-
-
-bool SoftButtonMarshaller::fromJSON(const Json::Value& json,SoftButton& c)
-{
-  if(c.image)  delete c.image;
-  c.image=0;
-
-  if(c.text)  delete c.text;
-  c.text=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(json.isMember("image"))
-    {
-      const Json::Value& j=json["image"];
-      c.image=new Image();
-      if(!ImageMarshaller::fromJSON(j,c.image[0]))
-        return false;
-    }
-    if(!json.isMember("isHighlighted"))  return false;
-    {
-      const Json::Value& j=json["isHighlighted"];
-      if(!j.isBool())  return false;
-      c.isHighlighted=j.asBool();
-    }
-    if(!json.isMember("softButtonID"))  return false;
-    {
-      const Json::Value& j=json["softButtonID"];
-      if(!j.isInt())  return false;
-      c.softButtonID=j.asInt();
-    }
-    if(!json.isMember("systemAction"))  return false;
-    {
-      const Json::Value& j=json["systemAction"];
-      if(!SystemActionMarshaller::fromJSON(j,c.systemAction))
-        return false;
-    }
-    if(json.isMember("text"))
-    {
-      const Json::Value& j=json["text"];
-      if(!j.isString())  return false;
-      c.text=new std::string(j.asString());
-    }
-    if(!json.isMember("type"))  return false;
-    {
-      const Json::Value& j=json["type"];
-      if(!SoftButtonTypeMarshaller::fromJSON(j,c.type))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h
deleted file mode 100644
index f764924e7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SOFTBUTTONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SOFTBUTTONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButton.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SoftButtonMarshaller
-  {
-    static bool checkIntegrity(SoftButton& e);
-    static bool checkIntegrityConst(const SoftButton& e);
-  
-    static bool fromString(const std::string& s,SoftButton& e);
-    static const std::string toString(const SoftButton& e);
-  
-    static bool fromJSON(const Json::Value& s,SoftButton& e);
-    static Json::Value toJSON(const SoftButton& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.cpp
deleted file mode 100644
index b619485ff..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButtonType.h"
-#include "SoftButtonTypeMarshaller.h"
-#include "SoftButtonTypeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const SoftButtonType::SoftButtonTypeInternal SoftButtonTypeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return SoftButtonType::INVALID_ENUM;
-  const struct PerfectHashTable* p=SoftButtonType_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<SoftButtonType::SoftButtonTypeInternal>(p->idx) : SoftButtonType::INVALID_ENUM;
-}
-
-
-bool SoftButtonTypeMarshaller::fromJSON(const Json::Value& s,SoftButtonType& e)
-{
-  e.mInternal=SoftButtonType::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=SoftButtonType::INVALID_ENUM);
-}
-
-
-Json::Value SoftButtonTypeMarshaller::toJSON(const SoftButtonType& e)
-{
-  if(e.mInternal==SoftButtonType::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SoftButtonTypeMarshaller::fromString(const std::string& s,SoftButtonType& e)
-{
-  e.mInternal=SoftButtonType::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string SoftButtonTypeMarshaller::toString(const SoftButtonType& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==SoftButtonType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SoftButtonTypeMarshaller::mHashTable[3]=
-{
-  {"TEXT",0},
-  {"IMAGE",1},
-  {"BOTH",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp
deleted file mode 100644
index 82c64ce89..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SoftButtonType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-TEXT,0
-IMAGE,1
-BOTH,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.h
deleted file mode 100644
index 0ed4ea81e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SOFTBUTTONTYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SOFTBUTTONTYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SoftButtonType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for SoftButtonType
-
-  class SoftButtonTypeMarshaller
-  {
-  public:
-  
-    static std::string toName(const SoftButtonType& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(SoftButtonType& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=SoftButtonType::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(SoftButtonType& e)		{ return e.mInternal!=SoftButtonType::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const SoftButtonType& e)	{ return e.mInternal!=SoftButtonType::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,SoftButtonType& e);
-    static const std::string toString(const SoftButtonType& e);
-  
-    static bool fromJSON(const Json::Value& s,SoftButtonType& e);
-    static Json::Value toJSON(const SoftButtonType& e);
-  
-    static const char* getName(SoftButtonType::SoftButtonTypeInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const SoftButtonType::SoftButtonTypeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.inc
deleted file mode 100644
index a731d73ae..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.inc
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp  */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 6
-/* maximum key range = 3, duplicates = 0 */
-
-class SoftButtonType_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-SoftButtonType_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 2, 7, 7, 7,
-      7, 7, 7, 0, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 0, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-SoftButtonType_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  5,  4
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp"
-      {"TEXT",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp"
-      {"IMAGE",1},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SoftButtonTypeMarshaller.gp"
-      {"BOTH",2}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_request.cpp
deleted file mode 100644
index 0ff3ce723..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_request.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_request.h"
-#include "Speak_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "TTSChunkMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-Speak_request::~Speak_request(void)
-{
-}
-
-
-Speak_request::Speak_request(const Speak_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool Speak_request::checkIntegrity(void)
-{
-  return Speak_requestMarshaller::checkIntegrity(*this);
-}
-
-
-Speak_request::Speak_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool Speak_request::set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_)
-{
-  unsigned int i=ttsChunks_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TTSChunkMarshaller::checkIntegrityConst(ttsChunks_[i]))   return false;
-  }
-  ttsChunks=ttsChunks_;
-  return true;
-}
-
-
-
-
-const std::vector<TTSChunk>& Speak_request::get_ttsChunks(void) const 
-{
-  return ttsChunks;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.cpp
deleted file mode 100644
index 615d1419d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_request.h"
-#include "TTSChunkMarshaller.h"
-
-#include "Speak_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Speak_requestMarshaller::checkIntegrity(Speak_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Speak_requestMarshaller::fromString(const std::string& s,Speak_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Speak_requestMarshaller::toString(const Speak_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Speak_requestMarshaller::checkIntegrityConst(const Speak_request& s)
-{
-  {
-    unsigned int i=s.ttsChunks.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TTSChunkMarshaller::checkIntegrityConst(s.ttsChunks[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value Speak_requestMarshaller::toJSON(const Speak_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["ttsChunks"]=Json::Value(Json::arrayValue);
-  json["ttsChunks"].resize(e.ttsChunks.size());
-  for(unsigned int i=0;i<e.ttsChunks.size();i++)
-    json["ttsChunks"][i]=TTSChunkMarshaller::toJSON(e.ttsChunks[i]);
-
-  return json;
-}
-
-
-bool Speak_requestMarshaller::fromJSON(const Json::Value& json,Speak_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("ttsChunks"))  return false;
-    {
-      const Json::Value& j=json["ttsChunks"];
-      if(!j.isArray())  return false;
-      c.ttsChunks.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          TTSChunk t;
-          if(!TTSChunkMarshaller::fromJSON(j[i],t))
-            return false;
-          c.ttsChunks[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.h
deleted file mode 100644
index 004d2f48c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SPEAK_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SPEAK_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct Speak_requestMarshaller
-  {
-    static bool checkIntegrity(Speak_request& e);
-    static bool checkIntegrityConst(const Speak_request& e);
-  
-    static bool fromString(const std::string& s,Speak_request& e);
-    static const std::string toString(const Speak_request& e);
-  
-    static bool fromJSON(const Json::Value& s,Speak_request& e);
-    static Json::Value toJSON(const Speak_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_response.cpp
deleted file mode 100644
index dc90020c2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_response.h"
-#include "Speak_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-Speak_response& Speak_response::operator =(const Speak_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-Speak_response::~Speak_response(void)
-{}
-
-Speak_response::Speak_response(const Speak_response& c)
-{
-    *this = c;
-}
-
-bool Speak_response::checkIntegrity(void)
-{
-    return Speak_responseMarshaller::checkIntegrity(*this);
-}
-
-Speak_response::Speak_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.cpp
deleted file mode 100644
index a7be924ad..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_response.h"
-#include "ResultMarshaller.h"
-
-#include "Speak_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool Speak_responseMarshaller::checkIntegrity(Speak_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool Speak_responseMarshaller::fromString(const std::string& s,Speak_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string Speak_responseMarshaller::toString(const Speak_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool Speak_responseMarshaller::checkIntegrityConst(const Speak_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value Speak_responseMarshaller::toJSON(const Speak_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool Speak_responseMarshaller::fromJSON(const Json::Value& json,Speak_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.h
deleted file mode 100644
index 26a3f94b6..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SPEAK_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SPEAK_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Speak_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct Speak_responseMarshaller
-  {
-    static bool checkIntegrity(Speak_response& e);
-    static bool checkIntegrityConst(const Speak_response& e);
-  
-    static bool fromString(const std::string& s,Speak_response& e);
-    static const std::string toString(const Speak_response& e);
-  
-    static bool fromJSON(const Json::Value& s,Speak_response& e);
-    static Json::Value toJSON(const Speak_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.cpp
deleted file mode 100644
index 6cea815e1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/SpeechCapabilities.h"
-#include "SpeechCapabilitiesMarshaller.h"
-#include "SpeechCapabilitiesMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const SpeechCapabilities::SpeechCapabilitiesInternal SpeechCapabilitiesMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return SpeechCapabilities::INVALID_ENUM;
-  const struct PerfectHashTable* p=SpeechCapabilities_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<SpeechCapabilities::SpeechCapabilitiesInternal>(p->idx) : SpeechCapabilities::INVALID_ENUM;
-}
-
-
-bool SpeechCapabilitiesMarshaller::fromJSON(const Json::Value& s,SpeechCapabilities& e)
-{
-  e.mInternal=SpeechCapabilities::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=SpeechCapabilities::INVALID_ENUM);
-}
-
-
-Json::Value SpeechCapabilitiesMarshaller::toJSON(const SpeechCapabilities& e)
-{
-  if(e.mInternal==SpeechCapabilities::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SpeechCapabilitiesMarshaller::fromString(const std::string& s,SpeechCapabilities& e)
-{
-  e.mInternal=SpeechCapabilities::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string SpeechCapabilitiesMarshaller::toString(const SpeechCapabilities& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==SpeechCapabilities::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SpeechCapabilitiesMarshaller::mHashTable[5]=
-{
-  {"TEXT",0},
-  {"SAPI_PHONEMES",1},
-  {"LHPLUS_PHONEMES",2},
-  {"PRE_RECORDED",3},
-  {"SILENCE",4}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp
deleted file mode 100644
index 02e38136f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp
+++ /dev/null
@@ -1,21 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SpeechCapabilities_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-TEXT,0
-SAPI_PHONEMES,1
-LHPLUS_PHONEMES,2
-PRE_RECORDED,3
-SILENCE,4
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.h
deleted file mode 100644
index ca4059b95..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SPEECHCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SPEECHCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SpeechCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for SpeechCapabilities
-
-  class SpeechCapabilitiesMarshaller
-  {
-  public:
-  
-    static std::string toName(const SpeechCapabilities& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(SpeechCapabilities& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=SpeechCapabilities::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(SpeechCapabilities& e)		{ return e.mInternal!=SpeechCapabilities::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const SpeechCapabilities& e)	{ return e.mInternal!=SpeechCapabilities::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,SpeechCapabilities& e);
-    static const std::string toString(const SpeechCapabilities& e);
-  
-    static bool fromJSON(const Json::Value& s,SpeechCapabilities& e);
-    static Json::Value toJSON(const SpeechCapabilities& e);
-  
-    static const char* getName(SpeechCapabilities::SpeechCapabilitiesInternal e)
-    {
-       return (e>=0 && e<5) ? mHashTable[e].name : NULL;
-    }
-  
-    static const SpeechCapabilities::SpeechCapabilitiesInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[5];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.inc
deleted file mode 100644
index 9e89e0020..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.inc
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 5
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 15
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 15
-/* maximum key range = 12, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class SpeechCapabilities_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-SpeechCapabilities_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-SpeechCapabilities_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  0,  0,  7,  0,  0,  0,  0, 12, 13,
-       0, 15
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp"
-      {"TEXT",0},
-      {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp"
-      {"SILENCE",4},
-      {""}, {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp"
-      {"PRE_RECORDED",3},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp"
-      {"SAPI_PHONEMES",1},
-      {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SpeechCapabilitiesMarshaller.gp"
-      {"LHPLUS_PHONEMES",2}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTime.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTime.cpp
deleted file mode 100644
index b476a0c22..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTime.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/StartTime.h"
-#include "StartTimeMarshaller.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-StartTime::StartTime(const StartTime& c)
-{
-  *this=c;
-}
-
-
-bool StartTime::checkIntegrity(void)
-{
-  return StartTimeMarshaller::checkIntegrity(*this);
-}
-
-
-StartTime::StartTime(void)
-{
-}
-
-
-
-bool StartTime::set_hours(unsigned int hours_)
-{
-  if(hours_>59)  return false;
-  hours=hours_;
-  return true;
-}
-
-bool StartTime::set_minutes(unsigned int minutes_)
-{
-  if(minutes_>59)  return false;
-  minutes=minutes_;
-  return true;
-}
-
-bool StartTime::set_seconds(unsigned int seconds_)
-{
-  if(seconds_>59)  return false;
-  seconds=seconds_;
-  return true;
-}
-
-
-
-
-unsigned int StartTime::get_hours(void) const
-{
-  return hours;
-}
-
-
-unsigned int StartTime::get_minutes(void) const
-{
-  return minutes;
-}
-
-
-unsigned int StartTime::get_seconds(void) const
-{
-  return seconds;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.cpp
deleted file mode 100644
index 1e1cced84..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/StartTime.h"
-
-
-#include "StartTimeMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool StartTimeMarshaller::checkIntegrity(StartTime& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool StartTimeMarshaller::fromString(const std::string& s,StartTime& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string StartTimeMarshaller::toString(const StartTime& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool StartTimeMarshaller::checkIntegrityConst(const StartTime& s)
-{
-  if(s.hours>59)  return false;
-  if(s.minutes>59)  return false;
-  if(s.seconds>59)  return false;
-  return true;
-}
-
-Json::Value StartTimeMarshaller::toJSON(const StartTime& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["hours"]=Json::Value(e.hours);
-
-  json["minutes"]=Json::Value(e.minutes);
-
-  json["seconds"]=Json::Value(e.seconds);
-
-
-  return json;
-}
-
-
-bool StartTimeMarshaller::fromJSON(const Json::Value& json,StartTime& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("hours"))  return false;
-    {
-      const Json::Value& j=json["hours"];
-      if(!j.isInt())  return false;
-      c.hours=j.asInt();
-    }
-    if(!json.isMember("minutes"))  return false;
-    {
-      const Json::Value& j=json["minutes"];
-      if(!j.isInt())  return false;
-      c.minutes=j.asInt();
-    }
-    if(!json.isMember("seconds"))  return false;
-    {
-      const Json::Value& j=json["seconds"];
-      if(!j.isInt())  return false;
-      c.seconds=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.h
deleted file mode 100644
index 59d8c09c5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/StartTimeMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_STARTTIMEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_STARTTIMEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/StartTime.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct StartTimeMarshaller
-  {
-    static bool checkIntegrity(StartTime& e);
-    static bool checkIntegrityConst(const StartTime& e);
-  
-    static bool fromString(const std::string& s,StartTime& e);
-    static const std::string toString(const StartTime& e);
-  
-    static bool fromJSON(const Json::Value& s,StartTime& e);
-    static Json::Value toJSON(const StartTime& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_request.cpp
deleted file mode 100644
index bf1d4eb0b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_request.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h"
-#include "SubscribeButton_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ButtonNameMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SubscribeButton_request::~SubscribeButton_request(void)
-{
-}
-
-
-SubscribeButton_request::SubscribeButton_request(const SubscribeButton_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool SubscribeButton_request::checkIntegrity(void)
-{
-  return SubscribeButton_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SubscribeButton_request::SubscribeButton_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool SubscribeButton_request::set_buttonName(const ButtonName& buttonName_)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(buttonName_))   return false;
-  buttonName=buttonName_;
-  return true;
-}
-
-
-
-
-const ButtonName& SubscribeButton_request::get_buttonName(void) const 
-{
-  return buttonName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.cpp
deleted file mode 100644
index 516f5a081..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h"
-#include "ButtonNameMarshaller.h"
-
-#include "SubscribeButton_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SubscribeButton_requestMarshaller::checkIntegrity(SubscribeButton_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SubscribeButton_requestMarshaller::fromString(const std::string& s,SubscribeButton_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SubscribeButton_requestMarshaller::toString(const SubscribeButton_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SubscribeButton_requestMarshaller::checkIntegrityConst(const SubscribeButton_request& s)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(s.buttonName))  return false;
-  return true;
-}
-
-Json::Value SubscribeButton_requestMarshaller::toJSON(const SubscribeButton_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["buttonName"]=ButtonNameMarshaller::toJSON(e.buttonName);
-
-  return json;
-}
-
-
-bool SubscribeButton_requestMarshaller::fromJSON(const Json::Value& json,SubscribeButton_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("buttonName"))  return false;
-    {
-      const Json::Value& j=json["buttonName"];
-      if(!ButtonNameMarshaller::fromJSON(j,c.buttonName))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.h
deleted file mode 100644
index b3359b42d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SUBSCRIBEBUTTON_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SUBSCRIBEBUTTON_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SubscribeButton_requestMarshaller
-  {
-    static bool checkIntegrity(SubscribeButton_request& e);
-    static bool checkIntegrityConst(const SubscribeButton_request& e);
-  
-    static bool fromString(const std::string& s,SubscribeButton_request& e);
-    static const std::string toString(const SubscribeButton_request& e);
-  
-    static bool fromJSON(const Json::Value& s,SubscribeButton_request& e);
-    static Json::Value toJSON(const SubscribeButton_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_response.cpp
deleted file mode 100644
index cc290cd3c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h"
-#include "SubscribeButton_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SubscribeButton_response& SubscribeButton_response::operator =(const SubscribeButton_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-SubscribeButton_response::~SubscribeButton_response(void)
-{}
-
-SubscribeButton_response::SubscribeButton_response(const SubscribeButton_response& c)
-{
-    *this = c;
-}
-
-bool SubscribeButton_response::checkIntegrity(void)
-{
-    return SubscribeButton_responseMarshaller::checkIntegrity(*this);
-}
-
-SubscribeButton_response::SubscribeButton_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.cpp
deleted file mode 100644
index 24e3ed158..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h"
-#include "ResultMarshaller.h"
-
-#include "SubscribeButton_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SubscribeButton_responseMarshaller::checkIntegrity(SubscribeButton_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SubscribeButton_responseMarshaller::fromString(const std::string& s,SubscribeButton_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SubscribeButton_responseMarshaller::toString(const SubscribeButton_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SubscribeButton_responseMarshaller::checkIntegrityConst(const SubscribeButton_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value SubscribeButton_responseMarshaller::toJSON(const SubscribeButton_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool SubscribeButton_responseMarshaller::fromJSON(const Json::Value& json,SubscribeButton_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.h
deleted file mode 100644
index 4f2fd202a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SUBSCRIBEBUTTON_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SUBSCRIBEBUTTON_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SubscribeButton_responseMarshaller
-  {
-    static bool checkIntegrity(SubscribeButton_response& e);
-    static bool checkIntegrityConst(const SubscribeButton_response& e);
-  
-    static bool fromString(const std::string& s,SubscribeButton_response& e);
-    static const std::string toString(const SubscribeButton_response& e);
-  
-    static bool fromJSON(const Json::Value& s,SubscribeButton_response& e);
-    static Json::Value toJSON(const SubscribeButton_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_request.cpp
deleted file mode 100644
index 40c7fbfb7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_request.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h"
-#include "SubscribeVehicleData_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SubscribeVehicleData_request::~SubscribeVehicleData_request(void)
-{
-}
-
-
-SubscribeVehicleData_request::SubscribeVehicleData_request(const SubscribeVehicleData_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool SubscribeVehicleData_request::checkIntegrity(void)
-{
-  return SubscribeVehicleData_requestMarshaller::checkIntegrity(*this);
-}
-
-
-SubscribeVehicleData_request::SubscribeVehicleData_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool SubscribeVehicleData_request::set_dataType(const std::vector<VehicleDataType>& dataType_)
-{
-  unsigned int i=dataType_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!VehicleDataTypeMarshaller::checkIntegrityConst(dataType_[i]))   return false;
-  }
-  dataType=dataType_;
-  return true;
-}
-
-
-
-
-const std::vector<VehicleDataType>& SubscribeVehicleData_request::get_dataType(void) const 
-{
-  return dataType;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.cpp
deleted file mode 100644
index a5d9e6d58..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#include "SubscribeVehicleData_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SubscribeVehicleData_requestMarshaller::checkIntegrity(SubscribeVehicleData_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SubscribeVehicleData_requestMarshaller::fromString(const std::string& s,SubscribeVehicleData_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SubscribeVehicleData_requestMarshaller::toString(const SubscribeVehicleData_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SubscribeVehicleData_requestMarshaller::checkIntegrityConst(const SubscribeVehicleData_request& s)
-{
-  {
-    unsigned int i=s.dataType.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!VehicleDataTypeMarshaller::checkIntegrityConst(s.dataType[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value SubscribeVehicleData_requestMarshaller::toJSON(const SubscribeVehicleData_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["dataType"]=Json::Value(Json::arrayValue);
-  json["dataType"].resize(e.dataType.size());
-  for(unsigned int i=0;i<e.dataType.size();i++)
-    json["dataType"][i]=VehicleDataTypeMarshaller::toJSON(e.dataType[i]);
-
-  return json;
-}
-
-
-bool SubscribeVehicleData_requestMarshaller::fromJSON(const Json::Value& json,SubscribeVehicleData_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("dataType"))  return false;
-    {
-      const Json::Value& j=json["dataType"];
-      if(!j.isArray())  return false;
-      c.dataType.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          VehicleDataType t;
-          if(!VehicleDataTypeMarshaller::fromJSON(j[i],t))
-            return false;
-          c.dataType[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.h
deleted file mode 100644
index e4a88fd8f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SUBSCRIBEVEHICLEDATA_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SUBSCRIBEVEHICLEDATA_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SubscribeVehicleData_requestMarshaller
-  {
-    static bool checkIntegrity(SubscribeVehicleData_request& e);
-    static bool checkIntegrityConst(const SubscribeVehicleData_request& e);
-  
-    static bool fromString(const std::string& s,SubscribeVehicleData_request& e);
-    static const std::string toString(const SubscribeVehicleData_request& e);
-  
-    static bool fromJSON(const Json::Value& s,SubscribeVehicleData_request& e);
-    static Json::Value toJSON(const SubscribeVehicleData_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_response.cpp
deleted file mode 100644
index d16fda7c2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_response.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h"
-#include "SubscribeVehicleData_responseMarshaller.h"
-#include "VehicleDataResultMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-SubscribeVehicleData_response& SubscribeVehicleData_response::operator =(const SubscribeVehicleData_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-    dataResult = c.dataResult ? new std::vector<VehicleDataResult>(c.dataResult[0]) : 0;
-
-    return *this;
-}
-
-SubscribeVehicleData_response::~SubscribeVehicleData_response(void)
-{
-    if (dataResult)
-    {
-        delete dataResult;
-    }
-}
-
-SubscribeVehicleData_response::SubscribeVehicleData_response(const SubscribeVehicleData_response& c)
-{
-    *this = c;
-}
-
-bool SubscribeVehicleData_response::checkIntegrity(void)
-{
-    return SubscribeVehicleData_responseMarshaller::checkIntegrity(*this);
-}
-
-SubscribeVehicleData_response::SubscribeVehicleData_response(void)
-    : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-    , dataResult(0)
-{
-}
-
-bool SubscribeVehicleData_response::set_dataResult(const std::vector<VehicleDataResult>& dataResult_)
-{
-    unsigned int i = dataResult_.size();
-    if (i > 100 || i < 1)
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (!VehicleDataResultMarshaller::checkIntegrityConst(dataResult_[i]))
-        {
-            return false;
-        }
-    }
-    delete dataResult;
-    dataResult = 0;
-
-    dataResult = new std::vector<VehicleDataResult>(dataResult_);
-    return true;
-}
-
-void SubscribeVehicleData_response::reset_dataResult(void)
-{
-    if (dataResult)
-    {
-        delete dataResult;
-    }
-    dataResult = 0;
-}
-
-const std::vector<VehicleDataResult>* SubscribeVehicleData_response::get_dataResult(void) const
-{
-    return dataResult;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.cpp
deleted file mode 100644
index eca716aca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h"
-#include "ResultMarshaller.h"
-#include "VehicleDataResultMarshaller.h"
-
-#include "SubscribeVehicleData_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SubscribeVehicleData_responseMarshaller::checkIntegrity(SubscribeVehicleData_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SubscribeVehicleData_responseMarshaller::fromString(const std::string& s,SubscribeVehicleData_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SubscribeVehicleData_responseMarshaller::toString(const SubscribeVehicleData_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SubscribeVehicleData_responseMarshaller::checkIntegrityConst(const SubscribeVehicleData_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  if(s.dataResult)
-  {
-    unsigned int i=s.dataResult[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!VehicleDataResultMarshaller::checkIntegrityConst(s.dataResult[0][i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value SubscribeVehicleData_responseMarshaller::toJSON(const SubscribeVehicleData_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  if(e.dataResult)
-  {
-    unsigned int sz=e.dataResult->size();
-    json["dataResult"]=Json::Value(Json::arrayValue);
-    json["dataResult"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["dataResult"][i]=VehicleDataResultMarshaller::toJSON(e.dataResult[0][i]);
-  }
-
-  return json;
-}
-
-
-bool SubscribeVehicleData_responseMarshaller::fromJSON(const Json::Value& json,SubscribeVehicleData_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  if(c.dataResult)  delete c.dataResult;
-  c.dataResult=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-    if(json.isMember("dataResult"))
-    {
-      const Json::Value& j=json["dataResult"];
-      if(!j.isArray())  return false;
-      c.dataResult=new std::vector<VehicleDataResult>();
-      c.dataResult->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        VehicleDataResult t;
-        if(!VehicleDataResultMarshaller::fromJSON(j[i],t))
-          return false;
-        c.dataResult[0][i]=t;
-      }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.h
deleted file mode 100644
index cb2b101c9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SUBSCRIBEVEHICLEDATA_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SUBSCRIBEVEHICLEDATA_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SubscribeVehicleData_responseMarshaller
-  {
-    static bool checkIntegrity(SubscribeVehicleData_response& e);
-    static bool checkIntegrityConst(const SubscribeVehicleData_response& e);
-  
-    static bool fromString(const std::string& s,SubscribeVehicleData_response& e);
-    static const std::string toString(const SubscribeVehicleData_response& e);
-  
-    static bool fromJSON(const Json::Value& s,SubscribeVehicleData_response& e);
-    static Json::Value toJSON(const SubscribeVehicleData_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersion.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersion.cpp
deleted file mode 100644
index 50e3d7a1b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersion.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SyncMsgVersion.h"
-#include "SyncMsgVersionMarshaller.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-SyncMsgVersion::SyncMsgVersion(const SyncMsgVersion& c)
-{
-  *this=c;
-}
-
-
-bool SyncMsgVersion::checkIntegrity(void)
-{
-  return SyncMsgVersionMarshaller::checkIntegrity(*this);
-}
-
-
-SyncMsgVersion::SyncMsgVersion(void)
-{
-}
-
-
-
-bool SyncMsgVersion::set_majorVersion(unsigned int majorVersion_)
-{
-  if(majorVersion_>10)  return false;
-  if(majorVersion_<1)  return false;
-  majorVersion=majorVersion_;
-  return true;
-}
-
-bool SyncMsgVersion::set_minorVersion(unsigned int minorVersion_)
-{
-  if(minorVersion_>1000)  return false;
-  minorVersion=minorVersion_;
-  return true;
-}
-
-
-
-
-unsigned int SyncMsgVersion::get_majorVersion(void) const
-{
-  return majorVersion;
-}
-
-
-unsigned int SyncMsgVersion::get_minorVersion(void) const
-{
-  return minorVersion;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.cpp
deleted file mode 100644
index d81d8e471..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SyncMsgVersion.h"
-
-
-#include "SyncMsgVersionMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool SyncMsgVersionMarshaller::checkIntegrity(SyncMsgVersion& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool SyncMsgVersionMarshaller::fromString(const std::string& s,SyncMsgVersion& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string SyncMsgVersionMarshaller::toString(const SyncMsgVersion& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool SyncMsgVersionMarshaller::checkIntegrityConst(const SyncMsgVersion& s)
-{
-  if(s.majorVersion>10)  return false;
-  if(s.majorVersion<1)  return false;
-  if(s.minorVersion>1000)  return false;
-  return true;
-}
-
-Json::Value SyncMsgVersionMarshaller::toJSON(const SyncMsgVersion& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["majorVersion"]=Json::Value(e.majorVersion);
-
-  json["minorVersion"]=Json::Value(e.minorVersion);
-
-
-  return json;
-}
-
-
-bool SyncMsgVersionMarshaller::fromJSON(const Json::Value& json,SyncMsgVersion& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("majorVersion"))  return false;
-    {
-      const Json::Value& j=json["majorVersion"];
-      if(!j.isInt())  return false;
-      c.majorVersion=j.asInt();
-    }
-    if(!json.isMember("minorVersion"))  return false;
-    {
-      const Json::Value& j=json["minorVersion"];
-      if(!j.isInt())  return false;
-      c.minorVersion=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.h
deleted file mode 100644
index 01bdb174c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SyncMsgVersionMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SYNCMSGVERSIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SYNCMSGVERSIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SyncMsgVersion.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct SyncMsgVersionMarshaller
-  {
-    static bool checkIntegrity(SyncMsgVersion& e);
-    static bool checkIntegrityConst(const SyncMsgVersion& e);
-  
-    static bool fromString(const std::string& s,SyncMsgVersion& e);
-    static const std::string toString(const SyncMsgVersion& e);
-  
-    static bool fromJSON(const Json::Value& s,SyncMsgVersion& e);
-    static Json::Value toJSON(const SyncMsgVersion& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.cpp
deleted file mode 100644
index 854024666..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/SystemAction.h"
-#include "SystemActionMarshaller.h"
-#include "SystemActionMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const SystemAction::SystemActionInternal SystemActionMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return SystemAction::INVALID_ENUM;
-  const struct PerfectHashTable* p=SystemAction_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<SystemAction::SystemActionInternal>(p->idx) : SystemAction::INVALID_ENUM;
-}
-
-
-bool SystemActionMarshaller::fromJSON(const Json::Value& s,SystemAction& e)
-{
-  e.mInternal=SystemAction::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=SystemAction::INVALID_ENUM);
-}
-
-
-Json::Value SystemActionMarshaller::toJSON(const SystemAction& e)
-{
-  if(e.mInternal==SystemAction::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SystemActionMarshaller::fromString(const std::string& s,SystemAction& e)
-{
-  e.mInternal=SystemAction::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string SystemActionMarshaller::toString(const SystemAction& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==SystemAction::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SystemActionMarshaller::mHashTable[3]=
-{
-  {"DEFAULT_ACTION",0},
-  {"STEAL_FOCUS",1},
-  {"KEEP_CONTEXT",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp
deleted file mode 100644
index d9189498b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SystemAction_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-DEFAULT_ACTION,0
-STEAL_FOCUS,1
-KEEP_CONTEXT,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.h
deleted file mode 100644
index 7ec9eaa3f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SYSTEMACTIONMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SYSTEMACTIONMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SystemAction.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for SystemAction
-
-  class SystemActionMarshaller
-  {
-  public:
-  
-    static std::string toName(const SystemAction& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(SystemAction& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=SystemAction::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(SystemAction& e)		{ return e.mInternal!=SystemAction::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const SystemAction& e)	{ return e.mInternal!=SystemAction::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,SystemAction& e);
-    static const std::string toString(const SystemAction& e);
-  
-    static bool fromJSON(const Json::Value& s,SystemAction& e);
-    static Json::Value toJSON(const SystemAction& e);
-  
-    static const char* getName(SystemAction::SystemActionInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const SystemAction::SystemActionInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.inc
deleted file mode 100644
index eac357b27..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (c) 2013 Ford Motor Company */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 11
-#define MAX_WORD_LENGTH 14
-#define MIN_HASH_VALUE 11
-#define MAX_HASH_VALUE 14
-/* maximum key range = 4, duplicates = 0 */
-
-class SystemAction_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-SystemAction_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-SystemAction_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11, 12,  0,
-      14
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp"
-      {"STEAL_FOCUS",1},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp"
-      {"KEEP_CONTEXT",2},
-      {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemActionMarshaller.gp"
-      {"DEFAULT_ACTION",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.cpp
deleted file mode 100644
index 7205c8a2f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/SystemContext.h"
-#include "SystemContextMarshaller.h"
-#include "SystemContextMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const SystemContext::SystemContextInternal SystemContextMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return SystemContext::INVALID_ENUM;
-  const struct PerfectHashTable* p=SystemContext_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<SystemContext::SystemContextInternal>(p->idx) : SystemContext::INVALID_ENUM;
-}
-
-
-bool SystemContextMarshaller::fromJSON(const Json::Value& s,SystemContext& e)
-{
-  e.mInternal=SystemContext::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=SystemContext::INVALID_ENUM);
-}
-
-
-Json::Value SystemContextMarshaller::toJSON(const SystemContext& e)
-{
-  if(e.mInternal==SystemContext::INVALID_ENUM)
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool SystemContextMarshaller::fromString(const std::string& s,SystemContext& e)
-{
-  e.mInternal=SystemContext::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string SystemContextMarshaller::toString(const SystemContext& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==SystemContext::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable SystemContextMarshaller::mHashTable[7]=
-{
-  {"MAIN",0},
-  {"VRSESSION",1},
-  {"MENU",2},
-  {"HMI_OBSCURED",3},
-  {"ALERT",4},
-  {"NOT_AUDIBLE",5},
-  {"AUDIBLE",6}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp
deleted file mode 100644
index 86239917d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp
+++ /dev/null
@@ -1,23 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name SystemContext_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-MAIN,0
-VRSESSION,1
-MENU,2
-HMI_OBSCURED,3
-ALERT,4
-NOT_AUDIBLE,5
-AUDIBLE,6
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.h
deleted file mode 100644
index aa12901b1..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_SYSTEMCONTEXTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_SYSTEMCONTEXTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/SystemContext.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for SystemContext
-
-  class SystemContextMarshaller
-  {
-  public:
-
-    static std::string toName(const SystemContext& e) 	{ return getName(e.mInternal) ?: ""; }
-
-    static bool fromName(SystemContext& e,const std::string& s)
-    {
-      return (e.mInternal=getIndex(s.c_str()))!=SystemContext::INVALID_ENUM;
-    }
-
-    static bool checkIntegrity(SystemContext& e)		{ return e.mInternal!=SystemContext::INVALID_ENUM; }
-    static bool checkIntegrityConst(const SystemContext& e)	{ return e.mInternal!=SystemContext::INVALID_ENUM; }
-
-    static bool fromString(const std::string& s,SystemContext& e);
-    static const std::string toString(const SystemContext& e);
-
-    static bool fromJSON(const Json::Value& s,SystemContext& e);
-    static Json::Value toJSON(const SystemContext& e);
-
-    static const char* getName(SystemContext::SystemContextInternal e)
-    {
-       return (e>=0 && e<7) ? mHashTable[e].name : NULL;
-    }
-
-    static const SystemContext::SystemContextInternal getIndex(const char* s);
-
-    static const PerfectHashTable mHashTable[7];
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.inc
deleted file mode 100644
index f5df67c2b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.inc
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp  */
-/* Computed positions: -k'2' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 7
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 12
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 12
-/* maximum key range = 9, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class SystemContext_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-SystemContext_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13,  2, 13, 13, 13,  0,
-      13, 13, 13, 13, 13, 13,  0,  0, 13,  0,
-      13, 13,  0, 13, 13,  0, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13
-    };
-  return len + asso_values[(unsigned char)str[1]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-SystemContext_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  5,  4,  7,  0,  9,  0, 11, 12
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
-      {"MENU",2},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
-      {"ALERT",4},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
-      {"MAIN",0},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
-      {"AUDIBLE",6},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
-      {"VRSESSION",1},
-      {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
-      {"NOT_AUDIBLE",5},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/SystemContextMarshaller.gp"
-      {"HMI_OBSCURED",3}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.cpp
deleted file mode 100644
index 7d72a5929..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/TBTState.h"
-#include "TBTStateMarshaller.h"
-#include "TBTStateMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const TBTState::TBTStateInternal TBTStateMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return TBTState::INVALID_ENUM;
-  const struct PerfectHashTable* p=TBTState_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<TBTState::TBTStateInternal>(p->idx) : TBTState::INVALID_ENUM;
-}
-
-
-bool TBTStateMarshaller::fromJSON(const Json::Value& s,TBTState& e)
-{
-  e.mInternal=TBTState::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=TBTState::INVALID_ENUM);
-}
-
-
-Json::Value TBTStateMarshaller::toJSON(const TBTState& e)
-{
-  if(e.mInternal==TBTState::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TBTStateMarshaller::fromString(const std::string& s,TBTState& e)
-{
-  e.mInternal=TBTState::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string TBTStateMarshaller::toString(const TBTState& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==TBTState::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TBTStateMarshaller::mHashTable[10]=
-{
-  {"ROUTE_UPDATE_REQUEST",0},
-  {"ROUTE_ACCEPTED",1},
-  {"ROUTE_REFUSED",2},
-  {"ROUTE_CANCELLED",3},
-  {"ETA_REQUEST",4},
-  {"NEXT_TURN_REQUEST",5},
-  {"ROUTE_STATUS_REQUEST",6},
-  {"ROUTE_SUMMARY_REQUEST",7},
-  {"TRIP_STATUS_REQUEST",8},
-  {"ROUTE_UPDATE_REQUEST_TIMEOUT",9}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp
deleted file mode 100644
index e4a0f1876..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp
+++ /dev/null
@@ -1,26 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TBTState_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-ROUTE_UPDATE_REQUEST,0
-ROUTE_ACCEPTED,1
-ROUTE_REFUSED,2
-ROUTE_CANCELLED,3
-ETA_REQUEST,4
-NEXT_TURN_REQUEST,5
-ROUTE_STATUS_REQUEST,6
-ROUTE_SUMMARY_REQUEST,7
-TRIP_STATUS_REQUEST,8
-ROUTE_UPDATE_REQUEST_TIMEOUT,9
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.h
deleted file mode 100644
index 746d65291..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TBTSTATEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TBTSTATEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TBTState.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for TBTState
-
-  class TBTStateMarshaller
-  {
-  public:
-  
-    static std::string toName(const TBTState& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(TBTState& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=TBTState::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(TBTState& e)		{ return e.mInternal!=TBTState::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const TBTState& e)	{ return e.mInternal!=TBTState::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,TBTState& e);
-    static const std::string toString(const TBTState& e);
-  
-    static bool fromJSON(const Json::Value& s,TBTState& e);
-    static Json::Value toJSON(const TBTState& e);
-  
-    static const char* getName(TBTState::TBTStateInternal e)
-    {
-       return (e>=0 && e<10) ? mHashTable[e].name : NULL;
-    }
-  
-    static const TBTState::TBTStateInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[10];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.inc
deleted file mode 100644
index 6749bae70..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.inc
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp  */
-/* Computed positions: -k'7' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 10
-#define MIN_WORD_LENGTH 11
-#define MAX_WORD_LENGTH 28
-#define MIN_HASH_VALUE 11
-#define MAX_HASH_VALUE 28
-/* maximum key range = 18, duplicates = 0 */
-
-class TBTState_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-TBTState_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29,  0, 29,  0, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29,  0,  0,  5,  0,  0, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29
-    };
-  return len + asso_values[(unsigned char)str[6]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-TBTState_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  0, 13,
-      14, 15,  0, 17,  0, 19, 20,  0,  0,  0,  0, 20, 21,  0,
-      28
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
-      {"ETA_REQUEST",4},
-      {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
-      {"ROUTE_REFUSED",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
-      {"ROUTE_ACCEPTED",1},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
-      {"ROUTE_CANCELLED",3},
-      {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
-      {"NEXT_TURN_REQUEST",5},
-      {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
-      {"TRIP_STATUS_REQUEST",8},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
-      {"ROUTE_UPDATE_REQUEST",0},
-      {""}, {""}, {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
-      {"ROUTE_STATUS_REQUEST",6},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
-      {"ROUTE_SUMMARY_REQUEST",7},
-      {""},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TBTStateMarshaller.gp"
-      {"ROUTE_UPDATE_REQUEST_TIMEOUT",9}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunk.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunk.cpp
deleted file mode 100644
index 5b5ae21d2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunk.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-#include "TTSChunkMarshaller.h"
-#include "SpeechCapabilitiesMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-TTSChunk::TTSChunk(const TTSChunk& c)
-{
-  *this=c;
-}
-
-
-bool TTSChunk::checkIntegrity(void)
-{
-  return TTSChunkMarshaller::checkIntegrity(*this);
-}
-
-
-TTSChunk::TTSChunk(void)
-{
-}
-
-
-
-bool TTSChunk::set_text(const std::string& text_)
-{
-  if(text_.length()>500)  return false;
-  text=text_;
-  return true;
-}
-
-bool TTSChunk::set_type(const SpeechCapabilities& type_)
-{
-  if(!SpeechCapabilitiesMarshaller::checkIntegrityConst(type_))   return false;
-  type=type_;
-  return true;
-}
-
-
-
-
-const std::string& TTSChunk::get_text(void) const 
-{
-  return text;
-}
-
-
-const SpeechCapabilities& TTSChunk::get_type(void) const 
-{
-  return type;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.cpp
deleted file mode 100644
index e3c832f8f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-#include "SpeechCapabilitiesMarshaller.h"
-
-#include "TTSChunkMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool TTSChunkMarshaller::checkIntegrity(TTSChunk& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool TTSChunkMarshaller::fromString(const std::string& s,TTSChunk& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string TTSChunkMarshaller::toString(const TTSChunk& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool TTSChunkMarshaller::checkIntegrityConst(const TTSChunk& s)
-{
-  if(s.text.length()>500)  return false;
-  if(!SpeechCapabilitiesMarshaller::checkIntegrityConst(s.type))  return false;
-  return true;
-}
-
-Json::Value TTSChunkMarshaller::toJSON(const TTSChunk& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["text"]=Json::Value(e.text);
-
-  json["type"]=SpeechCapabilitiesMarshaller::toJSON(e.type);
-
-
-  return json;
-}
-
-
-bool TTSChunkMarshaller::fromJSON(const Json::Value& json,TTSChunk& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("text"))  return false;
-    {
-      const Json::Value& j=json["text"];
-      if(!j.isString())  return false;
-      c.text=j.asString();
-    }
-    if(!json.isMember("type"))  return false;
-    {
-      const Json::Value& j=json["type"];
-      if(!SpeechCapabilitiesMarshaller::fromJSON(j,c.type))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h
deleted file mode 100644
index b13fa1e57..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TTSChunkMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TTSCHUNKMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TTSCHUNKMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct TTSChunkMarshaller
-  {
-    static bool checkIntegrity(TTSChunk& e);
-    static bool checkIntegrityConst(const TTSChunk& e);
-  
-    static bool fromString(const std::string& s,TTSChunk& e);
-    static const std::string toString(const TTSChunk& e);
-  
-    static bool fromJSON(const Json::Value& s,TTSChunk& e);
-    static Json::Value toJSON(const TTSChunk& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.cpp
deleted file mode 100644
index 400de0528..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextAlignment.h"
-#include "TextAlignmentMarshaller.h"
-#include "TextAlignmentMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const TextAlignment::TextAlignmentInternal TextAlignmentMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return TextAlignment::INVALID_ENUM;
-  const struct PerfectHashTable* p=TextAlignment_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<TextAlignment::TextAlignmentInternal>(p->idx) : TextAlignment::INVALID_ENUM;
-}
-
-
-bool TextAlignmentMarshaller::fromJSON(const Json::Value& s,TextAlignment& e)
-{
-  e.mInternal=TextAlignment::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=TextAlignment::INVALID_ENUM);
-}
-
-
-Json::Value TextAlignmentMarshaller::toJSON(const TextAlignment& e)
-{
-  if(e.mInternal==TextAlignment::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TextAlignmentMarshaller::fromString(const std::string& s,TextAlignment& e)
-{
-  e.mInternal=TextAlignment::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string TextAlignmentMarshaller::toString(const TextAlignment& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==TextAlignment::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TextAlignmentMarshaller::mHashTable[3]=
-{
-  {"LEFT_ALIGNED",0},
-  {"RIGHT_ALIGNED",1},
-  {"CENTERED",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp
deleted file mode 100644
index d36329373..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TextAlignment_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-LEFT_ALIGNED,0
-RIGHT_ALIGNED,1
-CENTERED,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.h
deleted file mode 100644
index ec30427ae..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TEXTALIGNMENTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TEXTALIGNMENTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextAlignment.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for TextAlignment
-
-  class TextAlignmentMarshaller
-  {
-  public:
-  
-    static std::string toName(const TextAlignment& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(TextAlignment& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=TextAlignment::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(TextAlignment& e)		{ return e.mInternal!=TextAlignment::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const TextAlignment& e)	{ return e.mInternal!=TextAlignment::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,TextAlignment& e);
-    static const std::string toString(const TextAlignment& e);
-  
-    static bool fromJSON(const Json::Value& s,TextAlignment& e);
-    static Json::Value toJSON(const TextAlignment& e);
-  
-    static const char* getName(TextAlignment::TextAlignmentInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const TextAlignment::TextAlignmentInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.inc
deleted file mode 100644
index a7e942a84..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.inc
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 8
-#define MAX_WORD_LENGTH 13
-#define MIN_HASH_VALUE 8
-#define MAX_HASH_VALUE 13
-/* maximum key range = 6, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class TextAlignment_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-TextAlignment_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-TextAlignment_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0, 12, 13
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp"
-      {"CENTERED",2},
-      {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp"
-      {"LEFT_ALIGNED",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextAlignmentMarshaller.gp"
-      {"RIGHT_ALIGNED",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextField.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextField.cpp
deleted file mode 100644
index f212e03f2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextField.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextField.h"
-#include "TextFieldMarshaller.h"
-#include "CharacterSetMarshaller.h"
-#include "TextFieldNameMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-TextField::TextField(const TextField& c)
-{
-  *this=c;
-}
-
-
-bool TextField::checkIntegrity(void)
-{
-  return TextFieldMarshaller::checkIntegrity(*this);
-}
-
-
-TextField::TextField(void)
-{
-}
-
-
-
-bool TextField::set_characterSet(const CharacterSet& characterSet_)
-{
-  if(!CharacterSetMarshaller::checkIntegrityConst(characterSet_))   return false;
-  characterSet=characterSet_;
-  return true;
-}
-
-bool TextField::set_name(const TextFieldName& name_)
-{
-  if(!TextFieldNameMarshaller::checkIntegrityConst(name_))   return false;
-  name=name_;
-  return true;
-}
-
-bool TextField::set_rows(unsigned int rows_)
-{
-  if(rows_>3)  return false;
-  if(rows_<1)  return false;
-  rows=rows_;
-  return true;
-}
-
-bool TextField::set_width(unsigned int width_)
-{
-  if(width_>500)  return false;
-  if(width_<1)  return false;
-  width=width_;
-  return true;
-}
-
-
-
-
-const CharacterSet& TextField::get_characterSet(void) const 
-{
-  return characterSet;
-}
-
-
-const TextFieldName& TextField::get_name(void) const 
-{
-  return name;
-}
-
-
-unsigned int TextField::get_rows(void) const
-{
-  return rows;
-}
-
-
-unsigned int TextField::get_width(void) const
-{
-  return width;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.cpp
deleted file mode 100644
index 704fb99e2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextField.h"
-#include "CharacterSetMarshaller.h"
-#include "TextFieldNameMarshaller.h"
-
-#include "TextFieldMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool TextFieldMarshaller::checkIntegrity(TextField& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool TextFieldMarshaller::fromString(const std::string& s,TextField& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string TextFieldMarshaller::toString(const TextField& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool TextFieldMarshaller::checkIntegrityConst(const TextField& s)
-{
-  if(!CharacterSetMarshaller::checkIntegrityConst(s.characterSet))  return false;
-  if(!TextFieldNameMarshaller::checkIntegrityConst(s.name))  return false;
-  if(s.rows>3)  return false;
-  if(s.rows<1)  return false;
-  if(s.width>500)  return false;
-  if(s.width<1)  return false;
-  return true;
-}
-
-Json::Value TextFieldMarshaller::toJSON(const TextField& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["characterSet"]=CharacterSetMarshaller::toJSON(e.characterSet);
-
-  json["name"]=TextFieldNameMarshaller::toJSON(e.name);
-
-  json["rows"]=Json::Value(e.rows);
-
-  json["width"]=Json::Value(e.width);
-
-
-  return json;
-}
-
-
-bool TextFieldMarshaller::fromJSON(const Json::Value& json,TextField& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("characterSet"))  return false;
-    {
-      const Json::Value& j=json["characterSet"];
-      if(!CharacterSetMarshaller::fromJSON(j,c.characterSet))
-        return false;
-    }
-    if(!json.isMember("name"))  return false;
-    {
-      const Json::Value& j=json["name"];
-      if(!TextFieldNameMarshaller::fromJSON(j,c.name))
-        return false;
-    }
-    if(!json.isMember("rows"))  return false;
-    {
-      const Json::Value& j=json["rows"];
-      if(!j.isInt())  return false;
-      c.rows=j.asInt();
-    }
-    if(!json.isMember("width"))  return false;
-    {
-      const Json::Value& j=json["width"];
-      if(!j.isInt())  return false;
-      c.width=j.asInt();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.h
deleted file mode 100644
index 150f8dd42..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TEXTFIELDMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TEXTFIELDMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextField.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct TextFieldMarshaller
-  {
-    static bool checkIntegrity(TextField& e);
-    static bool checkIntegrityConst(const TextField& e);
-  
-    static bool fromString(const std::string& s,TextField& e);
-    static const std::string toString(const TextField& e);
-  
-    static bool fromJSON(const Json::Value& s,TextField& e);
-    static Json::Value toJSON(const TextField& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.cpp
deleted file mode 100644
index f2e6b429b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextFieldName.h"
-#include "TextFieldNameMarshaller.h"
-#include "TextFieldNameMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const TextFieldName::TextFieldNameInternal TextFieldNameMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return TextFieldName::INVALID_ENUM;
-  const struct PerfectHashTable* p=TextFieldName_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<TextFieldName::TextFieldNameInternal>(p->idx) : TextFieldName::INVALID_ENUM;
-}
-
-
-bool TextFieldNameMarshaller::fromJSON(const Json::Value& s,TextFieldName& e)
-{
-  e.mInternal=TextFieldName::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=TextFieldName::INVALID_ENUM);
-}
-
-
-Json::Value TextFieldNameMarshaller::toJSON(const TextFieldName& e)
-{
-  if(e.mInternal==TextFieldName::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TextFieldNameMarshaller::fromString(const std::string& s,TextFieldName& e)
-{
-  e.mInternal=TextFieldName::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string TextFieldNameMarshaller::toString(const TextFieldName& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==TextFieldName::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TextFieldNameMarshaller::mHashTable[20]=
-{
-  {"mainField1",0},
-  {"mainField2",1},
-  {"mainField3",2},
-  {"mainField4",3},
-  {"statusBar",4},
-  {"mediaClock",5},
-  {"mediaTrack",6},
-  {"alertText1",7},
-  {"alertText2",8},
-  {"alertText3",9},
-  {"scrollableMessageBody",10},
-  {"initialInteractionText",11},
-  {"navigationText1",12},
-  {"navigationText2",13},
-  {"ETA",14},
-  {"totalDistance",15},
-  {"audioPassThruDisplayText1",16},
-  {"audioPassThruDisplayText2",17},
-  {"sliderHeader",18},
-  {"sliderFooter",19}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp
deleted file mode 100644
index bf4ffae31..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp
+++ /dev/null
@@ -1,36 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TextFieldName_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-mainField1,0
-mainField2,1
-mainField3,2
-mainField4,3
-statusBar,4
-mediaClock,5
-mediaTrack,6
-alertText1,7
-alertText2,8
-alertText3,9
-scrollableMessageBody,10
-initialInteractionText,11
-navigationText1,12
-navigationText2,13
-ETA,14
-totalDistance,15
-audioPassThruDisplayText1,16
-audioPassThruDisplayText2,17
-sliderHeader,18
-sliderFooter,19
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.h
deleted file mode 100644
index c824a9419..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TEXTFIELDNAMEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TEXTFIELDNAMEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TextFieldName.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for TextFieldName
-
-  class TextFieldNameMarshaller
-  {
-  public:
-  
-    static std::string toName(const TextFieldName& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(TextFieldName& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=TextFieldName::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(TextFieldName& e)		{ return e.mInternal!=TextFieldName::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const TextFieldName& e)	{ return e.mInternal!=TextFieldName::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,TextFieldName& e);
-    static const std::string toString(const TextFieldName& e);
-  
-    static bool fromJSON(const Json::Value& s,TextFieldName& e);
-    static Json::Value toJSON(const TextFieldName& e);
-  
-    static const char* getName(TextFieldName::TextFieldNameInternal e)
-    {
-       return (e>=0 && e<20) ? mHashTable[e].name : NULL;
-    }
-  
-    static const TextFieldName::TextFieldNameInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[20];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.inc
deleted file mode 100644
index 6351c04a8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.inc
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp  */
-/* Computed positions: -k'8,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 20
-#define MIN_WORD_LENGTH 3
-#define MAX_WORD_LENGTH 25
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 50
-/* maximum key range = 48, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class TextFieldName_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-TextFieldName_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51,  5,
-       0, 23, 30, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51,  0, 51, 51, 51, 51,
-      51, 51, 51,  0, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 10,  0, 51,
-      51,  0, 51, 51, 51, 25, 51,  8, 10, 51,
-      51,  5, 51, 51,  0,  5,  0, 51, 51, 51,
-       0,  0, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[7]];
-      /*FALLTHROUGH*/
-      case 7:
-      case 6:
-      case 5:
-      case 4:
-      case 3:
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-TextFieldName_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  3,  0,  0,  0,  0,  0,  0, 10,  0, 12,  0,
-       0, 10,  0, 12, 13,  9, 10, 21, 22, 10,  0, 10,  0,  0,
-      10,  0, 25,  0,  0, 10,  0, 25,  0,  0,  0,  0, 15,  0,
-       0, 10,  0, 15,  0,  0,  0,  0, 10
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"ETA",14},
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"alertText2",8},
-      {""},
-#line 35 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"sliderHeader",18},
-      {""}, {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"alertText1",7},
-      {""},
-#line 36 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"sliderFooter",19},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"totalDistance",15},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"statusBar",4},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"mainField2",1},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"scrollableMessageBody",10},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"initialInteractionText",11},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"mediaClock",5},
-      {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"mainField1",0},
-      {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"mediaTrack",6},
-      {""},
-#line 34 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"audioPassThruDisplayText2",17},
-      {""}, {""},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"alertText3",9},
-      {""},
-#line 33 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"audioPassThruDisplayText1",16},
-      {""}, {""}, {""}, {""},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"navigationText2",13},
-      {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"mainField3",2},
-      {""},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"navigationText1",12},
-      {""}, {""}, {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TextFieldNameMarshaller.gp"
-      {"mainField4",3}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.cpp
deleted file mode 100644
index 03cca50ab..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/TimerMode.h"
-#include "TimerModeMarshaller.h"
-#include "TimerModeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const TimerMode::TimerModeInternal TimerModeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return TimerMode::INVALID_ENUM;
-  const struct PerfectHashTable* p=TimerMode_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<TimerMode::TimerModeInternal>(p->idx) : TimerMode::INVALID_ENUM;
-}
-
-
-bool TimerModeMarshaller::fromJSON(const Json::Value& s,TimerMode& e)
-{
-  e.mInternal=TimerMode::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=TimerMode::INVALID_ENUM);
-}
-
-
-Json::Value TimerModeMarshaller::toJSON(const TimerMode& e)
-{
-  if(e.mInternal==TimerMode::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TimerModeMarshaller::fromString(const std::string& s,TimerMode& e)
-{
-  e.mInternal=TimerMode::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string TimerModeMarshaller::toString(const TimerMode& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==TimerMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TimerModeMarshaller::mHashTable[3]=
-{
-  {"UP",0},
-  {"DOWN",1},
-  {"NONE",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp
deleted file mode 100644
index 68d794858..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TimerMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-UP,0
-DOWN,1
-NONE,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.h
deleted file mode 100644
index 96f814636..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TIMERMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TIMERMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TimerMode.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for TimerMode
-
-  class TimerModeMarshaller
-  {
-  public:
-  
-    static std::string toName(const TimerMode& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(TimerMode& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=TimerMode::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(TimerMode& e)		{ return e.mInternal!=TimerMode::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const TimerMode& e)	{ return e.mInternal!=TimerMode::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,TimerMode& e);
-    static const std::string toString(const TimerMode& e);
-  
-    static bool fromJSON(const Json::Value& s,TimerMode& e);
-    static Json::Value toJSON(const TimerMode& e);
-  
-    static const char* getName(TimerMode::TimerModeInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const TimerMode::TimerModeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.inc
deleted file mode 100644
index 4c5cf2c46..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.inc
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp  */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 4
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 5
-/* maximum key range = 4, duplicates = 0 */
-
-class TimerMode_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-TimerMode_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 1, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 0, 6,
-      6, 6, 6, 6, 6, 0, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-TimerMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  2,  0,  4,  4
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp"
-      {"UP",0},
-      {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp"
-      {"NONE",2},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TimerModeMarshaller.gp"
-      {"DOWN",1}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.cpp
deleted file mode 100644
index 19e909b36..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/TirePressureTellTale.h"
-#include "TirePressureTellTaleMarshaller.h"
-#include "TirePressureTellTaleMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const TirePressureTellTale::TirePressureTellTaleInternal TirePressureTellTaleMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return TirePressureTellTale::INVALID_ENUM;
-  const struct PerfectHashTable* p=TirePressureTellTale_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<TirePressureTellTale::TirePressureTellTaleInternal>(p->idx) : TirePressureTellTale::INVALID_ENUM;
-}
-
-
-bool TirePressureTellTaleMarshaller::fromJSON(const Json::Value& s,TirePressureTellTale& e)
-{
-  e.mInternal=TirePressureTellTale::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=TirePressureTellTale::INVALID_ENUM);
-}
-
-
-Json::Value TirePressureTellTaleMarshaller::toJSON(const TirePressureTellTale& e)
-{
-  if(e.mInternal==TirePressureTellTale::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TirePressureTellTaleMarshaller::fromString(const std::string& s,TirePressureTellTale& e)
-{
-  e.mInternal=TirePressureTellTale::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string TirePressureTellTaleMarshaller::toString(const TirePressureTellTale& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==TirePressureTellTale::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TirePressureTellTaleMarshaller::mHashTable[3]=
-{
-  {"OFF",0},
-  {"ON",1},
-  {"FLASH",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp
deleted file mode 100644
index 090ca82af..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TirePressureTellTale_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-OFF,0
-ON,1
-FLASH,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.h
deleted file mode 100644
index 86dee3ab8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TIREPRESSURETELLTALEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TIREPRESSURETELLTALEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TirePressureTellTale.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for TirePressureTellTale
-
-  class TirePressureTellTaleMarshaller
-  {
-  public:
-  
-    static std::string toName(const TirePressureTellTale& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(TirePressureTellTale& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=TirePressureTellTale::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(TirePressureTellTale& e)		{ return e.mInternal!=TirePressureTellTale::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const TirePressureTellTale& e)	{ return e.mInternal!=TirePressureTellTale::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,TirePressureTellTale& e);
-    static const std::string toString(const TirePressureTellTale& e);
-  
-    static bool fromJSON(const Json::Value& s,TirePressureTellTale& e);
-    static Json::Value toJSON(const TirePressureTellTale& e);
-  
-    static const char* getName(TirePressureTellTale::TirePressureTellTaleInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const TirePressureTellTale::TirePressureTellTaleInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.inc
deleted file mode 100644
index 880dad58b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 5
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 5
-/* maximum key range = 4, duplicates = 0 */
-
-class TirePressureTellTale_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-TirePressureTellTale_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-TirePressureTellTale_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  2,  3,  0,  5
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp"
-      {"ON",1},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp"
-      {"OFF",0},
-      {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TirePressureTellTaleMarshaller.gp"
-      {"FLASH",2}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatus.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatus.cpp
deleted file mode 100644
index 9944a27fd..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatus.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TireStatus.h"
-#include "TireStatusMarshaller.h"
-#include "SingleTireStatusMarshaller.h"
-#include "TirePressureTellTaleMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-TireStatus::TireStatus(const TireStatus& c)
-{
-  *this=c;
-}
-
-
-bool TireStatus::checkIntegrity(void)
-{
-  return TireStatusMarshaller::checkIntegrity(*this);
-}
-
-
-TireStatus::TireStatus(void)
-{
-}
-
-
-
-bool TireStatus::set_innerLeftRear(const SingleTireStatus& innerLeftRear_)
-{
-  if(!SingleTireStatusMarshaller::checkIntegrityConst(innerLeftRear_))   return false;
-  innerLeftRear=innerLeftRear_;
-  return true;
-}
-
-bool TireStatus::set_innerRightRear(const SingleTireStatus& innerRightRear_)
-{
-  if(!SingleTireStatusMarshaller::checkIntegrityConst(innerRightRear_))   return false;
-  innerRightRear=innerRightRear_;
-  return true;
-}
-
-bool TireStatus::set_leftFront(const SingleTireStatus& leftFront_)
-{
-  if(!SingleTireStatusMarshaller::checkIntegrityConst(leftFront_))   return false;
-  leftFront=leftFront_;
-  return true;
-}
-
-bool TireStatus::set_leftRear(const SingleTireStatus& leftRear_)
-{
-  if(!SingleTireStatusMarshaller::checkIntegrityConst(leftRear_))   return false;
-  leftRear=leftRear_;
-  return true;
-}
-
-bool TireStatus::set_pressureTellTale(const TirePressureTellTale& pressureTellTale_)
-{
-  if(!TirePressureTellTaleMarshaller::checkIntegrityConst(pressureTellTale_))   return false;
-  pressureTellTale=pressureTellTale_;
-  return true;
-}
-
-bool TireStatus::set_rightFront(const SingleTireStatus& rightFront_)
-{
-  if(!SingleTireStatusMarshaller::checkIntegrityConst(rightFront_))   return false;
-  rightFront=rightFront_;
-  return true;
-}
-
-bool TireStatus::set_rightRear(const SingleTireStatus& rightRear_)
-{
-  if(!SingleTireStatusMarshaller::checkIntegrityConst(rightRear_))   return false;
-  rightRear=rightRear_;
-  return true;
-}
-
-
-
-
-const SingleTireStatus& TireStatus::get_innerLeftRear(void) const 
-{
-  return innerLeftRear;
-}
-
-
-const SingleTireStatus& TireStatus::get_innerRightRear(void) const 
-{
-  return innerRightRear;
-}
-
-
-const SingleTireStatus& TireStatus::get_leftFront(void) const 
-{
-  return leftFront;
-}
-
-
-const SingleTireStatus& TireStatus::get_leftRear(void) const 
-{
-  return leftRear;
-}
-
-
-const TirePressureTellTale& TireStatus::get_pressureTellTale(void) const 
-{
-  return pressureTellTale;
-}
-
-
-const SingleTireStatus& TireStatus::get_rightFront(void) const 
-{
-  return rightFront;
-}
-
-
-const SingleTireStatus& TireStatus::get_rightRear(void) const 
-{
-  return rightRear;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.cpp
deleted file mode 100644
index ec7d6a97b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TireStatus.h"
-#include "SingleTireStatusMarshaller.h"
-#include "TirePressureTellTaleMarshaller.h"
-
-#include "TireStatusMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool TireStatusMarshaller::checkIntegrity(TireStatus& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool TireStatusMarshaller::fromString(const std::string& s,TireStatus& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string TireStatusMarshaller::toString(const TireStatus& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool TireStatusMarshaller::checkIntegrityConst(const TireStatus& s)
-{
-  if(!SingleTireStatusMarshaller::checkIntegrityConst(s.innerLeftRear))  return false;
-  if(!SingleTireStatusMarshaller::checkIntegrityConst(s.innerRightRear))  return false;
-  if(!SingleTireStatusMarshaller::checkIntegrityConst(s.leftFront))  return false;
-  if(!SingleTireStatusMarshaller::checkIntegrityConst(s.leftRear))  return false;
-  if(!TirePressureTellTaleMarshaller::checkIntegrityConst(s.pressureTellTale))  return false;
-  if(!SingleTireStatusMarshaller::checkIntegrityConst(s.rightFront))  return false;
-  if(!SingleTireStatusMarshaller::checkIntegrityConst(s.rightRear))  return false;
-  return true;
-}
-
-Json::Value TireStatusMarshaller::toJSON(const TireStatus& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["innerLeftRear"]=SingleTireStatusMarshaller::toJSON(e.innerLeftRear);
-
-  json["innerRightRear"]=SingleTireStatusMarshaller::toJSON(e.innerRightRear);
-
-  json["leftFront"]=SingleTireStatusMarshaller::toJSON(e.leftFront);
-
-  json["leftRear"]=SingleTireStatusMarshaller::toJSON(e.leftRear);
-
-  json["pressureTellTale"]=TirePressureTellTaleMarshaller::toJSON(e.pressureTellTale);
-
-  json["rightFront"]=SingleTireStatusMarshaller::toJSON(e.rightFront);
-
-  json["rightRear"]=SingleTireStatusMarshaller::toJSON(e.rightRear);
-
-
-  return json;
-}
-
-
-bool TireStatusMarshaller::fromJSON(const Json::Value& json,TireStatus& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("innerLeftRear"))  return false;
-    {
-      const Json::Value& j=json["innerLeftRear"];
-      if(!SingleTireStatusMarshaller::fromJSON(j,c.innerLeftRear))
-        return false;
-    }
-    if(!json.isMember("innerRightRear"))  return false;
-    {
-      const Json::Value& j=json["innerRightRear"];
-      if(!SingleTireStatusMarshaller::fromJSON(j,c.innerRightRear))
-        return false;
-    }
-    if(!json.isMember("leftFront"))  return false;
-    {
-      const Json::Value& j=json["leftFront"];
-      if(!SingleTireStatusMarshaller::fromJSON(j,c.leftFront))
-        return false;
-    }
-    if(!json.isMember("leftRear"))  return false;
-    {
-      const Json::Value& j=json["leftRear"];
-      if(!SingleTireStatusMarshaller::fromJSON(j,c.leftRear))
-        return false;
-    }
-    if(!json.isMember("pressureTellTale"))  return false;
-    {
-      const Json::Value& j=json["pressureTellTale"];
-      if(!TirePressureTellTaleMarshaller::fromJSON(j,c.pressureTellTale))
-        return false;
-    }
-    if(!json.isMember("rightFront"))  return false;
-    {
-      const Json::Value& j=json["rightFront"];
-      if(!SingleTireStatusMarshaller::fromJSON(j,c.rightFront))
-        return false;
-    }
-    if(!json.isMember("rightRear"))  return false;
-    {
-      const Json::Value& j=json["rightRear"];
-      if(!SingleTireStatusMarshaller::fromJSON(j,c.rightRear))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.h
deleted file mode 100644
index 6167af186..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TireStatusMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TIRESTATUSMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TIRESTATUSMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TireStatus.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct TireStatusMarshaller
-  {
-    static bool checkIntegrity(TireStatus& e);
-    static bool checkIntegrityConst(const TireStatus& e);
-  
-    static bool fromString(const std::string& s,TireStatus& e);
-    static const std::string toString(const TireStatus& e);
-  
-    static bool fromJSON(const Json::Value& s,TireStatus& e);
-    static Json::Value toJSON(const TireStatus& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.cpp
deleted file mode 100644
index d2062150f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/TriggerSource.h"
-#include "TriggerSourceMarshaller.h"
-#include "TriggerSourceMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const TriggerSource::TriggerSourceInternal TriggerSourceMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return TriggerSource::INVALID_ENUM;
-  const struct PerfectHashTable* p=TriggerSource_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<TriggerSource::TriggerSourceInternal>(p->idx) : TriggerSource::INVALID_ENUM;
-}
-
-
-bool TriggerSourceMarshaller::fromJSON(const Json::Value& s,TriggerSource& e)
-{
-  e.mInternal=TriggerSource::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=TriggerSource::INVALID_ENUM);
-}
-
-
-Json::Value TriggerSourceMarshaller::toJSON(const TriggerSource& e)
-{
-  if(e.mInternal==TriggerSource::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool TriggerSourceMarshaller::fromString(const std::string& s,TriggerSource& e)
-{
-  e.mInternal=TriggerSource::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string TriggerSourceMarshaller::toString(const TriggerSource& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==TriggerSource::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable TriggerSourceMarshaller::mHashTable[2]=
-{
-  {"MENU",0},
-  {"VR",1}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp
deleted file mode 100644
index d1812ad91..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp
+++ /dev/null
@@ -1,18 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name TriggerSource_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-MENU,0
-VR,1
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.h
deleted file mode 100644
index 9c6b8674b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TRIGGERSOURCEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TRIGGERSOURCEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/TriggerSource.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for TriggerSource
-
-  class TriggerSourceMarshaller
-  {
-  public:
-  
-    static std::string toName(const TriggerSource& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(TriggerSource& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=TriggerSource::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(TriggerSource& e)		{ return e.mInternal!=TriggerSource::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const TriggerSource& e)	{ return e.mInternal!=TriggerSource::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,TriggerSource& e);
-    static const std::string toString(const TriggerSource& e);
-  
-    static bool fromJSON(const Json::Value& s,TriggerSource& e);
-    static Json::Value toJSON(const TriggerSource& e);
-  
-    static const char* getName(TriggerSource::TriggerSourceInternal e)
-    {
-       return (e>=0 && e<2) ? mHashTable[e].name : NULL;
-    }
-  
-    static const TriggerSource::TriggerSourceInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[2];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.inc
deleted file mode 100644
index 3f533f14b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.inc
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 2
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 4
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 4
-/* maximum key range = 3, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class TriggerSource_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-TriggerSource_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-TriggerSource_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  2,  0,  4
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp"
-      {"VR",1},
-      {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TriggerSourceMarshaller.gp"
-      {"MENU",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Turn.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Turn.cpp
deleted file mode 100644
index c9cc8e5e9..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/Turn.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Turn.h"
-#include "TurnMarshaller.h"
-#include "ImageMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-Turn& Turn::operator =(const Turn& c)
-{
-  navigationText=c.navigationText ? new std::string(c.navigationText[0]) : 0;
-  turnIcon=c.turnIcon;
-
-  return *this;
-}
-
-
-Turn::~Turn(void)
-{
-  if(navigationText)
-    delete navigationText;
-}
-
-
-Turn::Turn(const Turn& c)
-{
-  *this=c;
-}
-
-
-bool Turn::checkIntegrity(void)
-{
-  return TurnMarshaller::checkIntegrity(*this);
-}
-
-
-Turn::Turn(void) :
-    navigationText(0)
-{
-}
-
-
-
-bool Turn::set_navigationText(const std::string& navigationText_)
-{
-  if(navigationText_.length()>500)  return false;
-  delete navigationText;
-  navigationText=0;
-
-  navigationText=new std::string(navigationText_);
-  return true;
-}
-
-void Turn::reset_navigationText(void)
-{
-  if(navigationText)
-    delete navigationText;
-  navigationText=0;
-}
-
-bool Turn::set_turnIcon(const Image& turnIcon_)
-{
-  if(!ImageMarshaller::checkIntegrityConst(turnIcon_))   return false;
-  turnIcon=turnIcon_;
-  return true;
-}
-
-
-
-
-const std::string* Turn::get_navigationText(void) const 
-{
-  return navigationText;
-}
-
-
-const Image& Turn::get_turnIcon(void) const 
-{
-  return turnIcon;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.cpp
deleted file mode 100644
index d6dcf3869..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Turn.h"
-#include "ImageMarshaller.h"
-
-#include "TurnMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool TurnMarshaller::checkIntegrity(Turn& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool TurnMarshaller::fromString(const std::string& s,Turn& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string TurnMarshaller::toString(const Turn& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool TurnMarshaller::checkIntegrityConst(const Turn& s)
-{
-  if(s.navigationText && s.navigationText->length()>500)  return false;
-  if(!ImageMarshaller::checkIntegrityConst(s.turnIcon))  return false;
-  return true;
-}
-
-Json::Value TurnMarshaller::toJSON(const Turn& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  if(e.navigationText)
-    json["navigationText"]=Json::Value(*e.navigationText);
-
-  json["turnIcon"]=ImageMarshaller::toJSON(e.turnIcon);
-
-
-  return json;
-}
-
-
-bool TurnMarshaller::fromJSON(const Json::Value& json,Turn& c)
-{
-  if(c.navigationText)  delete c.navigationText;
-  c.navigationText=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(json.isMember("navigationText"))
-    {
-      const Json::Value& j=json["navigationText"];
-      if(!j.isString())  return false;
-      c.navigationText=new std::string(j.asString());
-    }
-    if(!json.isMember("turnIcon"))  return false;
-    {
-      const Json::Value& j=json["turnIcon"];
-      if(!ImageMarshaller::fromJSON(j,c.turnIcon))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.h
deleted file mode 100644
index 0cb22d62c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/TurnMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_TURNMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_TURNMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/Turn.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct TurnMarshaller
-  {
-    static bool checkIntegrity(Turn& e);
-    static bool checkIntegrityConst(const Turn& e);
-  
-    static bool fromString(const std::string& s,Turn& e);
-    static const std::string toString(const Turn& e);
-  
-    static bool fromJSON(const Json::Value& s,Turn& e);
-    static Json::Value toJSON(const Turn& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_request.cpp
deleted file mode 100644
index 83484c3c7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_request.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h"
-#include "UnregisterAppInterface_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-UnregisterAppInterface_request::~UnregisterAppInterface_request(void)
-{
-}
-
-
-UnregisterAppInterface_request::UnregisterAppInterface_request(const UnregisterAppInterface_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool UnregisterAppInterface_request::checkIntegrity(void)
-{
-  return UnregisterAppInterface_requestMarshaller::checkIntegrity(*this);
-}
-
-
-UnregisterAppInterface_request::UnregisterAppInterface_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.cpp
deleted file mode 100644
index 6858d1c13..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h"
-
-
-#include "UnregisterAppInterface_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UnregisterAppInterface_requestMarshaller::checkIntegrity(UnregisterAppInterface_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UnregisterAppInterface_requestMarshaller::fromString(const std::string& s,UnregisterAppInterface_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UnregisterAppInterface_requestMarshaller::toString(const UnregisterAppInterface_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnregisterAppInterface_requestMarshaller::checkIntegrityConst(const UnregisterAppInterface_request& s)
-{
-  return true;
-}
-
-Json::Value UnregisterAppInterface_requestMarshaller::toJSON(const UnregisterAppInterface_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  return json;
-}
-
-
-bool UnregisterAppInterface_requestMarshaller::fromJSON(const Json::Value& json,UnregisterAppInterface_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.h
deleted file mode 100644
index 00f0d5b66..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UNREGISTERAPPINTERFACE_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UNREGISTERAPPINTERFACE_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct UnregisterAppInterface_requestMarshaller
-  {
-    static bool checkIntegrity(UnregisterAppInterface_request& e);
-    static bool checkIntegrityConst(const UnregisterAppInterface_request& e);
-  
-    static bool fromString(const std::string& s,UnregisterAppInterface_request& e);
-    static const std::string toString(const UnregisterAppInterface_request& e);
-  
-    static bool fromJSON(const Json::Value& s,UnregisterAppInterface_request& e);
-    static Json::Value toJSON(const UnregisterAppInterface_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_response.cpp
deleted file mode 100644
index 900f7b53e..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_response.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h"
-#include "UnregisterAppInterface_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-UnregisterAppInterface_response& UnregisterAppInterface_response::operator =(const UnregisterAppInterface_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-UnregisterAppInterface_response::~UnregisterAppInterface_response(void)
-{}
-
-UnregisterAppInterface_response::UnregisterAppInterface_response(const UnregisterAppInterface_response& c)
-{
-    *this = c;
-}
-
-bool UnregisterAppInterface_response::checkIntegrity(void)
-{
-    return UnregisterAppInterface_responseMarshaller::checkIntegrity(*this);
-}
-
-UnregisterAppInterface_response::UnregisterAppInterface_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.cpp
deleted file mode 100644
index f66d73454..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h"
-#include "ResultMarshaller.h"
-
-#include "UnregisterAppInterface_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UnregisterAppInterface_responseMarshaller::checkIntegrity(UnregisterAppInterface_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UnregisterAppInterface_responseMarshaller::fromString(const std::string& s,UnregisterAppInterface_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UnregisterAppInterface_responseMarshaller::toString(const UnregisterAppInterface_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnregisterAppInterface_responseMarshaller::checkIntegrityConst(const UnregisterAppInterface_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value UnregisterAppInterface_responseMarshaller::toJSON(const UnregisterAppInterface_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool UnregisterAppInterface_responseMarshaller::fromJSON(const Json::Value& json,UnregisterAppInterface_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.h
deleted file mode 100644
index 87c8e8cca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UNREGISTERAPPINTERFACE_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UNREGISTERAPPINTERFACE_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct UnregisterAppInterface_responseMarshaller
-  {
-    static bool checkIntegrity(UnregisterAppInterface_response& e);
-    static bool checkIntegrityConst(const UnregisterAppInterface_response& e);
-  
-    static bool fromString(const std::string& s,UnregisterAppInterface_response& e);
-    static const std::string toString(const UnregisterAppInterface_response& e);
-  
-    static bool fromJSON(const Json::Value& s,UnregisterAppInterface_response& e);
-    static Json::Value toJSON(const UnregisterAppInterface_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_request.cpp
deleted file mode 100644
index e6d978ba5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_request.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h"
-#include "UnsubscribeButton_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "ButtonNameMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-UnsubscribeButton_request::~UnsubscribeButton_request(void)
-{
-}
-
-
-UnsubscribeButton_request::UnsubscribeButton_request(const UnsubscribeButton_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool UnsubscribeButton_request::checkIntegrity(void)
-{
-  return UnsubscribeButton_requestMarshaller::checkIntegrity(*this);
-}
-
-
-UnsubscribeButton_request::UnsubscribeButton_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool UnsubscribeButton_request::set_buttonName(const ButtonName& buttonName_)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(buttonName_))   return false;
-  buttonName=buttonName_;
-  return true;
-}
-
-
-
-
-const ButtonName& UnsubscribeButton_request::get_buttonName(void) const 
-{
-  return buttonName;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.cpp
deleted file mode 100644
index a2ed23d06..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h"
-#include "ButtonNameMarshaller.h"
-
-#include "UnsubscribeButton_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UnsubscribeButton_requestMarshaller::checkIntegrity(UnsubscribeButton_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UnsubscribeButton_requestMarshaller::fromString(const std::string& s,UnsubscribeButton_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UnsubscribeButton_requestMarshaller::toString(const UnsubscribeButton_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnsubscribeButton_requestMarshaller::checkIntegrityConst(const UnsubscribeButton_request& s)
-{
-  if(!ButtonNameMarshaller::checkIntegrityConst(s.buttonName))  return false;
-  return true;
-}
-
-Json::Value UnsubscribeButton_requestMarshaller::toJSON(const UnsubscribeButton_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["buttonName"]=ButtonNameMarshaller::toJSON(e.buttonName);
-
-  return json;
-}
-
-
-bool UnsubscribeButton_requestMarshaller::fromJSON(const Json::Value& json,UnsubscribeButton_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("buttonName"))  return false;
-    {
-      const Json::Value& j=json["buttonName"];
-      if(!ButtonNameMarshaller::fromJSON(j,c.buttonName))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.h
deleted file mode 100644
index 8b4d106ea..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEBUTTON_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEBUTTON_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct UnsubscribeButton_requestMarshaller
-  {
-    static bool checkIntegrity(UnsubscribeButton_request& e);
-    static bool checkIntegrityConst(const UnsubscribeButton_request& e);
-  
-    static bool fromString(const std::string& s,UnsubscribeButton_request& e);
-    static const std::string toString(const UnsubscribeButton_request& e);
-  
-    static bool fromJSON(const Json::Value& s,UnsubscribeButton_request& e);
-    static Json::Value toJSON(const UnsubscribeButton_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_response.cpp
deleted file mode 100644
index 7bf2518b7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h"
-#include "UnsubscribeButton_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-UnsubscribeButton_response& UnsubscribeButton_response::operator =(const UnsubscribeButton_response& c)
-{
-  success= c.success;
-  resultCode= c.resultCode;
-  info= c.info ? new std::string(c.info[0]) : 0;
-
-  return *this;
-}
-
-UnsubscribeButton_response::~UnsubscribeButton_response(void)
-{}
-
-
-UnsubscribeButton_response::UnsubscribeButton_response(const UnsubscribeButton_response& c)
-{
-  *this=c;
-}
-
-bool UnsubscribeButton_response::checkIntegrity(void)
-{
-  return UnsubscribeButton_responseMarshaller::checkIntegrity(*this);
-}
-
-UnsubscribeButton_response::UnsubscribeButton_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.cpp
deleted file mode 100644
index 7b55748ca..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h"
-#include "ResultMarshaller.h"
-
-#include "UnsubscribeButton_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UnsubscribeButton_responseMarshaller::checkIntegrity(UnsubscribeButton_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UnsubscribeButton_responseMarshaller::fromString(const std::string& s,UnsubscribeButton_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UnsubscribeButton_responseMarshaller::toString(const UnsubscribeButton_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnsubscribeButton_responseMarshaller::checkIntegrityConst(const UnsubscribeButton_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value UnsubscribeButton_responseMarshaller::toJSON(const UnsubscribeButton_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool UnsubscribeButton_responseMarshaller::fromJSON(const Json::Value& json,UnsubscribeButton_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.h
deleted file mode 100644
index 4f54f4414..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEBUTTON_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEBUTTON_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct UnsubscribeButton_responseMarshaller
-  {
-    static bool checkIntegrity(UnsubscribeButton_response& e);
-    static bool checkIntegrityConst(const UnsubscribeButton_response& e);
-  
-    static bool fromString(const std::string& s,UnsubscribeButton_response& e);
-    static const std::string toString(const UnsubscribeButton_response& e);
-  
-    static bool fromJSON(const Json::Value& s,UnsubscribeButton_response& e);
-    static Json::Value toJSON(const UnsubscribeButton_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_request.cpp
deleted file mode 100644
index bd0e313e0..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_request.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h"
-#include "UnsubscribeVehicleData_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-UnsubscribeVehicleData_request::~UnsubscribeVehicleData_request(void)
-{
-}
-
-
-UnsubscribeVehicleData_request::UnsubscribeVehicleData_request(const UnsubscribeVehicleData_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool UnsubscribeVehicleData_request::checkIntegrity(void)
-{
-  return UnsubscribeVehicleData_requestMarshaller::checkIntegrity(*this);
-}
-
-
-UnsubscribeVehicleData_request::UnsubscribeVehicleData_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool UnsubscribeVehicleData_request::set_dataType(const std::vector<VehicleDataType>& dataType_)
-{
-  unsigned int i=dataType_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!VehicleDataTypeMarshaller::checkIntegrityConst(dataType_[i]))   return false;
-  }
-  dataType=dataType_;
-  return true;
-}
-
-
-
-
-const std::vector<VehicleDataType>& UnsubscribeVehicleData_request::get_dataType(void) const 
-{
-  return dataType;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.cpp
deleted file mode 100644
index 2fa27cb02..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#include "UnsubscribeVehicleData_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UnsubscribeVehicleData_requestMarshaller::checkIntegrity(UnsubscribeVehicleData_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UnsubscribeVehicleData_requestMarshaller::fromString(const std::string& s,UnsubscribeVehicleData_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UnsubscribeVehicleData_requestMarshaller::toString(const UnsubscribeVehicleData_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnsubscribeVehicleData_requestMarshaller::checkIntegrityConst(const UnsubscribeVehicleData_request& s)
-{
-  {
-    unsigned int i=s.dataType.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!VehicleDataTypeMarshaller::checkIntegrityConst(s.dataType[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value UnsubscribeVehicleData_requestMarshaller::toJSON(const UnsubscribeVehicleData_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["dataType"]=Json::Value(Json::arrayValue);
-  json["dataType"].resize(e.dataType.size());
-  for(unsigned int i=0;i<e.dataType.size();i++)
-    json["dataType"][i]=VehicleDataTypeMarshaller::toJSON(e.dataType[i]);
-
-  return json;
-}
-
-
-bool UnsubscribeVehicleData_requestMarshaller::fromJSON(const Json::Value& json,UnsubscribeVehicleData_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("dataType"))  return false;
-    {
-      const Json::Value& j=json["dataType"];
-      if(!j.isArray())  return false;
-      c.dataType.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          VehicleDataType t;
-          if(!VehicleDataTypeMarshaller::fromJSON(j[i],t))
-            return false;
-          c.dataType[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.h
deleted file mode 100644
index ab17438db..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEVEHICLEDATA_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEVEHICLEDATA_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct UnsubscribeVehicleData_requestMarshaller
-  {
-    static bool checkIntegrity(UnsubscribeVehicleData_request& e);
-    static bool checkIntegrityConst(const UnsubscribeVehicleData_request& e);
-  
-    static bool fromString(const std::string& s,UnsubscribeVehicleData_request& e);
-    static const std::string toString(const UnsubscribeVehicleData_request& e);
-  
-    static bool fromJSON(const Json::Value& s,UnsubscribeVehicleData_request& e);
-    static Json::Value toJSON(const UnsubscribeVehicleData_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_response.cpp
deleted file mode 100644
index 50526f2cb..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_response.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h"
-#include "UnsubscribeVehicleData_responseMarshaller.h"
-#include "VehicleDataResultMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-UnsubscribeVehicleData_response& UnsubscribeVehicleData_response::operator =(const UnsubscribeVehicleData_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-    dataResult = c.dataResult ? new std::vector<VehicleDataResult>(c.dataResult[0]) : 0;
-
-    return *this;
-}
-
-UnsubscribeVehicleData_response::~UnsubscribeVehicleData_response(void)
-{
-    if (dataResult)
-    {
-        delete dataResult;
-    }
-}
-
-UnsubscribeVehicleData_response::UnsubscribeVehicleData_response(const UnsubscribeVehicleData_response& c)
-{
-    *this = c;
-}
-
-bool UnsubscribeVehicleData_response::checkIntegrity(void)
-{
-    return UnsubscribeVehicleData_responseMarshaller::checkIntegrity(*this);
-}
-
-UnsubscribeVehicleData_response::UnsubscribeVehicleData_response(void)
-    : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-    , dataResult(0)
-{}
-
-bool UnsubscribeVehicleData_response::set_dataResult(const std::vector<VehicleDataResult>& dataResult_)
-{
-    unsigned int i = dataResult_.size();
-    if (i > 100 || i < 1)
-    {
-        return false;
-    }
-    while (i--)
-    {
-        if (!VehicleDataResultMarshaller::checkIntegrityConst(dataResult_[i]))
-        {
-            return false;
-        }
-    }
-    delete dataResult;
-    dataResult = 0;
-
-    dataResult = new std::vector<VehicleDataResult>(dataResult_);
-    return true;
-}
-
-void UnsubscribeVehicleData_response::reset_dataResult(void)
-{
-    if (dataResult)
-    {
-        delete dataResult;
-    }
-    dataResult = 0;
-}
-
-const std::vector<VehicleDataResult>* UnsubscribeVehicleData_response::get_dataResult(void) const
-{
-    return dataResult;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.cpp
deleted file mode 100644
index f69a1acab..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h"
-#include "ResultMarshaller.h"
-#include "VehicleDataResultMarshaller.h"
-
-#include "UnsubscribeVehicleData_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UnsubscribeVehicleData_responseMarshaller::checkIntegrity(UnsubscribeVehicleData_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UnsubscribeVehicleData_responseMarshaller::fromString(const std::string& s,UnsubscribeVehicleData_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UnsubscribeVehicleData_responseMarshaller::toString(const UnsubscribeVehicleData_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UnsubscribeVehicleData_responseMarshaller::checkIntegrityConst(const UnsubscribeVehicleData_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  if(s.dataResult)
-  {
-    unsigned int i=s.dataResult[0].size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!VehicleDataResultMarshaller::checkIntegrityConst(s.dataResult[0][i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value UnsubscribeVehicleData_responseMarshaller::toJSON(const UnsubscribeVehicleData_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  if(e.dataResult)
-  {
-    unsigned int sz=e.dataResult->size();
-    json["dataResult"]=Json::Value(Json::arrayValue);
-    json["dataResult"].resize(sz);
-    for(unsigned int i=0;i<sz;i++)
-      json["dataResult"][i]=VehicleDataResultMarshaller::toJSON(e.dataResult[0][i]);
-  }
-
-  return json;
-}
-
-
-bool UnsubscribeVehicleData_responseMarshaller::fromJSON(const Json::Value& json,UnsubscribeVehicleData_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  if(c.dataResult)  delete c.dataResult;
-  c.dataResult=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-    if(json.isMember("dataResult"))
-    {
-      const Json::Value& j=json["dataResult"];
-      if(!j.isArray())  return false;
-      c.dataResult=new std::vector<VehicleDataResult>();
-      c.dataResult->resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-      {
-        VehicleDataResult t;
-        if(!VehicleDataResultMarshaller::fromJSON(j[i],t))
-          return false;
-        c.dataResult[0][i]=t;
-      }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.h
deleted file mode 100644
index 656fb0a3d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEVEHICLEDATA_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UNSUBSCRIBEVEHICLEDATA_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct UnsubscribeVehicleData_responseMarshaller
-  {
-    static bool checkIntegrity(UnsubscribeVehicleData_response& e);
-    static bool checkIntegrityConst(const UnsubscribeVehicleData_response& e);
-  
-    static bool fromString(const std::string& s,UnsubscribeVehicleData_response& e);
-    static const std::string toString(const UnsubscribeVehicleData_response& e);
-  
-    static bool fromJSON(const Json::Value& s,UnsubscribeVehicleData_response& e);
-    static Json::Value toJSON(const UnsubscribeVehicleData_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.cpp
deleted file mode 100644
index edd5a3906..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateMode.h"
-#include "UpdateModeMarshaller.h"
-#include "UpdateModeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const UpdateMode::UpdateModeInternal UpdateModeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return UpdateMode::INVALID_ENUM;
-  const struct PerfectHashTable* p=UpdateMode_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<UpdateMode::UpdateModeInternal>(p->idx) : UpdateMode::INVALID_ENUM;
-}
-
-
-bool UpdateModeMarshaller::fromJSON(const Json::Value& s,UpdateMode& e)
-{
-  e.mInternal=UpdateMode::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=UpdateMode::INVALID_ENUM);
-}
-
-
-Json::Value UpdateModeMarshaller::toJSON(const UpdateMode& e)
-{
-  if(e.mInternal==UpdateMode::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool UpdateModeMarshaller::fromString(const std::string& s,UpdateMode& e)
-{
-  e.mInternal=UpdateMode::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string UpdateModeMarshaller::toString(const UpdateMode& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==UpdateMode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable UpdateModeMarshaller::mHashTable[5]=
-{
-  {"COUNTUP",0},
-  {"COUNTDOWN",1},
-  {"PAUSE",2},
-  {"RESUME",3},
-  {"CLEAR",4}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp
deleted file mode 100644
index 7ff0eb4d3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp
+++ /dev/null
@@ -1,21 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name UpdateMode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-COUNTUP,0
-COUNTDOWN,1
-PAUSE,2
-RESUME,3
-CLEAR,4
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.h
deleted file mode 100644
index 2dd1ad76d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UPDATEMODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UPDATEMODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateMode.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for UpdateMode
-
-  class UpdateModeMarshaller
-  {
-  public:
-  
-    static std::string toName(const UpdateMode& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(UpdateMode& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=UpdateMode::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(UpdateMode& e)		{ return e.mInternal!=UpdateMode::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const UpdateMode& e)	{ return e.mInternal!=UpdateMode::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,UpdateMode& e);
-    static const std::string toString(const UpdateMode& e);
-  
-    static bool fromJSON(const Json::Value& s,UpdateMode& e);
-    static Json::Value toJSON(const UpdateMode& e);
-  
-    static const char* getName(UpdateMode::UpdateModeInternal e)
-    {
-       return (e>=0 && e<5) ? mHashTable[e].name : NULL;
-    }
-  
-    static const UpdateMode::UpdateModeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[5];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.inc
deleted file mode 100644
index cba43560c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.inc
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp  */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 5
-#define MIN_WORD_LENGTH 5
-#define MAX_WORD_LENGTH 9
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 10
-/* maximum key range = 6, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class UpdateMode_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-UpdateMode_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11,  0, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-       5, 11,  0, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-UpdateMode_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  5,  6,  7,  0,  9,  5
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp"
-      {"CLEAR",4},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp"
-      {"RESUME",3},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp"
-      {"COUNTUP",0},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp"
-      {"COUNTDOWN",1},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateModeMarshaller.gp"
-      {"PAUSE",2}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_request.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_request.cpp
deleted file mode 100644
index 9b40f4cbc..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_request.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h"
-#include "UpdateTurnList_requestMarshaller.h"
-#include "../include/JSONHandler/SDLRPCObjects/V2/Marshaller.h"
-#include "SoftButtonMarshaller.h"
-#include "TurnMarshaller.h"
-
-#define PROTOCOL_VERSION	2
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-UpdateTurnList_request::~UpdateTurnList_request(void)
-{
-}
-
-
-UpdateTurnList_request::UpdateTurnList_request(const UpdateTurnList_request& c) : NsSmartDeviceLinkRPC::SDLRPCMessage(c)
-{
-  *this=c;
-}
-
-
-bool UpdateTurnList_request::checkIntegrity(void)
-{
-  return UpdateTurnList_requestMarshaller::checkIntegrity(*this);
-}
-
-
-UpdateTurnList_request::UpdateTurnList_request(void) : NsSmartDeviceLinkRPC::SDLRPCMessage(PROTOCOL_VERSION)
-{
-}
-
-
-
-bool UpdateTurnList_request::set_turnList(const std::vector<Turn>& turnList_)
-{
-  unsigned int i=turnList_.size();
-  if(i>100 || i<1)  return false;
-  while(i--)
-  {
-    if(!TurnMarshaller::checkIntegrityConst(turnList_[i]))   return false;
-  }
-  turnList=turnList_;
-  return true;
-}
-
-bool UpdateTurnList_request::set_softButtons(const std::vector<SoftButton>& softButtons_)
-{
-  unsigned int i=softButtons_.size();
-  if(i>1 || i<0)  return false;
-  while(i--)
-  {
-    if(!SoftButtonMarshaller::checkIntegrityConst(softButtons_[i]))   return false;
-  }
-  softButtons=softButtons_;
-  return true;
-}
-
-
-
-
-const std::vector<Turn>& UpdateTurnList_request::get_turnList(void) const 
-{
-  return turnList;
-}
-
-const std::vector<SoftButton>& UpdateTurnList_request::get_softButtons(void) const 
-{
-  return softButtons;
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.cpp
deleted file mode 100644
index f04e0abb8..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h"
-#include "SoftButtonMarshaller.h"
-#include "TurnMarshaller.h"
-
-#include "UpdateTurnList_requestMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UpdateTurnList_requestMarshaller::checkIntegrity(UpdateTurnList_request& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UpdateTurnList_requestMarshaller::fromString(const std::string& s,UpdateTurnList_request& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UpdateTurnList_requestMarshaller::toString(const UpdateTurnList_request& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UpdateTurnList_requestMarshaller::checkIntegrityConst(const UpdateTurnList_request& s)
-{
-  {
-    unsigned int i=s.turnList.size();
-    if(i>100 || i<1)  return false;
-    while(i--)
-    {
-    if(!TurnMarshaller::checkIntegrityConst(s.turnList[i]))   return false;
-    }
-  }
-  {
-    unsigned int i=s.softButtons.size();
-    if(i>1 || i<0)  return false;
-    while(i--)
-    {
-    if(!SoftButtonMarshaller::checkIntegrityConst(s.softButtons[i]))   return false;
-    }
-  }
-  return true;
-}
-
-Json::Value UpdateTurnList_requestMarshaller::toJSON(const UpdateTurnList_request& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["turnList"]=Json::Value(Json::arrayValue);
-  json["turnList"].resize(e.turnList.size());
-  for(unsigned int i=0;i<e.turnList.size();i++)
-    json["turnList"][i]=TurnMarshaller::toJSON(e.turnList[i]);
-
-  json["softButtons"]=Json::Value(Json::arrayValue);
-  json["softButtons"].resize(e.softButtons.size());
-  for(unsigned int i=0;i<e.softButtons.size();i++)
-    json["softButtons"][i]=SoftButtonMarshaller::toJSON(e.softButtons[i]);
-
-  return json;
-}
-
-
-bool UpdateTurnList_requestMarshaller::fromJSON(const Json::Value& json,UpdateTurnList_request& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("turnList"))  return false;
-    {
-      const Json::Value& j=json["turnList"];
-      if(!j.isArray())  return false;
-      c.turnList.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          Turn t;
-          if(!TurnMarshaller::fromJSON(j[i],t))
-            return false;
-          c.turnList[i]=t;
-        }
-
-    }
-    if(!json.isMember("softButtons"))  return false;
-    {
-      const Json::Value& j=json["softButtons"];
-      if(!j.isArray())  return false;
-      c.softButtons.resize(j.size());
-      for(unsigned int i=0;i<j.size();i++)
-        {
-          SoftButton t;
-          if(!SoftButtonMarshaller::fromJSON(j[i],t))
-            return false;
-          c.softButtons[i]=t;
-        }
-
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.h
deleted file mode 100644
index c829abc5c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UPDATETURNLIST_REQUESTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UPDATETURNLIST_REQUESTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct UpdateTurnList_requestMarshaller
-  {
-    static bool checkIntegrity(UpdateTurnList_request& e);
-    static bool checkIntegrityConst(const UpdateTurnList_request& e);
-  
-    static bool fromString(const std::string& s,UpdateTurnList_request& e);
-    static const std::string toString(const UpdateTurnList_request& e);
-  
-    static bool fromJSON(const Json::Value& s,UpdateTurnList_request& e);
-    static Json::Value toJSON(const UpdateTurnList_request& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_response.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_response.cpp
deleted file mode 100644
index 80f10fe40..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_response.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h"
-#include "UpdateTurnList_responseMarshaller.h"
-
-namespace
-{
-    const int PROTOCOL_VERSION = 2;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-UpdateTurnList_response& UpdateTurnList_response::operator =(const UpdateTurnList_response& c)
-{
-    success = c.success;
-    resultCode = c.resultCode;
-    info = c.info ? new std::string(c.info[0]) : 0;
-
-    return *this;
-}
-
-UpdateTurnList_response::~UpdateTurnList_response(void)
-{}
-
-
-UpdateTurnList_response::UpdateTurnList_response(const UpdateTurnList_response& c)
-{
-    *this = c;
-}
-
-bool UpdateTurnList_response::checkIntegrity(void)
-{
-    return UpdateTurnList_responseMarshaller::checkIntegrity(*this);
-}
-
-UpdateTurnList_response::UpdateTurnList_response(void) : NsSmartDeviceLinkRPC::SDLRPCResponse(PROTOCOL_VERSION)
-{}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.cpp
deleted file mode 100644
index d2c9ca376..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h"
-#include "ResultMarshaller.h"
-
-#include "UpdateTurnList_responseMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool UpdateTurnList_responseMarshaller::checkIntegrity(UpdateTurnList_response& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool UpdateTurnList_responseMarshaller::fromString(const std::string& s,UpdateTurnList_response& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string UpdateTurnList_responseMarshaller::toString(const UpdateTurnList_response& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool UpdateTurnList_responseMarshaller::checkIntegrityConst(const UpdateTurnList_response& s)
-{
-  if(!ResultMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  if(s.info && s.info->length()>1000)  return false;
-  return true;
-}
-
-Json::Value UpdateTurnList_responseMarshaller::toJSON(const UpdateTurnList_response& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["success"]=Json::Value(e.success);
-
-  json["resultCode"]=ResultMarshaller::toJSON(e.resultCode);
-
-  if(e.info)
-    json["info"]=Json::Value(*e.info);
-
-  return json;
-}
-
-
-bool UpdateTurnList_responseMarshaller::fromJSON(const Json::Value& json,UpdateTurnList_response& c)
-{
-  if(c.info)  delete c.info;
-  c.info=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("success"))  return false;
-    {
-      const Json::Value& j=json["success"];
-      if(!j.isBool())  return false;
-      c.success=j.asBool();
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!ResultMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-    if(json.isMember("info"))
-    {
-      const Json::Value& j=json["info"];
-      if(!j.isString())  return false;
-      c.info=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.h
deleted file mode 100644
index 10dc40c8c..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_UPDATETURNLIST_RESPONSEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_UPDATETURNLIST_RESPONSEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct UpdateTurnList_responseMarshaller
-  {
-    static bool checkIntegrity(UpdateTurnList_response& e);
-    static bool checkIntegrityConst(const UpdateTurnList_response& e);
-  
-    static bool fromString(const std::string& s,UpdateTurnList_response& e);
-    static const std::string toString(const UpdateTurnList_response& e);
-  
-    static bool fromJSON(const Json::Value& s,UpdateTurnList_response& e);
-    static Json::Value toJSON(const UpdateTurnList_response& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResult.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResult.cpp
deleted file mode 100644
index 15293e54b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResult.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataResult.h"
-#include "VehicleDataResultMarshaller.h"
-#include "VehicleDataResultCodeMarshaller.h"
-#include "VehicleDataTypeMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-VehicleDataResult::VehicleDataResult(const VehicleDataResult& c)
-{
-  *this=c;
-}
-
-
-bool VehicleDataResult::checkIntegrity(void)
-{
-  return VehicleDataResultMarshaller::checkIntegrity(*this);
-}
-
-
-VehicleDataResult::VehicleDataResult(void)
-{
-}
-
-
-
-bool VehicleDataResult::set_dataType(const VehicleDataType& dataType_)
-{
-  if(!VehicleDataTypeMarshaller::checkIntegrityConst(dataType_))   return false;
-  dataType=dataType_;
-  return true;
-}
-
-bool VehicleDataResult::set_resultCode(const VehicleDataResultCode& resultCode_)
-{
-  if(!VehicleDataResultCodeMarshaller::checkIntegrityConst(resultCode_))   return false;
-  resultCode=resultCode_;
-  return true;
-}
-
-
-
-
-const VehicleDataType& VehicleDataResult::get_dataType(void) const 
-{
-  return dataType;
-}
-
-
-const VehicleDataResultCode& VehicleDataResult::get_resultCode(void) const 
-{
-  return resultCode;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.cpp
deleted file mode 100644
index 99aa6b954..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataResultCode.h"
-#include "VehicleDataResultCodeMarshaller.h"
-#include "VehicleDataResultCodeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const VehicleDataResultCode::VehicleDataResultCodeInternal VehicleDataResultCodeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return VehicleDataResultCode::INVALID_ENUM;
-  const struct PerfectHashTable* p=VehicleDataResultCode_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<VehicleDataResultCode::VehicleDataResultCodeInternal>(p->idx) : VehicleDataResultCode::INVALID_ENUM;
-}
-
-
-bool VehicleDataResultCodeMarshaller::fromJSON(const Json::Value& s,VehicleDataResultCode& e)
-{
-  e.mInternal=VehicleDataResultCode::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=VehicleDataResultCode::INVALID_ENUM);
-}
-
-
-Json::Value VehicleDataResultCodeMarshaller::toJSON(const VehicleDataResultCode& e)
-{
-  if(e.mInternal==VehicleDataResultCode::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool VehicleDataResultCodeMarshaller::fromString(const std::string& s,VehicleDataResultCode& e)
-{
-  e.mInternal=VehicleDataResultCode::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string VehicleDataResultCodeMarshaller::toString(const VehicleDataResultCode& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==VehicleDataResultCode::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable VehicleDataResultCodeMarshaller::mHashTable[8]=
-{
-  {"SUCCESS",0},
-  {"DISALLOWED",1},
-  {"USER_DISALLOWED",2},
-  {"INVALID_ID",3},
-  {"VEHICLE_DATA_NOT_AVAILABLE",4},
-  {"DATA_ALREADY_SUBSCRIBED",5},
-  {"DATA_NOT_SUBSCRIBED",6},
-  {"IGNORED",7}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp
deleted file mode 100644
index 73000e0c7..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp
+++ /dev/null
@@ -1,24 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name VehicleDataResultCode_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-SUCCESS,0
-DISALLOWED,1
-USER_DISALLOWED,2
-INVALID_ID,3
-VEHICLE_DATA_NOT_AVAILABLE,4
-DATA_ALREADY_SUBSCRIBED,5
-DATA_NOT_SUBSCRIBED,6
-IGNORED,7
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.h
deleted file mode 100644
index 656f68e89..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_VEHICLEDATARESULTCODEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_VEHICLEDATARESULTCODEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataResultCode.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for VehicleDataResultCode
-
-  class VehicleDataResultCodeMarshaller
-  {
-  public:
-  
-    static std::string toName(const VehicleDataResultCode& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(VehicleDataResultCode& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=VehicleDataResultCode::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(VehicleDataResultCode& e)		{ return e.mInternal!=VehicleDataResultCode::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const VehicleDataResultCode& e)	{ return e.mInternal!=VehicleDataResultCode::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,VehicleDataResultCode& e);
-    static const std::string toString(const VehicleDataResultCode& e);
-  
-    static bool fromJSON(const Json::Value& s,VehicleDataResultCode& e);
-    static Json::Value toJSON(const VehicleDataResultCode& e);
-  
-    static const char* getName(VehicleDataResultCode::VehicleDataResultCodeInternal e)
-    {
-       return (e>=0 && e<8) ? mHashTable[e].name : NULL;
-    }
-  
-    static const VehicleDataResultCode::VehicleDataResultCodeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[8];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.inc
deleted file mode 100644
index 3b9ab618b..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.inc
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp  */
-/* Computed positions: -k'1' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 8
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 26
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 28
-/* maximum key range = 22, duplicates = 0 */
-
-class VehicleDataResultCode_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-VehicleDataResultCode_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29,  5, 29,
-      29, 29, 29,  0, 29, 29, 29, 29, 29, 29,
-      29, 29, 29,  5, 29,  5,  0, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-      29, 29, 29, 29, 29, 29
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-VehicleDataResultCode_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  7,  0,  0, 10,  0,  7,  0,
-       0, 10,  0,  0,  0,  0, 15,  0,  0,  0, 19,  0, 26,  0,
-      23
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
-      {"IGNORED",7},
-      {""}, {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
-      {"INVALID_ID",3},
-      {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
-      {"SUCCESS",0},
-      {""}, {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
-      {"DISALLOWED",1},
-      {""}, {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
-      {"USER_DISALLOWED",2},
-      {""}, {""}, {""},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
-      {"DATA_NOT_SUBSCRIBED",6},
-      {""},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
-      {"VEHICLE_DATA_NOT_AVAILABLE",4},
-      {""},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultCodeMarshaller.gp"
-      {"DATA_ALREADY_SUBSCRIBED",5}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.cpp
deleted file mode 100644
index 97b29e28f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataResult.h"
-#include "VehicleDataResultCodeMarshaller.h"
-#include "VehicleDataTypeMarshaller.h"
-
-#include "VehicleDataResultMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool VehicleDataResultMarshaller::checkIntegrity(VehicleDataResult& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool VehicleDataResultMarshaller::fromString(const std::string& s,VehicleDataResult& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string VehicleDataResultMarshaller::toString(const VehicleDataResult& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool VehicleDataResultMarshaller::checkIntegrityConst(const VehicleDataResult& s)
-{
-  if(!VehicleDataTypeMarshaller::checkIntegrityConst(s.dataType))  return false;
-  if(!VehicleDataResultCodeMarshaller::checkIntegrityConst(s.resultCode))  return false;
-  return true;
-}
-
-Json::Value VehicleDataResultMarshaller::toJSON(const VehicleDataResult& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["dataType"]=VehicleDataTypeMarshaller::toJSON(e.dataType);
-
-  json["resultCode"]=VehicleDataResultCodeMarshaller::toJSON(e.resultCode);
-
-
-  return json;
-}
-
-
-bool VehicleDataResultMarshaller::fromJSON(const Json::Value& json,VehicleDataResult& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("dataType"))  return false;
-    {
-      const Json::Value& j=json["dataType"];
-      if(!VehicleDataTypeMarshaller::fromJSON(j,c.dataType))
-        return false;
-    }
-    if(!json.isMember("resultCode"))  return false;
-    {
-      const Json::Value& j=json["resultCode"];
-      if(!VehicleDataResultCodeMarshaller::fromJSON(j,c.resultCode))
-        return false;
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.h
deleted file mode 100644
index 237f38dda..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataResultMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_VEHICLEDATARESULTMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_VEHICLEDATARESULTMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataResult.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct VehicleDataResultMarshaller
-  {
-    static bool checkIntegrity(VehicleDataResult& e);
-    static bool checkIntegrityConst(const VehicleDataResult& e);
-  
-    static bool fromString(const std::string& s,VehicleDataResult& e);
-    static const std::string toString(const VehicleDataResult& e);
-  
-    static bool fromJSON(const Json::Value& s,VehicleDataResult& e);
-    static Json::Value toJSON(const VehicleDataResult& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.cpp
deleted file mode 100644
index 71312a476..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataType.h"
-#include "VehicleDataTypeMarshaller.h"
-#include "VehicleDataTypeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const VehicleDataType::VehicleDataTypeInternal VehicleDataTypeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return VehicleDataType::INVALID_ENUM;
-  const struct PerfectHashTable* p=VehicleDataType_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<VehicleDataType::VehicleDataTypeInternal>(p->idx) : VehicleDataType::INVALID_ENUM;
-}
-
-
-bool VehicleDataTypeMarshaller::fromJSON(const Json::Value& s,VehicleDataType& e)
-{
-  e.mInternal=VehicleDataType::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=VehicleDataType::INVALID_ENUM);
-}
-
-
-Json::Value VehicleDataTypeMarshaller::toJSON(const VehicleDataType& e)
-{
-  if(e.mInternal==VehicleDataType::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool VehicleDataTypeMarshaller::fromString(const std::string& s,VehicleDataType& e)
-{
-  e.mInternal=VehicleDataType::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string VehicleDataTypeMarshaller::toString(const VehicleDataType& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==VehicleDataType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable VehicleDataTypeMarshaller::mHashTable[16]=
-{
-  {"VEHICLEDATA_GPS",0},
-  {"VEHICLEDATA_SPEED",1},
-  {"VEHICLEDATA_FUELLEVEL",2},
-  {"VEHICLEDATA_FUELECONOMY",3},
-  {"VEHICLEDATA_ENGINERPM",4},
-  {"VEHICLEDATA_BATTVOLTS",5},
-  {"VEHICLEDATA_RAINSENSOR",6},
-  {"VEHICLEDATA_ODOMETER",7},
-  {"VEHICLEDATA_VIN",8},
-  {"VEHICLEDATA_EXTERNTEMP",9},
-  {"VEHICLEDATA_PRNDLSTATUS",10},
-  {"VEHICLEDATA_TIREPRESSURE",11},
-  {"VEHICLEDATA_BATTERYPACKVOLTAGE",12},
-  {"VEHICLEDATA_BATTERYCURRENT",13},
-  {"VEHICLEDATA_BATTERYTEMPERATURE",14},
-  {"VEHICLEDATA_SATESN",15}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp
deleted file mode 100644
index 0cf47f536..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp
+++ /dev/null
@@ -1,32 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name VehicleDataType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-VEHICLEDATA_GPS,0
-VEHICLEDATA_SPEED,1
-VEHICLEDATA_FUELLEVEL,2
-VEHICLEDATA_FUELECONOMY,3
-VEHICLEDATA_ENGINERPM,4
-VEHICLEDATA_BATTVOLTS,5
-VEHICLEDATA_RAINSENSOR,6
-VEHICLEDATA_ODOMETER,7
-VEHICLEDATA_VIN,8
-VEHICLEDATA_EXTERNTEMP,9
-VEHICLEDATA_PRNDLSTATUS,10
-VEHICLEDATA_TIREPRESSURE,11
-VEHICLEDATA_BATTERYPACKVOLTAGE,12
-VEHICLEDATA_BATTERYCURRENT,13
-VEHICLEDATA_BATTERYTEMPERATURE,14
-VEHICLEDATA_SATESN,15
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.h
deleted file mode 100644
index 440a77f8a..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_VEHICLEDATATYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_VEHICLEDATATYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleDataType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for VehicleDataType
-
-  class VehicleDataTypeMarshaller
-  {
-  public:
-  
-    static std::string toName(const VehicleDataType& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(VehicleDataType& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=VehicleDataType::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(VehicleDataType& e)		{ return e.mInternal!=VehicleDataType::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const VehicleDataType& e)	{ return e.mInternal!=VehicleDataType::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,VehicleDataType& e);
-    static const std::string toString(const VehicleDataType& e);
-  
-    static bool fromJSON(const Json::Value& s,VehicleDataType& e);
-    static Json::Value toJSON(const VehicleDataType& e);
-  
-    static const char* getName(VehicleDataType::VehicleDataTypeInternal e)
-    {
-       return (e>=0 && e<16) ? mHashTable[e].name : NULL;
-    }
-  
-    static const VehicleDataType::VehicleDataTypeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[16];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.inc
deleted file mode 100644
index 57d12c7f2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.inc
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp  */
-/* Computed positions: -k'13,20' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-
-#define TOTAL_KEYWORDS 16
-#define MIN_WORD_LENGTH 15
-#define MAX_WORD_LENGTH 30
-#define MIN_HASH_VALUE 15
-#define MAX_HASH_VALUE 36
-/* maximum key range = 22, duplicates = 0 */
-
-class VehicleDataType_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline unsigned int
-VehicleDataType_intHash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37,  0,  0, 10, 37,  0,
-      10,  5, 37, 37, 37, 37, 37, 37,  0,  0,
-       5, 37,  5,  0,  0, 37,  0, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-      37, 37, 37, 37, 37, 37
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[19]];
-      /*FALLTHROUGH*/
-      case 19:
-      case 18:
-      case 17:
-      case 16:
-      case 15:
-      case 14:
-      case 13:
-        hval += asso_values[(unsigned char)str[12]];
-        break;
-    }
-  return hval;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-VehicleDataType_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0, 15,  0, 17, 18,  0, 15, 21, 22,  0, 24, 20, 21, 22,
-      23,  0, 30, 21,  0, 23,  0, 30, 26
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 25 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_VIN",8},
-      {""},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_SPEED",1},
-#line 32 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_SATESN",15},
-      {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_GPS",0},
-#line 22 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_BATTVOLTS",5},
-#line 26 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_EXTERNTEMP",9},
-      {""},
-#line 28 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_TIREPRESSURE",11},
-#line 24 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_ODOMETER",7},
-#line 21 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_ENGINERPM",4},
-#line 23 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_RAINSENSOR",6},
-#line 27 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_PRNDLSTATUS",10},
-      {""},
-#line 31 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_BATTERYTEMPERATURE",14},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_FUELLEVEL",2},
-      {""},
-#line 20 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_FUELECONOMY",3},
-      {""},
-#line 29 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_BATTERYPACKVOLTAGE",12},
-#line 30 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleDataTypeMarshaller.gp"
-      {"VEHICLEDATA_BATTERYCURRENT",13}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleType.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleType.cpp
deleted file mode 100644
index b647881c3..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleType.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleType.h"
-#include "VehicleTypeMarshaller.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-VehicleType& VehicleType::operator =(const VehicleType& c)
-{
-  make=c.make ? new std::string(c.make[0]) : 0;
-  model=c.model ? new std::string(c.model[0]) : 0;
-  modelYear=c.modelYear ? new std::string(c.modelYear[0]) : 0;
-  trim=c.trim ? new std::string(c.trim[0]) : 0;
-
-  return *this;
-}
-
-
-VehicleType::~VehicleType(void)
-{
-  if(make)
-    delete make;
-  if(model)
-    delete model;
-  if(modelYear)
-    delete modelYear;
-  if(trim)
-    delete trim;
-}
-
-
-VehicleType::VehicleType(const VehicleType& c)
-{
-  *this=c;
-}
-
-
-bool VehicleType::checkIntegrity(void)
-{
-  return VehicleTypeMarshaller::checkIntegrity(*this);
-}
-
-
-VehicleType::VehicleType(void) :
-    make(0),
-    model(0),
-    modelYear(0),
-    trim(0)
-{
-}
-
-
-
-bool VehicleType::set_make(const std::string& make_)
-{
-  if(make_.length()>500)  return false;
-  delete make;
-  make=0;
-
-  make=new std::string(make_);
-  return true;
-}
-
-void VehicleType::reset_make(void)
-{
-  if(make)
-    delete make;
-  make=0;
-}
-
-bool VehicleType::set_model(const std::string& model_)
-{
-  if(model_.length()>500)  return false;
-  delete model;
-  model=0;
-
-  model=new std::string(model_);
-  return true;
-}
-
-void VehicleType::reset_model(void)
-{
-  if(model)
-    delete model;
-  model=0;
-}
-
-bool VehicleType::set_modelYear(const std::string& modelYear_)
-{
-  if(modelYear_.length()>500)  return false;
-  delete modelYear;
-  modelYear=0;
-
-  modelYear=new std::string(modelYear_);
-  return true;
-}
-
-void VehicleType::reset_modelYear(void)
-{
-  if(modelYear)
-    delete modelYear;
-  modelYear=0;
-}
-
-bool VehicleType::set_trim(const std::string& trim_)
-{
-  if(trim_.length()>500)  return false;
-  delete trim;
-  trim=0;
-
-  trim=new std::string(trim_);
-  return true;
-}
-
-void VehicleType::reset_trim(void)
-{
-  if(trim)
-    delete trim;
-  trim=0;
-}
-
-
-
-
-const std::string* VehicleType::get_make(void) const 
-{
-  return make;
-}
-
-
-const std::string* VehicleType::get_model(void) const 
-{
-  return model;
-}
-
-
-const std::string* VehicleType::get_modelYear(void) const 
-{
-  return modelYear;
-}
-
-
-const std::string* VehicleType::get_trim(void) const 
-{
-  return trim;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.cpp
deleted file mode 100644
index af3067400..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleType.h"
-
-
-#include "VehicleTypeMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool VehicleTypeMarshaller::checkIntegrity(VehicleType& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool VehicleTypeMarshaller::fromString(const std::string& s,VehicleType& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string VehicleTypeMarshaller::toString(const VehicleType& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool VehicleTypeMarshaller::checkIntegrityConst(const VehicleType& s)
-{
-  if(s.make && s.make->length()>500)  return false;
-  if(s.model && s.model->length()>500)  return false;
-  if(s.modelYear && s.modelYear->length()>500)  return false;
-  if(s.trim && s.trim->length()>500)  return false;
-  return true;
-}
-
-Json::Value VehicleTypeMarshaller::toJSON(const VehicleType& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  if(e.make)
-    json["make"]=Json::Value(*e.make);
-
-  if(e.model)
-    json["model"]=Json::Value(*e.model);
-
-  if(e.modelYear)
-    json["modelYear"]=Json::Value(*e.modelYear);
-
-  if(e.trim)
-    json["trim"]=Json::Value(*e.trim);
-
-
-  return json;
-}
-
-
-bool VehicleTypeMarshaller::fromJSON(const Json::Value& json,VehicleType& c)
-{
-  if(c.make)  delete c.make;
-  c.make=0;
-
-  if(c.model)  delete c.model;
-  c.model=0;
-
-  if(c.modelYear)  delete c.modelYear;
-  c.modelYear=0;
-
-  if(c.trim)  delete c.trim;
-  c.trim=0;
-
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(json.isMember("make"))
-    {
-      const Json::Value& j=json["make"];
-      if(!j.isString())  return false;
-      c.make=new std::string(j.asString());
-    }
-    if(json.isMember("model"))
-    {
-      const Json::Value& j=json["model"];
-      if(!j.isString())  return false;
-      c.model=new std::string(j.asString());
-    }
-    if(json.isMember("modelYear"))
-    {
-      const Json::Value& j=json["modelYear"];
-      if(!j.isString())  return false;
-      c.modelYear=new std::string(j.asString());
-    }
-    if(json.isMember("trim"))
-    {
-      const Json::Value& j=json["trim"];
-      if(!j.isString())  return false;
-      c.trim=new std::string(j.asString());
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.h
deleted file mode 100644
index ea28ffe70..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VehicleTypeMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_VEHICLETYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_VEHICLETYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VehicleType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct VehicleTypeMarshaller
-  {
-    static bool checkIntegrity(VehicleType& e);
-    static bool checkIntegrityConst(const VehicleType& e);
-  
-    static bool fromString(const std::string& s,VehicleType& e);
-    static const std::string toString(const VehicleType& e);
-  
-    static bool fromJSON(const Json::Value& s,VehicleType& e);
-    static Json::Value toJSON(const VehicleType& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.cpp
deleted file mode 100644
index f82ee2417..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrCapabilities.h"
-#include "VrCapabilitiesMarshaller.h"
-#include "VrCapabilitiesMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const VrCapabilities::VrCapabilitiesInternal VrCapabilitiesMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return VrCapabilities::INVALID_ENUM;
-  const struct PerfectHashTable* p=VrCapabilities_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<VrCapabilities::VrCapabilitiesInternal>(p->idx) : VrCapabilities::INVALID_ENUM;
-}
-
-
-bool VrCapabilitiesMarshaller::fromJSON(const Json::Value& s,VrCapabilities& e)
-{
-  e.mInternal=VrCapabilities::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=VrCapabilities::INVALID_ENUM);
-}
-
-
-Json::Value VrCapabilitiesMarshaller::toJSON(const VrCapabilities& e)
-{
-  if(e.mInternal==VrCapabilities::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool VrCapabilitiesMarshaller::fromString(const std::string& s,VrCapabilities& e)
-{
-  e.mInternal=VrCapabilities::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string VrCapabilitiesMarshaller::toString(const VrCapabilities& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==VrCapabilities::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable VrCapabilitiesMarshaller::mHashTable[1]=
-{
-  {"TEXT",0}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.gp
deleted file mode 100644
index c9afb3021..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.gp
+++ /dev/null
@@ -1,17 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name VrCapabilities_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-TEXT,0
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.h
deleted file mode 100644
index 8dcc212c5..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_VRCAPABILITIESMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_VRCAPABILITIESMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for VrCapabilities
-
-  class VrCapabilitiesMarshaller
-  {
-  public:
-  
-    static std::string toName(const VrCapabilities& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(VrCapabilities& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=VrCapabilities::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(VrCapabilities& e)		{ return e.mInternal!=VrCapabilities::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const VrCapabilities& e)	{ return e.mInternal!=VrCapabilities::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,VrCapabilities& e);
-    static const std::string toString(const VrCapabilities& e);
-  
-    static bool fromJSON(const Json::Value& s,VrCapabilities& e);
-    static Json::Value toJSON(const VrCapabilities& e);
-  
-    static const char* getName(VrCapabilities::VrCapabilitiesInternal e)
-    {
-       return (e>=0 && e<1) ? mHashTable[e].name : NULL;
-    }
-  
-    static const VrCapabilities::VrCapabilitiesInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[1];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.inc
deleted file mode 100644
index 1048563f4..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 1
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 4
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 4
-/* maximum key range = 1, duplicates = 0 */
-
-namespace NsSmartDeviceLinkRPCV2 {
-
-class VrCapabilities_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-VrCapabilities_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-VrCapabilities_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrCapabilitiesMarshaller.gp"
-      {"TEXT",0}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItem.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItem.cpp
deleted file mode 100644
index a87dd3949..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItem.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h"
-#include "VrHelpItemMarshaller.h"
-#include "ImageMarshaller.h"
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-VrHelpItem::VrHelpItem(const VrHelpItem& c)
-{
-  *this=c;
-}
-
-
-bool VrHelpItem::checkIntegrity(void)
-{
-  return VrHelpItemMarshaller::checkIntegrity(*this);
-}
-
-
-VrHelpItem::VrHelpItem(void)
-{
-}
-
-
-
-bool VrHelpItem::set_image(const Image& image_)
-{
-  if(!ImageMarshaller::checkIntegrityConst(image_))   return false;
-  image=image_;
-  return true;
-}
-
-bool VrHelpItem::set_position(unsigned int position_)
-{
-  if(position_>8)  return false;
-  if(position_<1)  return false;
-  position=position_;
-  return true;
-}
-
-bool VrHelpItem::set_text(const std::string& text_)
-{
-  if(text_.length()>500)  return false;
-  text=text_;
-  return true;
-}
-
-
-
-
-const Image& VrHelpItem::get_image(void) const 
-{
-  return image;
-}
-
-
-unsigned int VrHelpItem::get_position(void) const
-{
-  return position;
-}
-
-
-const std::string& VrHelpItem::get_text(void) const 
-{
-  return text;
-}
-
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.cpp
deleted file mode 100644
index 23d010c6d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h"
-#include "ImageMarshaller.h"
-
-#include "VrHelpItemMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-bool VrHelpItemMarshaller::checkIntegrity(VrHelpItem& s)
-{
-  return checkIntegrityConst(s);
-}
-
-
-bool VrHelpItemMarshaller::fromString(const std::string& s,VrHelpItem& e)
-{
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(!fromJSON(json,e))  return false;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return true;
-}
-
-
-const std::string VrHelpItemMarshaller::toString(const VrHelpItem& e)
-{
-  Json::FastWriter writer;
-  return checkIntegrityConst(e) ? writer.write(toJSON(e)) : "";
-}
-
-
-bool VrHelpItemMarshaller::checkIntegrityConst(const VrHelpItem& s)
-{
-  if(!ImageMarshaller::checkIntegrityConst(s.image))  return false;
-  if(s.position>8)  return false;
-  if(s.position<1)  return false;
-  if(s.text.length()>500)  return false;
-  return true;
-}
-
-Json::Value VrHelpItemMarshaller::toJSON(const VrHelpItem& e)
-{
-  Json::Value json(Json::objectValue);
-  if(!checkIntegrityConst(e))
-    return Json::Value(Json::nullValue);
-
-  json["image"]=ImageMarshaller::toJSON(e.image);
-
-  json["position"]=Json::Value(e.position);
-
-  json["text"]=Json::Value(e.text);
-
-
-  return json;
-}
-
-
-bool VrHelpItemMarshaller::fromJSON(const Json::Value& json,VrHelpItem& c)
-{
-  try
-  {
-    if(!json.isObject())  return false;
-
-    if(!json.isMember("image"))  return false;
-    {
-      const Json::Value& j=json["image"];
-      if(!ImageMarshaller::fromJSON(j,c.image))
-        return false;
-    }
-    if(!json.isMember("position"))  return false;
-    {
-      const Json::Value& j=json["position"];
-      if(!j.isInt())  return false;
-      c.position=j.asInt();
-    }
-    if(!json.isMember("text"))  return false;
-    {
-      const Json::Value& j=json["text"];
-      if(!j.isString())  return false;
-      c.text=j.asString();
-    }
-
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return checkIntegrity(c);
-}
-
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.h
deleted file mode 100644
index c426beb5f..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/VrHelpItemMarshaller.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_VRHELPITEMMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_VRHELPITEMMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  struct VrHelpItemMarshaller
-  {
-    static bool checkIntegrity(VrHelpItem& e);
-    static bool checkIntegrityConst(const VrHelpItem& e);
-  
-    static bool fromString(const std::string& s,VrHelpItem& e);
-    static const std::string toString(const VrHelpItem& e);
-  
-    static bool fromJSON(const Json::Value& s,VrHelpItem& e);
-    static Json::Value toJSON(const VrHelpItem& e);
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.cpp
deleted file mode 100644
index 1dc2a7506..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#include <cstring>
-#include "../include/JSONHandler/SDLRPCObjects/V2/messageType.h"
-#include "messageTypeMarshaller.h"
-#include "messageTypeMarshaller.inc"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-using namespace NsSmartDeviceLinkRPCV2;
-
-
-const messageType::messageTypeInternal messageTypeMarshaller::getIndex(const char* s)
-{
-  if(!s)
-    return messageType::INVALID_ENUM;
-  const struct PerfectHashTable* p=messageType_intHash::getPointer(s,strlen(s));
-  return p ? static_cast<messageType::messageTypeInternal>(p->idx) : messageType::INVALID_ENUM;
-}
-
-
-bool messageTypeMarshaller::fromJSON(const Json::Value& s,messageType& e)
-{
-  e.mInternal=messageType::INVALID_ENUM;
-  if(!s.isString())
-    return false;
-
-  e.mInternal=getIndex(s.asString().c_str());
-  return (e.mInternal!=messageType::INVALID_ENUM);
-}
-
-
-Json::Value messageTypeMarshaller::toJSON(const messageType& e)
-{
-  if(e.mInternal==messageType::INVALID_ENUM) 
-    return Json::Value(Json::nullValue);
-  const char* s=getName(e.mInternal);
-  return s ? Json::Value(s) : Json::Value(Json::nullValue);
-}
-
-
-bool messageTypeMarshaller::fromString(const std::string& s,messageType& e)
-{
-  e.mInternal=messageType::INVALID_ENUM;
-  try
-  {
-    Json::Reader reader;
-    Json::Value json;
-    if(!reader.parse(s,json,false))  return false;
-    if(fromJSON(json,e))  return true;
-  }
-  catch(...)
-  {
-    return false;
-  }
-  return false;
-}
-
-const std::string messageTypeMarshaller::toString(const messageType& e)
-{
-  Json::FastWriter writer;
-  return e.mInternal==messageType::INVALID_ENUM ? "" : writer.write(toJSON(e));
-
-}
-
-const PerfectHashTable messageTypeMarshaller::mHashTable[3]=
-{
-  {"request",0},
-  {"response",1},
-  {"notification",2}
-};
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp
deleted file mode 100644
index b5c842d92..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp
+++ /dev/null
@@ -1,19 +0,0 @@
-%language=C++
-%struct-type
-%define lookup-function-name getPointer
-%define class-name messageType_intHash
-%omit-struct-type
-%readonly-tables
-%compare-strncmp
-%compare-lengths
-
-struct NsSmartDeviceLinkRPCV2::PerfectHashTable
-{
-  const char *name;
-  unsigned int idx;
-};
-
-%%
-request,0
-response,1
-notification,2
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.h b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.h
deleted file mode 100644
index d74b9bd0d..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKRPCV2_MESSAGETYPEMARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKRPCV2_MESSAGETYPEMARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "PerfectHashTable.h"
-
-#include "../include/JSONHandler/SDLRPCObjects/V2/messageType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-//! marshalling class for messageType
-
-  class messageTypeMarshaller
-  {
-  public:
-  
-    static std::string toName(const messageType& e) 	{ return getName(e.mInternal) ?: ""; }
-  
-    static bool fromName(messageType& e,const std::string& s)
-    { 
-      return (e.mInternal=getIndex(s.c_str()))!=messageType::INVALID_ENUM;
-    }
-  
-    static bool checkIntegrity(messageType& e)		{ return e.mInternal!=messageType::INVALID_ENUM; } 
-    static bool checkIntegrityConst(const messageType& e)	{ return e.mInternal!=messageType::INVALID_ENUM; } 
-  
-    static bool fromString(const std::string& s,messageType& e);
-    static const std::string toString(const messageType& e);
-  
-    static bool fromJSON(const Json::Value& s,messageType& e);
-    static Json::Value toJSON(const messageType& e);
-  
-    static const char* getName(messageType::messageTypeInternal e)
-    {
-       return (e>=0 && e<3) ? mHashTable[e].name : NULL;
-    }
-  
-    static const messageType::messageTypeInternal getIndex(const char* s);
-  
-    static const PerfectHashTable mHashTable[3];
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.inc
deleted file mode 100644
index a4f943916..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* C++ code produced by gperf version 3.0.3 */
-/* Command-line: gperf --output-file=./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.inc ./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp  */
-/* Computed positions: -k'' */
-
-
-#define TOTAL_KEYWORDS 3
-#define MIN_WORD_LENGTH 7
-#define MAX_WORD_LENGTH 12
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 12
-/* maximum key range = 6, duplicates = 0 */
-
-class messageType_intHash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *getPointer (const char *str, unsigned int len);
-};
-
-inline /*ARGSUSED*/
-unsigned int
-messageType_intHash::hash (register const char *str, register unsigned int len)
-{
-  return len;
-}
-
-const struct NsSmartDeviceLinkRPCV2::PerfectHashTable *
-messageType_intHash::getPointer (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  0,  0,  0,  7,  8,  0,  0,  0, 12
-    };
-  static const struct NsSmartDeviceLinkRPCV2::PerfectHashTable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp"
-      {"request",0},
-#line 18 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp"
-      {"response",1},
-      {""}, {""}, {""},
-#line 19 "./src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/messageTypeMarshaller.gp"
-      {"notification",2}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCRequest.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCRequest.cpp
deleted file mode 100644
index 124c7bdb2..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCRequest.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
-* \file SDLRPCRequest.cpp
-* \brief SDLRPCRequest class source file.
-* Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "JSONHandler/SDLRPCRequest.h"
-
-using namespace NsSmartDeviceLinkRPC;
-
-SDLRPCRequest::SDLRPCRequest( unsigned int protocolVersion ) :
-SDLRPCMessage( protocolVersion, REQUEST )
-, mCorrelationID(0)
-{}
-
-SDLRPCRequest::SDLRPCRequest(void) :
-SDLRPCMessage( 0, REQUEST )
-, mCorrelationID(0)
-{}
-
-SDLRPCRequest::SDLRPCRequest( unsigned int protocolVersion,  int methodId ) :
-SDLRPCMessage( protocolVersion, REQUEST, methodId)
-, mCorrelationID(0)
-{}
-
-SDLRPCRequest::~SDLRPCRequest()
-{}
-
-unsigned int SDLRPCRequest::getCorrelationID() const
-{
-    return mCorrelationID;
-}
-
-void SDLRPCRequest::setCorrelationID( unsigned int correlationID )
-{
-    mCorrelationID = correlationID;
-}
diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCResponse.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCResponse.cpp
deleted file mode 100644
index 705d34873..000000000
--- a/SDL_Core/src/components/JSONHandler/src/SDLRPCResponse.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
-* \file SDLRPCResponse.cpp
-* \brief SDLRPCResponse class source file.
-* Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include "JSONHandler/SDLRPCResponse.h"
-//#include "../src/JSONHandler/ALRPCObjectsImpl/V1/ResultMarshaller.h"
-
-using namespace NsSmartDeviceLinkRPC;
-
-SDLRPCResponse::SDLRPCResponse(unsigned int protocolVersion)
-    : SDLRPCMessage(protocolVersion, RESPONSE)
-    , mCorrelationID(0)
-    , info(NULL)
-    , success(false)
-    , resultCode(NsSmartDeviceLinkRPCV2::Result::INVALID_ENUM)
-{}
-
-SDLRPCResponse::SDLRPCResponse(void)
-    : SDLRPCMessage(0, RESPONSE)
-    , mCorrelationID(0)
-    , info(NULL)
-    , success(false)
-    , resultCode(NsSmartDeviceLinkRPCV2::Result::INVALID_ENUM)
-{}
-
-SDLRPCResponse::SDLRPCResponse(unsigned int protocolVersion,  int methodId)
-    : SDLRPCMessage(protocolVersion, RESPONSE, methodId)
-    , mCorrelationID(0)
-    , info(NULL)
-    , success(false)
-    , resultCode(NsSmartDeviceLinkRPCV2::Result::INVALID_ENUM)
-{}
-
-SDLRPCResponse::~SDLRPCResponse()
-{
-    if (info)
-    {
-        delete info;
-    }
-}
-
-unsigned int SDLRPCResponse::getCorrelationID() const
-{
-    return mCorrelationID;
-}
-
-void SDLRPCResponse::setCorrelationID(unsigned int correlationID)
-{
-    mCorrelationID = correlationID;
-}
-
-bool SDLRPCResponse::get_success(void) const
-{
-    return success;
-}
-
-const NsSmartDeviceLinkRPCV2::Result& SDLRPCResponse::get_resultCode(void) const
-{
-    return resultCode;
-}
-
-bool SDLRPCResponse::set_success(bool success_)
-{
-    success = success_;
-    return true;
-}
-
-bool SDLRPCResponse::set_resultCode(const NsSmartDeviceLinkRPCV2::Result& resultCode_)
-{
-    /*if (!NsSmartDeviceLinkRPC::ResultMarshaller::checkIntegrityConst(resultCode_))
-    {
-        return false;
-    }*/
-
-    resultCode = resultCode_;
-    return true;
-}
-
-bool SDLRPCResponse::set_info(const std::string& info_)
-{
-    if (info_.length() > 1000)
-    {
-        return false;
-    }
-
-    delete info;
-    info = NULL;
-
-    info = new std::string(info_);
-    return true;
-}
-
-void SDLRPCResponse::reset_info(void)
-{
-    if (info)
-    {
-        delete info;
-    }
-
-    info = NULL;
-}
-
-const std::string* SDLRPCResponse::get_info(void) const
-{
-    return info;
-}