diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/credentials/shared_key_credential.hpp b/sdk/tables/azure-data-tables/inc/azure/data/tables/credentials/shared_key_credential.hpp
index 0456f234f7..aae33b096e 100644
--- a/sdk/tables/azure-data-tables/inc/azure/data/tables/credentials/shared_key_credential.hpp
+++ b/sdk/tables/azure-data-tables/inc/azure/data/tables/credentials/shared_key_credential.hpp
@@ -69,7 +69,7 @@ namespace Azure { namespace Data { namespace Tables { namespace Credentials {
     std::string m_accountKey;
   };
 
-  namespace _internal {
+  namespace _detail {
     struct ConnectionStringParts
     {
       std::string AccountName;
@@ -80,6 +80,6 @@ namespace Azure { namespace Data { namespace Tables { namespace Credentials {
 
     ConnectionStringParts ParseConnectionString(const std::string& connectionString);
     std::string GetDefaultScopeForAudience(const std::string& audience);
-  } // namespace _internal
+  } // namespace _detail
 
 }}}} // namespace Azure::Data::Tables::Credentials
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp b/sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp
index e2d978d3c3..d34ee96bdb 100644
--- a/sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp
+++ b/sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp
@@ -278,14 +278,6 @@ namespace Azure { namespace Data { namespace Tables {
       std::vector<CorsRule> Cors;
     };
 
-    /**
-     * @brief Get Service Properties options.
-     *
-     */
-    struct GetServicePropertiesOptions final
-    {
-    };
-
     /**
      * @brief Set Service Properties options.
      *
@@ -383,14 +375,6 @@ namespace Azure { namespace Data { namespace Tables {
       Models::GeoReplication GeoReplication;
     };
 
-    /**
-     * @brief Get Service Statistics options.
-     *
-     */
-    struct GetServiceStatisticsOptions final
-    {
-    };
-
     /**
      * @brief Delete result.
      *
@@ -435,22 +419,6 @@ namespace Azure { namespace Data { namespace Tables {
       std::vector<SignedIdentifier> SignedIdentifiers;
     };
 
-    /**
-     * @brief Get Table Access Policy options.
-     *
-     */
-    struct GetTableAccessPolicyOptions final
-    {
-    };
-
-    /**
-     * @brief Set Table Access Policy options.
-     *
-     */
-    struct SetTableAccessPolicyOptions final
-    {
-    };
-
     /**
      * @brief Set Table Access Policy result.
      *
@@ -487,7 +455,7 @@ namespace Azure { namespace Data { namespace Tables {
      * @brief Upsert Kind
      *
      */
-    enum UpsertKind
+    enum class UpsertKind
     {
       Update,
       Merge,
@@ -594,14 +562,6 @@ namespace Azure { namespace Data { namespace Tables {
       std::string ETag;
     };
 
-    /**
-     * @brief Delete Entity options.
-     *
-     */
-    struct DeleteEntityOptions final
-    {
-    };
-
     /**
      * @brief Delete Entity result.
      *
@@ -717,7 +677,7 @@ namespace Azure { namespace Data { namespace Tables {
      * @brief Transaction Action
      *
      */
-    enum TransactionAction
+    enum class TransactionAction
     {
       InsertEntity = 32,
       DeleteEntity,
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/tables_clients.hpp b/sdk/tables/azure-data-tables/inc/azure/data/tables/tables_clients.hpp
index 75e9b0a19a..b556f1a7d5 100644
--- a/sdk/tables/azure-data-tables/inc/azure/data/tables/tables_clients.hpp
+++ b/sdk/tables/azure-data-tables/inc/azure/data/tables/tables_clients.hpp
@@ -210,25 +210,20 @@ namespace Azure { namespace Data { namespace Tables {
     /**
      * @brief Get table access policy.
      *
-     * @param options Optional parameters to execute this function.
      * @param context for canceling long running operations.
      * @return Get access policy result.
      */
-    Response<Models::TableAccessPolicy> GetAccessPolicy(
-        Models::GetTableAccessPolicyOptions const& options = {},
-        Core::Context const& context = {});
+    Response<Models::TableAccessPolicy> GetAccessPolicy(Core::Context const& context = {});
 
     /**
      * @brief Set table access policy.
      *
      * @param tableAccessPolicy The TableAccessPolicy to set.
-     * @param options Optional parameters to execute this function.
      * @param context for canceling long running operations.
      * @return Set access policy result.
      */
     Response<Models::SetTableAccessPolicyResult> SetAccessPolicy(
         Models::TableAccessPolicy const& tableAccessPolicy,
-        Models::SetTableAccessPolicyOptions const& options = {},
         Core::Context const& context = {});
 
     /**
@@ -274,13 +269,11 @@ namespace Azure { namespace Data { namespace Tables {
      * @brief Delete table entity.
      *
      * @param tableEntity The TableEntity to delete.
-     * @param options Optional parameters to execute this function.
      * @param context for canceling long running operations.
      * @return Delete entity result.
      */
     Response<Models::DeleteEntityResult> DeleteEntity(
         Models::TableEntity const& tableEntity,
-        Models::DeleteEntityOptions const& options = {},
         Core::Context const& context = {});
 
     /**
@@ -420,24 +413,19 @@ namespace Azure { namespace Data { namespace Tables {
     /**
      * @brief Get service properties
      *
-     * @param options Optional parameters to execute this function.
      * @param context for canceling long running operations.
      * @return Get service properties result.
      */
     Response<Models::TableServiceProperties> GetServiceProperties(
-        Models::GetServicePropertiesOptions const& options = {},
         Core::Context const& context = {});
 
     /**
      * @brief Get service statistics
      *
-     * @param options Optional parameters to execute this function.
      * @param context for canceling long running operations.
      * @return Get service statistics result.
      */
-    Response<Models::ServiceStatistics> GetStatistics(
-        Models::GetServiceStatisticsOptions const& options = {},
-        Core::Context const& context = {});
+    Response<Models::ServiceStatistics> GetStatistics(Core::Context const& context = {});
 
     /**
      * @brief Pre flight check
diff --git a/sdk/tables/azure-data-tables/src/credentials/shared_key_credential.cpp b/sdk/tables/azure-data-tables/src/credentials/shared_key_credential.cpp
index 3c5bf56751..7304b35f37 100644
--- a/sdk/tables/azure-data-tables/src/credentials/shared_key_credential.cpp
+++ b/sdk/tables/azure-data-tables/src/credentials/shared_key_credential.cpp
@@ -5,7 +5,7 @@
 
 #include <algorithm>
 
-namespace Azure { namespace Data { namespace Tables { namespace Credentials { namespace _internal {
+namespace Azure { namespace Data { namespace Tables { namespace Credentials { namespace _detail {
 
   ConnectionStringParts ParseConnectionString(const std::string& connectionString)
   {
@@ -97,4 +97,4 @@ namespace Azure { namespace Data { namespace Tables { namespace Credentials { na
     }
     return audience + "/.default";
   }
-}}}}} // namespace Azure::Data::Tables::Credentials::_internal
+}}}}} // namespace Azure::Data::Tables::Credentials::_detail
diff --git a/sdk/tables/azure-data-tables/src/tables_clients.cpp b/sdk/tables/azure-data-tables/src/tables_clients.cpp
index fc4e55f40b..b4a2aaf762 100644
--- a/sdk/tables/azure-data-tables/src/tables_clients.cpp
+++ b/sdk/tables/azure-data-tables/src/tables_clients.cpp
@@ -15,7 +15,7 @@
 using namespace Azure::Data::Tables;
 using namespace Azure::Data::Tables::_detail::Policies;
 using namespace Azure::Data::Tables::_detail::Xml;
-using namespace Azure::Data::Tables::Credentials::_internal;
+using namespace Azure::Data::Tables::Credentials::_detail;
 using namespace Azure::Data::Tables::_detail;
 
 TableServicesClient::TableServicesClient(const TableClientOptions& options)
@@ -204,10 +204,8 @@ Azure::Response<Models::SetServicePropertiesResult> TableServicesClient::SetServ
 }
 
 Azure::Response<Models::TableServiceProperties> TableServicesClient::GetServiceProperties(
-    Models::GetServicePropertiesOptions const& options,
     Core::Context const& context)
 {
-  (void)options;
   auto url = m_url;
   url.AppendQueryParameter("restype", "service");
   url.AppendQueryParameter("comp", "properties");
@@ -229,10 +227,8 @@ Azure::Response<Models::TableServiceProperties> TableServicesClient::GetServiceP
 }
 
 Azure::Response<Models::ServiceStatistics> TableServicesClient::GetStatistics(
-    Models::GetServiceStatisticsOptions const& options,
     const Core::Context& context)
 {
-  (void)options;
   auto url = m_url;
   std::string host = url.GetHost();
   std::string accountName = host.substr(0, host.find('.'));
@@ -541,14 +537,12 @@ Models::ListTablesPagedResponse TableServicesClient::ListTables(
 
 Azure::Response<Models::SetTableAccessPolicyResult> TableClient::SetAccessPolicy(
     Models::TableAccessPolicy const& tableAccessPolicy,
-    Models::SetTableAccessPolicyOptions const& options,
     Core::Context const& context)
 
 {
   auto url = m_url;
   url.AppendPath(m_tableName);
   url.AppendQueryParameter("comp", "acl");
-  (void)options;
   std::string xmlBody = Serializers::SetAccessPolicy(tableAccessPolicy);
   Core::IO::MemoryBodyStream requestBody(
       reinterpret_cast<const uint8_t*>(xmlBody.data()), xmlBody.length());
@@ -569,10 +563,8 @@ Azure::Response<Models::SetTableAccessPolicyResult> TableClient::SetAccessPolicy
 }
 
 Azure::Response<Models::TableAccessPolicy> TableClient::GetAccessPolicy(
-    Models::GetTableAccessPolicyOptions const& options,
     Core::Context const& context)
 {
-  (void)options;
   auto url = m_url;
   url.SetPath("");
   url.AppendPath(m_tableName);
@@ -748,10 +740,8 @@ Azure::Response<Models::MergeEntityResult> TableClient::MergeEntity(
 
 Azure::Response<Models::DeleteEntityResult> TableClient::DeleteEntity(
     Models::TableEntity const& tableEntity,
-    Models::DeleteEntityOptions const& options,
     Core::Context const& context)
 {
-  (void)options;
   auto url = m_url;
   url.AppendPath(
       m_tableName + "(PartitionKey='" + tableEntity.PartitionKey + "',RowKey='" + tableEntity.RowKey
diff --git a/sdk/tables/azure-data-tables/test/ut/shared_key_lite_policy_test.cpp b/sdk/tables/azure-data-tables/test/ut/shared_key_lite_policy_test.cpp
index aa730f5876..c7bdb0d178 100644
--- a/sdk/tables/azure-data-tables/test/ut/shared_key_lite_policy_test.cpp
+++ b/sdk/tables/azure-data-tables/test/ut/shared_key_lite_policy_test.cpp
@@ -14,7 +14,7 @@
 using namespace Azure::Core::Http::Policies;
 using namespace Azure::Data::Tables::_detail::Policies;
 using namespace Azure::Data::Tables::Credentials;
-using namespace Azure::Data::Tables::Credentials::_internal;
+using namespace Azure::Data::Tables::Credentials::_detail;
 namespace Azure { namespace Data { namespace Tables { namespace _internal { namespace Policies {
   namespace Test {
 
diff --git a/sdk/tables/azure-data-tables/test/ut/table_client_test.cpp b/sdk/tables/azure-data-tables/test/ut/table_client_test.cpp
index a6b25d573a..71dab0e007 100644
--- a/sdk/tables/azure-data-tables/test/ut/table_client_test.cpp
+++ b/sdk/tables/azure-data-tables/test/ut/table_client_test.cpp
@@ -223,9 +223,7 @@ namespace Azure { namespace Data { namespace Test {
     }
     else
     {
-      Azure::Data::Tables::Models::GetServicePropertiesOptions getOptions;
-
-      auto response = m_tableServiceClient->GetServiceProperties(getOptions);
+      auto response = m_tableServiceClient->GetServiceProperties();
       EXPECT_EQ(response.Value.Logging.RetentionPolicyDefinition.IsEnabled, false);
       EXPECT_EQ(response.Value.Logging.Version, "1.0");
       EXPECT_EQ(response.Value.Logging.Delete, false);
@@ -241,10 +239,7 @@ namespace Azure { namespace Data { namespace Test {
 
   TEST_P(TablesClientTest, ServiceClientSet_LIVEONLY_)
   {
-
-    Azure::Data::Tables::Models::GetServicePropertiesOptions getOptions;
-
-    auto response = m_tableServiceClient->GetServiceProperties(getOptions);
+    auto response = m_tableServiceClient->GetServiceProperties();
 
     Azure::Data::Tables::Models::SetServicePropertiesOptions setOptions;
     setOptions.ServiceProperties = std::move(response.Value);
@@ -254,9 +249,7 @@ namespace Azure { namespace Data { namespace Test {
 
   TEST_P(TablesClientTest, ServiceClientStatistics_LIVEONLY_)
   {
-    Azure::Data::Tables::Models::GetServiceStatisticsOptions statsOptions;
-
-    auto response = m_tableServiceClient->GetStatistics(statsOptions);
+    auto response = m_tableServiceClient->GetStatistics();
 
     EXPECT_EQ(response.RawResponse->GetStatusCode(), Azure::Core::Http::HttpStatusCode::Ok);
     EXPECT_EQ(response.Value.GeoReplication.Status.ToString(), "live");
diff --git a/sdk/tables/azure-data-tables/test/ut/table_client_test.hpp b/sdk/tables/azure-data-tables/test/ut/table_client_test.hpp
index 9129975d70..e8bee67e70 100644
--- a/sdk/tables/azure-data-tables/test/ut/table_client_test.hpp
+++ b/sdk/tables/azure-data-tables/test/ut/table_client_test.hpp
@@ -44,15 +44,13 @@ namespace Azure { namespace Data { namespace Test {
 
     std::string GetAccountName()
     {
-      return Azure::Data::Tables::Credentials::_internal::ParseConnectionString(
-                 GetConnectionString())
+      return Azure::Data::Tables::Credentials::_detail::ParseConnectionString(GetConnectionString())
           .AccountName;
     }
 
     std::string GetAccountKey()
     {
-      return Azure::Data::Tables::Credentials::_internal::ParseConnectionString(
-                 GetConnectionString())
+      return Azure::Data::Tables::Credentials::_detail::ParseConnectionString(GetConnectionString())
           .AccountKey;
     }