diff --git a/esp/scm/ldapenvironment.ecm b/esp/scm/ldapenvironment.ecm
index 9942a9048ed..299420a5a9f 100644
--- a/esp/scm/ldapenvironment.ecm
+++ b/esp/scm/ldapenvironment.ecm
@@ -98,7 +98,6 @@ ESPresponse EchoResponse
 ESPservice [
         version("1.00"),
         default_client_version("1.00"),
-        service_use_latest_version,
         exceptions_inline("./smc_xslt/exceptions.xslt")
     ] ldapenvironment
 {
diff --git a/esp/scm/ws_access.ecm b/esp/scm/ws_access.ecm
index 77294c26399..a00a43e95e8 100644
--- a/esp/scm/ws_access.ecm
+++ b/esp/scm/ws_access.ecm
@@ -1006,7 +1006,7 @@ ESPresponse [nil_remove] UserAccountExportResponse
     [http_content("application/octet-stream")] binary Result;
 };
 
-ESPservice [version("1.17"), service_use_latest_version, auth_feature("NONE"), exceptions_inline("./smc_xslt/exceptions.xslt")] ws_access
+ESPservice [version("1.17"), generated_client_version("0.0"), auth_feature("NONE"), exceptions_inline("./smc_xslt/exceptions.xslt")] ws_access
 {
     ESPmethod [client_xslt("/esp/xslt/access_users.xslt")] Users(UserRequest, UserResponse);
     ESPmethod [client_xslt("/esp/xslt/access_useredit.xslt")] UserEdit(UserEditRequest, UserEditResponse);
diff --git a/esp/scm/ws_account.ecm b/esp/scm/ws_account.ecm
index 7fd3d1c3d3f..2443e79106f 100644
--- a/esp/scm/ws_account.ecm
+++ b/esp/scm/ws_account.ecm
@@ -76,7 +76,7 @@ ESPresponse [exceptions_inline] VerifyUserResponse
 };
 
 //Kevin/russ does this method need feature level check?
-ESPservice [auth_feature("NONE"), version("1.06"), default_client_version("1.06"), service_use_latest_version, exceptions_inline("./smc_xslt/exceptions.xslt")] ws_account
+ESPservice [auth_feature("NONE"), version("1.06"), default_client_version("1.06"), exceptions_inline("./smc_xslt/exceptions.xslt")] ws_account
 {
     ESPmethod [client_xslt("/esp/xslt/account_myaccount.xslt")] MyAccount(MyAccountRequest, MyAccountResponse);
     ESPmethod [client_xslt("/esp/xslt/account_input.xslt")] UpdateUserInput(UpdateUserInputRequest, UpdateUserInputResponse);
diff --git a/esp/scm/ws_cloud.ecm b/esp/scm/ws_cloud.ecm
index b2e00128199..2018e8c1136 100644
--- a/esp/scm/ws_cloud.ecm
+++ b/esp/scm/ws_cloud.ecm
@@ -35,7 +35,7 @@ ESPresponse [encode(0)] GetServicesResponse
     [json_inline(1)] string Result;
 };
 
-ESPservice [auth_feature("CloudAccess:ACCESS"), version("1.01"), service_use_latest_version, exceptions_inline("./smc_xslt/exceptions.xslt")] WsCloud
+ESPservice [auth_feature("CloudAccess:ACCESS"), version("1.01"), generated_client_version("0.00"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsCloud
 {
     ESPmethod [auth_feature("CloudAccess:READ")] GetPODs(GetPODsRequest, GetPODsResponse);
     ESPmethod [auth_feature("CloudAccess:READ"), min_ver("1.01")] GetServices(GetServicesRequest, GetServicesResponse);
diff --git a/esp/scm/ws_codesign.ecm b/esp/scm/ws_codesign.ecm
index ede08defb15..3c1eaca5cef 100644
--- a/esp/scm/ws_codesign.ecm
+++ b/esp/scm/ws_codesign.ecm
@@ -56,7 +56,7 @@ ESPresponse [exceptions_inline] ListUserIDsResponse
     ESParray<string> UserIDs;
 };
 
-ESPservice [auth_feature("CodeSignAccess:ACCESS"), version("1.1"), default_client_version("1.1"), service_use_latest_version, exceptions_inline("./smc_xslt/exceptions.xslt")] ws_codesign
+ESPservice [auth_feature("CodeSignAccess:ACCESS"), version("1.1"), default_client_version("1.1"), exceptions_inline("./smc_xslt/exceptions.xslt")] ws_codesign
 {
     ESPmethod [auth_feature("CodeSignAccess:FULL"), client_xslt("/esp/xslt/codesign.xslt")] Sign(SignRequest, SignResponse);
     ESPmethod [auth_feature("CodeSignAccess:READ")] ListUserIDs(ListUserIDsRequest, ListUserIDsResponse);
diff --git a/esp/scm/ws_configmgr.ecm b/esp/scm/ws_configmgr.ecm
index acef1164a62..fa72a3588f7 100644
--- a/esp/scm/ws_configmgr.ecm
+++ b/esp/scm/ws_configmgr.ecm
@@ -440,7 +440,7 @@ ESPrequest WizardTestRequest
 
 
 
-ESPservice [auth_feature("DEFERRED"),version("2.0"), default_client_version("2.0"), service_use_latest_version, exceptions_inline("xslt/exceptions.xslt"), disable_profile_execution] ws_configmgr
+ESPservice [auth_feature("DEFERRED"), version("2.0"), default_client_version("2.0"), exceptions_inline("xslt/exceptions.xslt"), disable_profile_execution] ws_configmgr
 {
     ESPMethod
         [
diff --git a/esp/scm/ws_dali.ecm b/esp/scm/ws_dali.ecm
index 95a5e920e00..95f67e5eb97 100644
--- a/esp/scm/ws_dali.ecm
+++ b/esp/scm/ws_dali.ecm
@@ -184,7 +184,7 @@ ESPrequest [nil_remove] ClearTraceTransactionsRequest
 };
 
 ESPservice [auth_feature("NONE"), //This declares that the method logic handles feature level authorization
-    version("1.07"), default_client_version("1.07"), service_use_latest_version, exceptions_inline("./smc_xslt/exceptions.xslt")] WSDali
+    version("1.07"), default_client_version("1.07"), exceptions_inline("./smc_xslt/exceptions.xslt")] WSDali
 {
     ESPmethod [min_ver("1.01")] SetValue(SetValueRequest, ResultResponse);
     ESPmethod [min_ver("1.01")] GetValue(GetValueRequest, ResultResponse);
diff --git a/esp/scm/ws_dfs.ecm b/esp/scm/ws_dfs.ecm
index dd6ee9ddab0..6b97353b445 100644
--- a/esp/scm/ws_dfs.ecm
+++ b/esp/scm/ws_dfs.ecm
@@ -53,7 +53,6 @@ ESPservice [
     auth_feature("DEFERRED"),
     version("1.01"),
     default_client_version("1.01"),
-    service_use_latest_version,
     noforms,
     exceptions_inline("./smc_xslt/exceptions.xslt")] WsDfs
 {
diff --git a/esp/scm/ws_dfu.ecm b/esp/scm/ws_dfu.ecm
index 900b28991dc..f49dca0a602 100644
--- a/esp/scm/ws_dfu.ecm
+++ b/esp/scm/ws_dfu.ecm
@@ -997,7 +997,6 @@ ESPservice [
     auth_feature("DEFERRED"),
     version("1.65"),
     default_client_version("1.65"),
-    service_use_latest_version,
     noforms,
     exceptions_inline("./smc_xslt/exceptions.xslt")] WsDfu
 {
diff --git a/esp/scm/ws_dfuXref.ecm b/esp/scm/ws_dfuXref.ecm
index dcea91c74cb..36d04d41c1e 100644
--- a/esp/scm/ws_dfuXref.ecm
+++ b/esp/scm/ws_dfuXref.ecm
@@ -227,7 +227,7 @@ ESPresponse [exceptions_inline] DFUXRefUnusedFilesResponse
 };
 
 //  ===========================================================================
-ESPservice [version("1.04"), default_client_version("1.04"), service_use_latest_version, auth_feature("DEFERRED"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsDFUXRef
+ESPservice [version("1.04"), default_client_version("1.04"), auth_feature("DEFERRED"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsDFUXRef
 {
     ///ESPmethod [resp_xsl_default("./smc_xslt/xref_main.xslt")] DFUXRefList(DFUXRefListRequest, DFUXRefListResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/xref_main.xslt")] DFUXRefList(DFUXRefListRequest, DFUXRefListResponse);
diff --git a/esp/scm/ws_elk.ecm b/esp/scm/ws_elk.ecm
index 52d4832fddd..66913c0b50f 100644
--- a/esp/scm/ws_elk.ecm
+++ b/esp/scm/ws_elk.ecm
@@ -16,7 +16,7 @@ ESPResponse GetConfigDetailsResponse
     string LogStashPort;
  };
 
-ESPservice [auth_feature("WsELKAccess:ACCESS"), version("1.0"), default_client_version("1.0"), service_use_latest_version, exceptions_inline("xslt/exceptions.xslt"), disable_profile_execution] ws_elk
+ESPservice [auth_feature("WsELKAccess:ACCESS"), version("1.0"), default_client_version("1.0"), exceptions_inline("xslt/exceptions.xslt"), disable_profile_execution] ws_elk
 {
     ESPmethod [auth_feature("WsELKAccess:READ")] GetConfigDetails(GetConfigDetailsRequest, GetConfigDetailsResponse);
 };
diff --git a/esp/scm/ws_esdlconfig.ecm b/esp/scm/ws_esdlconfig.ecm
index 6877007962d..a3dec5c9854 100644
--- a/esp/scm/ws_esdlconfig.ecm
+++ b/esp/scm/ws_esdlconfig.ecm
@@ -306,7 +306,7 @@ ESPresponse [exceptions_inline] ListESDLBindingsResponse
 };
 
 #define VERSION_FOR_ESDLCMD "1.5"
-ESPservice [auth_feature("ESDLConfigAccess:ACCESS"), version("1.5"), service_use_latest_version, exceptions_inline("./smc_xslt/exceptions.xslt")] WsESDLConfig
+ESPservice [auth_feature("ESDLConfigAccess:ACCESS"), version("1.5"), generated_client_version("0.0"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsESDLConfig
 {
     ESPmethod Echo(EchoRequest, EchoResponse);
     ESPmethod [auth_feature("ESDLConfigAccess:WRITE")] PublishESDLDefinition(PublishESDLDefinitionRequest, PublishESDLDefinitionResponse);
diff --git a/esp/scm/ws_espcontrol.ecm b/esp/scm/ws_espcontrol.ecm
index 9aea15e8bf1..93a114afe26 100644
--- a/esp/scm/ws_espcontrol.ecm
+++ b/esp/scm/ws_espcontrol.ecm
@@ -149,7 +149,7 @@ ESPresponse [exceptions_inline, nil_remove, http_encode(0)] AttachToDaliResponse
     string Message;
 };
 
-ESPservice [auth_feature("NONE"), version("1.03"), default_client_version("1.03"), service_use_latest_version, exceptions_inline("./smc_xslt/exceptions.xslt")] WSESPControl
+ESPservice [auth_feature("NONE"), version("1.03"), default_client_version("1.03"), exceptions_inline("./smc_xslt/exceptions.xslt")] WSESPControl
 {
     ESPmethod SetLogging(SetLoggingRequest, SetLoggingResponse);
     ESPmethod [min_ver("1.03")] GetLoggingSettings(GetLoggingSettingsRequest, GetLoggingSettingsResponse);
diff --git a/esp/scm/ws_fileio.ecm b/esp/scm/ws_fileio.ecm
index 6d1d25508aa..a69054092ab 100644
--- a/esp/scm/ws_fileio.ecm
+++ b/esp/scm/ws_fileio.ecm
@@ -75,7 +75,7 @@ ReadFileDataResponse
 };
 
 
-ESPservice [auth_feature("DEFERRED"), version("1.01"), default_client_version("1.01"), service_use_latest_version, exceptions_inline("./smc_xslt/exceptions.xslt")] WsFileIO
+ESPservice [auth_feature("DEFERRED"), version("1.01"), default_client_version("1.01"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsFileIO
 {
     ESPmethod CreateFile(CreateFileRequest, CreateFileResponse);
     ESPmethod WriteFileData(WriteFileDataRequest, WriteFileDataResponse);
diff --git a/esp/scm/ws_fs.ecm b/esp/scm/ws_fs.ecm
index 76825ecef00..01a57f89f58 100644
--- a/esp/scm/ws_fs.ecm
+++ b/esp/scm/ws_fs.ecm
@@ -728,7 +728,6 @@ ESPresponse [exceptions_inline, nil_remove] GetRemoteTargetsResponse
 ESPservice [
     auth_feature("DEFERRED"),
     version("1.26"),
-    service_use_latest_version,
     exceptions_inline("./smc_xslt/exceptions.xslt")] FileSpray
 {
     ESPmethod EchoDateTime(EchoDateTime, EchoDateTimeResponse);
diff --git a/esp/scm/ws_logaccess.ecm b/esp/scm/ws_logaccess.ecm
index 007b5e40910..71717e9ada4 100644
--- a/esp/scm/ws_logaccess.ecm
+++ b/esp/scm/ws_logaccess.ecm
@@ -222,7 +222,7 @@ ESPResponse GetLogsResponse
     [min_ver("1.02")] unsigned int TotalLogLinesAvailable;
 };
 
-ESPservice [auth_feature("WsLogAccess:READ"), version("1.05"), default_client_version("1.05"), service_use_latest_version, exceptions_inline("xslt/exceptions.xslt")] ws_logaccess
+ESPservice [auth_feature("WsLogAccess:READ"), version("1.05"), default_client_version("1.05"), exceptions_inline("xslt/exceptions.xslt")] ws_logaccess
 {
     ESPmethod GetLogAccessInfo(GetLogAccessInfoRequest, GetLogAccessInfoResponse);
     ESPmethod GetLogs(GetLogsRequest, GetLogsResponse);
diff --git a/esp/scm/ws_loggingservice.ecm b/esp/scm/ws_loggingservice.ecm
index 9dc23ab5bb5..59a43fead84 100644
--- a/esp/scm/ws_loggingservice.ecm
+++ b/esp/scm/ws_loggingservice.ecm
@@ -52,7 +52,7 @@ ESPresponse [exceptions_inline] UpdateLogResponse
     string StatusMessage;
 };
 
-ESPService [auth_feature("DEFERRED"), version("1.0"), service_use_latest_version, noforms, use_method_name] WsLoggingService
+ESPService [auth_feature("DEFERRED"), version("1.0"), generated_client_version("0.0"), noforms, use_method_name] WsLoggingService
 {
     ESPmethod GetTransactionSeed(GetTransactionSeedRequest, GetTransactionSeedResponse);
     ESPmethod UpdateLog(UpdateLogRequest, UpdateLogResponse);
diff --git a/esp/scm/ws_machine.ecm b/esp/scm/ws_machine.ecm
index f828c951f0c..78322b0d307 100644
--- a/esp/scm/ws_machine.ecm
+++ b/esp/scm/ws_machine.ecm
@@ -457,7 +457,7 @@ ESPresponse [encode(0), nil_remove, exceptions_inline] GetNodeGroupUsageResponse
 };
 
 //-------- service ---------
-ESPservice [auth_feature("DEFERRED"), version("1.18"), service_use_latest_version] ws_machine
+ESPservice [auth_feature("DEFERRED"), version("1.18"), generated_client_version("0.0")] ws_machine
 {
     ESPmethod [resp_xsl_default("./smc_xslt/clusterprocesses.xslt"), exceptions_inline("./smc_xslt/exceptions.xslt")]
        GetTargetClusterInfo(GetTargetClusterInfoRequest, GetTargetClusterInfoResponse);
diff --git a/esp/scm/ws_packageprocess.ecm b/esp/scm/ws_packageprocess.ecm
index dfc225fab47..5e83b6b5178 100644
--- a/esp/scm/ws_packageprocess.ecm
+++ b/esp/scm/ws_packageprocess.ecm
@@ -358,7 +358,7 @@ ESPresponse [exceptions_inline] GetPartFromPackageMapResponse
     string Content;
 };
 
-ESPservice [auth_feature("NONE"), version("1.06"), default_client_version("1.06"), service_use_latest_version, exceptions_inline("./smc_xslt/exceptions.xslt")] WsPackageProcess
+ESPservice [auth_feature("NONE"), version("1.06"), default_client_version("1.06"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsPackageProcess
 {
     ESPmethod Echo(EchoRequest, EchoResponse);
     ESPmethod [auth_feature("PackageMapAccess:WRITE")] AddPackage(AddPackageRequest, AddPackageResponse);
diff --git a/esp/scm/ws_resources.ecm b/esp/scm/ws_resources.ecm
index 61546b979db..12f100b0cc4 100644
--- a/esp/scm/ws_resources.ecm
+++ b/esp/scm/ws_resources.ecm
@@ -113,7 +113,7 @@ ESPresponse [nil_remove, exceptions_inline] TargetQueryResponse
     ESParray<string> Roxies;
 };
 
-ESPservice [auth_feature("ResourceQueryAccess:ACCESS"), version("1.03"), service_use_latest_version, exceptions_inline("./smc_xslt/exceptions.xslt"), disable_profile_execution] WsResources
+ESPservice [auth_feature("ResourceQueryAccess:ACCESS"), version("1.03"), generated_client_version("0.0"), exceptions_inline("./smc_xslt/exceptions.xslt"), disable_profile_execution] WsResources
 {
     ESPmethod [auth_feature("ResourceQueryAccess:READ"), min_ver("1.03")] TargetQuery(TargetQueryRequest, TargetQueryResponse);
     ESPmethod [auth_feature("ResourceQueryAccess:READ")] ServiceQuery(ServiceQueryRequest, ServiceQueryResponse);
diff --git a/esp/scm/ws_sasha.ecm b/esp/scm/ws_sasha.ecm
index 66ceb98eea1..bc2e0fd758f 100644
--- a/esp/scm/ws_sasha.ecm
+++ b/esp/scm/ws_sasha.ecm
@@ -68,7 +68,7 @@ ESPrequest [nil_remove] ListWURequest
 };
 
 ESPservice [auth_feature("DEFERRED"), //This declares that the method logic handles feature level authorization
-    version("1.01"), default_client_version("1.01"), service_use_latest_version, exceptions_inline("./smc_xslt/exceptions.xslt")] WSSasha
+    version("1.01"), default_client_version("1.01"), exceptions_inline("./smc_xslt/exceptions.xslt")] WSSasha
 {
     ESPmethod [auth_feature("SashaAccess:Access")] GetVersion(GetVersionRequest, ResultResponse);
     ESPmethod [auth_feature("SashaAccess:FULL")] ArchiveWU(ArchiveWURequest, ResultResponse); //archive ECL WUs or DFU WUs
diff --git a/esp/scm/ws_smc.ecm b/esp/scm/ws_smc.ecm
index 52352b2cbb5..c8121f80c60 100644
--- a/esp/scm/ws_smc.ecm
+++ b/esp/scm/ws_smc.ecm
@@ -437,7 +437,7 @@ ESPresponse [exceptions_inline] GetBuildInfoResponse
     ESParray<ESPstruct NamedValue> BuildInfo;
 };
 
-ESPservice [auth_feature("DEFERRED"), noforms, version("1.27"), default_client_version("1.27"), service_use_latest_version, exceptions_inline("./smc_xslt/exceptions.xslt"), use_method_name] WsSMC
+ESPservice [auth_feature("DEFERRED"), noforms, version("1.27"), default_client_version("1.27"), exceptions_inline("./smc_xslt/exceptions.xslt"), use_method_name] WsSMC
 {
     ESPmethod Index(SMCIndexRequest, SMCIndexResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/index.xslt")] Activity(ActivityRequest, ActivityResponse);
diff --git a/esp/scm/ws_sql.ecm b/esp/scm/ws_sql.ecm
index 57fef36ca1b..4d7c5b06c38 100644
--- a/esp/scm/ws_sql.ecm
+++ b/esp/scm/ws_sql.ecm
@@ -328,7 +328,7 @@ ESPresponse CreateTableAndLoadResponse
     ESPstruct ECLWorkunit Workunit;
 };
 
-ESPservice [version("3.06"), default_client_version("3.06"), service_use_latest_version, auth_feature("DEFERRED"), exceptions_inline("./smc_xslt/exceptions.xslt")] wssql
+ESPservice [version("3.06"), default_client_version("3.06"), auth_feature("DEFERRED"), exceptions_inline("./smc_xslt/exceptions.xslt")] wssql
 {
     ESPmethod [min_ver("3.03")] CreateTableAndLoad(CreateTableAndLoadRequest, CreateTableAndLoadResponse);
     ESPmethod [min_ver("3.02")] SetRelatedIndexes(SetRelatedIndexesRequest, SetRelatedIndexesResponse);
diff --git a/esp/scm/ws_store.ecm b/esp/scm/ws_store.ecm
index 01717eed0fc..d088d8a7060 100644
--- a/esp/scm/ws_store.ecm
+++ b/esp/scm/ws_store.ecm
@@ -178,7 +178,7 @@ ESPresponse [exceptions_inline] CreateStoreResponse
     [min_ver("1.01")] bool Success;
 };
 
-ESPservice [version("1.02"), default_client_version("1.02"), service_use_latest_version, auth_feature("WsStoreAccess:READ"), exceptions_inline("./smc_xslt/exceptions.xslt")] wsstore
+ESPservice [version("1.02"), default_client_version("1.02"), auth_feature("WsStoreAccess:READ"), exceptions_inline("./smc_xslt/exceptions.xslt")] wsstore
 {
     ESPmethod [auth_feature("WsStoreAccess:READ"), min_ver("1.02")] ListStores(ListStoresRequest, ListStoresResponse);
     ESPmethod [auth_feature("WsStoreAccess:FULL")] Delete(DeleteRequest, DeleteResponse);
diff --git a/esp/scm/ws_topology.ecm b/esp/scm/ws_topology.ecm
index e50acb6ffc3..a7e7e33c3cc 100644
--- a/esp/scm/ws_topology.ecm
+++ b/esp/scm/ws_topology.ecm
@@ -665,7 +665,7 @@ ESPresponse [exceptions_inline] TpListLogFilesResponse
     ESParray<ESPStruct LogFileStruct> Files;
 };
 
-ESPservice [auth_feature("DEFERRED"), noforms, version("1.32"), service_use_latest_version, cache_group("ESPWsTP"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsTopology
+ESPservice [auth_feature("DEFERRED"), noforms, version("1.32"), generated_client_version("0.0"), cache_group("ESPWsTP"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsTopology
 {
     ESPmethod [cache_seconds(180), cache_global(1), resp_xsl_default("/esp/xslt/targetclusters.xslt")] TpTargetClusterQuery(TpTargetClusterQueryRequest, TpTargetClusterQueryResponse);
     ESPmethod [cache_seconds(180), cache_global(1), resp_xsl_default("/esp/xslt/topology.xslt")] TpClusterQuery(TpClusterQueryRequest, TpClusterQueryResponse);
diff --git a/esp/scm/ws_workunits.ecm b/esp/scm/ws_workunits.ecm
index efa39304215..3a9b731ed57 100644
--- a/esp/scm/ws_workunits.ecm
+++ b/esp/scm/ws_workunits.ecm
@@ -25,7 +25,7 @@ EspInclude(ws_workunits_queryset_req_resp);
 
 ESPservice [
     auth_feature("DEFERRED"), //This declares that the method logic handles feature level authorization
-    version("2.00"), default_client_version("2.00"), service_use_latest_version, cache_group("ESPWsWUs"),
+    version("2.00"), default_client_version("2.00"), cache_group("ESPWsWUs"),
     noforms,exceptions_inline("./smc_xslt/exceptions.xslt"),use_method_name] WsWorkunits
 {
     ESPmethod [cache_seconds(60), resp_xsl_default("/esp/xslt/workunits.xslt")]     WUQuery(WUQueryRequest, WUQueryResponse);
diff --git a/testing/esp/esdlcmd/inputs/ws_baz.ecm b/testing/esp/esdlcmd/inputs/ws_baz.ecm
index 86918ddfa5b..c8625ec4d5a 100644
--- a/testing/esp/esdlcmd/inputs/ws_baz.ecm
+++ b/testing/esp/esdlcmd/inputs/ws_baz.ecm
@@ -13,7 +13,6 @@ ESPservice [
     auth_feature("DEFERRED"),
     version("1"),
     default_client_version("1"),
-    service_use_latest_version,
 ] WsBaz
 {
   ESPmethod BazSearch(BazSearchRequest, BazSearchResponse);
diff --git a/testing/esp/esdlcmd/inputs/ws_doublesvc.ecm b/testing/esp/esdlcmd/inputs/ws_doublesvc.ecm
index b7a9188cabe..a2e1d38838c 100644
--- a/testing/esp/esdlcmd/inputs/ws_doublesvc.ecm
+++ b/testing/esp/esdlcmd/inputs/ws_doublesvc.ecm
@@ -15,7 +15,6 @@ ESPservice [
     auth_feature("DEFERRED"),
     version("1"),
     default_client_version("1"),
-    service_use_latest_version,
 ] WsFoobar
 {
     ESPmethod FoobarSearch(FoobarSearchRequest, FoobarSearchResponse);
diff --git a/testing/esp/esdlcmd/inputs/ws_exc_test_1.ecm b/testing/esp/esdlcmd/inputs/ws_exc_test_1.ecm
index 3871e1a4dcf..fb156d79c53 100644
--- a/testing/esp/esdlcmd/inputs/ws_exc_test_1.ecm
+++ b/testing/esp/esdlcmd/inputs/ws_exc_test_1.ecm
@@ -42,7 +42,6 @@ ESPservice [
     auth_feature("DEFERRED"),
     version("1"),
     default_client_version("1"),
-    service_use_latest_version,
     exceptions_inline("./smc_xslt/exceptions.xslt"),
 ] WsExcTest1
 {
diff --git a/testing/esp/esdlcmd/inputs/ws_exc_test_2.ecm b/testing/esp/esdlcmd/inputs/ws_exc_test_2.ecm
index b7054cb02fc..c3f4791c7fd 100644
--- a/testing/esp/esdlcmd/inputs/ws_exc_test_2.ecm
+++ b/testing/esp/esdlcmd/inputs/ws_exc_test_2.ecm
@@ -42,7 +42,6 @@ ESPservice [
     auth_feature("DEFERRED"),
     version("1"),
     default_client_version("1"),
-    service_use_latest_version,
     http_exceptions_inline("./smc_xslt/exceptions.xslt"),
 ] WsExcTest2
 {
diff --git a/testing/esp/esdlcmd/inputs/ws_exc_test_3.ecm b/testing/esp/esdlcmd/inputs/ws_exc_test_3.ecm
index c92aeac9cba..8149acf64fe 100644
--- a/testing/esp/esdlcmd/inputs/ws_exc_test_3.ecm
+++ b/testing/esp/esdlcmd/inputs/ws_exc_test_3.ecm
@@ -45,7 +45,6 @@ ESPservice [
     auth_feature("DEFERRED"),
     version("1"),
     default_client_version("1"),
-    service_use_latest_version,
 ] WsExcTest3
 {
     ESPmethod SoapFaultExceptions(SoapFaultExceptionsRequest, SoapFaultExceptionsResponse);
diff --git a/testing/esp/esdlcmd/inputs/ws_foobar.ecm b/testing/esp/esdlcmd/inputs/ws_foobar.ecm
index 007310213cc..05e7ca30355 100644
--- a/testing/esp/esdlcmd/inputs/ws_foobar.ecm
+++ b/testing/esp/esdlcmd/inputs/ws_foobar.ecm
@@ -15,7 +15,6 @@ ESPservice [
     auth_feature("DEFERRED"),
     version("1"),
     default_client_version("1"),
-    service_use_latest_version,
 ] WsFoobar
 {
     ESPmethod FoobarSearch(FoobarSearchRequest, FoobarSearchResponse);
diff --git a/testing/esp/esdlcmd/inputs/ws_test.ecm b/testing/esp/esdlcmd/inputs/ws_test.ecm
index 52ae5519f52..be49eded231 100644
--- a/testing/esp/esdlcmd/inputs/ws_test.ecm
+++ b/testing/esp/esdlcmd/inputs/ws_test.ecm
@@ -44,7 +44,6 @@ ESPservice [
     auth_feature("DEFERRED"),
     version("1"),
     default_client_version("1"),
-    service_use_latest_version,
 ] WsTest
 {
     // should be present regardless of version filtering
diff --git a/testing/esp/esdlcmd/inputs/ws_usemethodname.ecm b/testing/esp/esdlcmd/inputs/ws_usemethodname.ecm
index ee5005f1d96..34c2172cdb0 100644
--- a/testing/esp/esdlcmd/inputs/ws_usemethodname.ecm
+++ b/testing/esp/esdlcmd/inputs/ws_usemethodname.ecm
@@ -25,7 +25,7 @@ ESPresponse OrangeResponse
   bool Peels;
 };
 
-ESPservice[version("1"), service_use_latest_version, use_method_name] WsUseMethodName
+ESPservice[version("1"), generated_client_version("0.0"), use_method_name] WsUseMethodName
 {
   ESPmethod Unique(FooRequest, FooResponse);
   ESPmethod Apple(FruitRequest, FruitResponse);
diff --git a/testing/esp/esdlcmd/inputs/ws_userequestname.ecm b/testing/esp/esdlcmd/inputs/ws_userequestname.ecm
index 1e58bffa8c7..064e117f442 100644
--- a/testing/esp/esdlcmd/inputs/ws_userequestname.ecm
+++ b/testing/esp/esdlcmd/inputs/ws_userequestname.ecm
@@ -25,7 +25,7 @@ ESPresponse OrangeResponse
   bool Peels;
 };
 
-ESPservice[version("1"), service_use_latest_version] WsUseRequestName
+ESPservice[version("1"), generated_client_version("0.0"),] WsUseRequestName
 {
   ESPmethod Unique(FooRequest, FooResponse);
   ESPmethod Apple(FruitRequest, FruitResponse);
diff --git a/tools/hidl/hidlcomp.cpp b/tools/hidl/hidlcomp.cpp
index 93042ebea82..37e22303ae6 100644
--- a/tools/hidl/hidlcomp.cpp
+++ b/tools/hidl/hidlcomp.cpp
@@ -4914,17 +4914,15 @@ void EspServInfo::write_esp_client_ipp()
     outs("\tIMPLEMENT_IINTERFACE;\n\n");
 
     outf("\tCClient%s()\n\t{\n", name_);
-    outs("\t\tsoap_reqid=0;\n\t");
-    outf("\t\tsoap_action.append(\"%s\");\n\t", name_);
-    const char *ver = getMetaString("default_client_version", NULL);
+    outs("\t\tsoap_reqid=0;\n");
+    outf("\t\tsoap_action.append(\"%s\");\n", name_);
+    // use latest 'version' unless 'generated_client_version' provided
+    const char *ver = getMetaString("generated_client_version", nullptr);
     if (!ver || !*ver)
-    {
-        if (hasMetaString("service_use_latest_version"))
-            ver = getMetaString("version", nullptr);
-    }
+        ver = getMetaString("version", nullptr);
     if (ver && *ver)
-        outf("\t\tsoap_action.append(\"?ver_=\").append(%s);\n\t", ver);
-    outf("}\n\tvirtual ~CClient%s(){}\n", name_);
+        outf("\t\tsoap_action.append(\"?ver_=\").append(%s);\n", ver);
+    outf("\t}\n\tvirtual ~CClient%s(){}\n", name_);
 
     outs("\tvirtual void setProxyAddress(const char *address)\n\t{\n\t\tsoap_proxy.set(address);\n\t}\n");
     outs("\tvirtual void addServiceUrl(const char *url)\n\t{\n\t\tsoap_url.set(url);\n\t}\n");
diff --git a/tools/hidl/hidlcomp.h b/tools/hidl/hidlcomp.h
index abd843fd251..a78c530223a 100644
--- a/tools/hidl/hidlcomp.h
+++ b/tools/hidl/hidlcomp.h
@@ -418,11 +418,6 @@ inline const char* getMetaConstId(MetaTagInfo *list, const char *tag, const char
     return (mti!=NULL) ? mti->getConstId() : def_val;
 }
 
-inline bool hasMetaString(MetaTagInfo *list, const char *tag)
-{
-    return findMetaTag(list, tag)!=nullptr;
-}
-
 // return: true if the ver tag is defined
 bool hasMetaVerInfo(MetaTagInfo *list, const char* tag);
 bool getMetaVerInfo(MetaTagInfo *list, const char* tag, StrBuffer& s);
@@ -1232,11 +1227,6 @@ class EspServInfo
         return ::getMetaInt(tags, tag, def_val);
     }
 
-    bool hasMetaString(const char *tag) const
-    {
-        return ::hasMetaString(tags, tag);
-    }
-
     void write_event_interface();
     void write_esp_interface();
     void write_client_interface();