diff --git a/samples/integration/vcpkg-all-smoke/src/main.cpp b/samples/integration/vcpkg-all-smoke/src/main.cpp
index 6b2d73099..b94d0427b 100644
--- a/samples/integration/vcpkg-all-smoke/src/main.cpp
+++ b/samples/integration/vcpkg-all-smoke/src/main.cpp
@@ -8,7 +8,6 @@
 
 #include <azure/attestation.hpp>
 #include <azure/core.hpp>
-#include <azure/core/internal/json/json.hpp>
 #include <azure/identity.hpp>
 #include <azure/keyvault/certificates.hpp>
 #include <azure/keyvault/keys.hpp>
diff --git a/sdk/attestation/azure-security-attestation/samples/policy/reset_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/reset_policy.cpp
index 697b274ea..cd4e3deb9 100644
--- a/sdk/attestation/azure-security-attestation/samples/policy/reset_policy.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/policy/reset_policy.cpp
@@ -17,9 +17,6 @@
  */
 
 #include <azure/attestation.hpp>
-#include <azure/core/base64.hpp>
-#include <azure/core/cryptography/hash.hpp>
-#include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/identity.hpp>
 
 #include <chrono>
@@ -34,7 +31,6 @@ using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace std::chrono_literals;
 using namespace Azure::Core;
-using namespace Azure::Core::Cryptography::_internal;
 
 int main()
 {
diff --git a/sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp
index d89728c2f..fa358a799 100644
--- a/sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp
@@ -20,9 +20,6 @@
 #include "cryptohelpers.hpp"
 
 #include <azure/attestation.hpp>
-#include <azure/core/base64.hpp>
-#include <azure/core/cryptography/hash.hpp>
-#include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/identity.hpp>
 
 #include <chrono>
@@ -37,7 +34,6 @@ using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace std::chrono_literals;
 using namespace Azure::Core;
-using namespace Azure::Core::Cryptography::_internal;
 
 int main()
 {
diff --git a/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp
index ef7a4117d..2f91c54c1 100644
--- a/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp
@@ -29,7 +29,7 @@
 #include <thread>
 #include <vector>
 
-// cspell:: words mrsigner mrenclave mitm
+// cspell: words mrsigner mitm
 using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace std::chrono_literals;
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events.cpp b/sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events.cpp
index 555fa5caf..bad759592 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events.cpp
+++ b/sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events.cpp
@@ -11,13 +11,8 @@
 // Both of these should be available from the Azure portal.
 //
 
-#include <azure/core/diagnostics/logger.hpp>
-#include <azure/core/internal/diagnostics/log.hpp>
 #include <azure/messaging/eventhubs.hpp>
 
-using namespace Azure::Core::Diagnostics;
-using namespace Azure::Core::Diagnostics::_internal;
-
 #include <iostream>
 
 int main()
@@ -43,7 +38,6 @@ int main()
   // Retrieve properties about the EventHubs instance just created.
   auto eventhubProperties{consumerClient.GetEventHubProperties()};
   std::cout << "Created event hub, properties: " << eventhubProperties << std::endl;
-  Log::Stream(Logger::Level::Verbose) << "Created event hub, properties: " << eventhubProperties;
 
   // Retrieve properties about the EventHubs instance just created.
   auto partitionProperties{
@@ -57,16 +51,14 @@ int main()
   partitionClientOptions.StartPosition.Earliest = true;
   partitionClientOptions.StartPosition.Inclusive = true;
 
-  Log::Stream(Logger::Level::Verbose)
-      << "Creating partition client. Start position: " << partitionClientOptions.StartPosition;
-  Log::Stream(Logger::Level::Verbose)
-      << "Creating partition client. Start position: " << partitionClientOptions.StartPosition;
+  std::cout << "Creating partition client. Start position: "
+            << partitionClientOptions.StartPosition;
 
-  Log::Stream(Logger::Level::Verbose) << "earliest: HasValue: " << std::boolalpha
-                                      << partitionClientOptions.StartPosition.Earliest.HasValue();
+  std::cout << "earliest: HasValue: " << std::boolalpha
+            << partitionClientOptions.StartPosition.Earliest.HasValue();
   if (partitionClientOptions.StartPosition.Earliest.HasValue())
   {
-    std::cerr << "earliest: Value: " << std::boolalpha
+    std::cout << "earliest: Value: " << std::boolalpha
               << partitionClientOptions.StartPosition.Earliest.Value() << std::endl;
   }