clean up comments and code
diff --git a/samza-api/src/main/java/org/apache/samza/system/SystemFactory.java b/samza-api/src/main/java/org/apache/samza/system/SystemFactory.java
index d6cca62..c17b281 100644
--- a/samza-api/src/main/java/org/apache/samza/system/SystemFactory.java
+++ b/samza-api/src/main/java/org/apache/samza/system/SystemFactory.java
@@ -27,15 +27,19 @@
  * a particular system, as well as the accompanying {@link org.apache.samza.system.SystemAdmin}.
  */
 public interface SystemFactory {
+  @Deprecated
   SystemConsumer getConsumer(String systemName, Config config, MetricsRegistry registry);
 
+  @Deprecated
   SystemProducer getProducer(String systemName, Config config, MetricsRegistry registry);
 
+  @Deprecated
   SystemAdmin getAdmin(String systemName, Config config);
 
   /**
    * This function provides an extra input parameter than {@link #getConsumer}, which can be used to provide extra
-   * information e.g. ownership of client instance
+   * information e.g. ownership of client instance, to helper better identify consumers in logs,
+   * threads and client instances etc., along with other relevant information like systemName
    *
    * @param systemName The name of the system to create consumer for.
    * @param config The config to create consumer with.
@@ -49,7 +53,8 @@
 
   /**
    * This function provides an extra input parameter than {@link #getProducer}, which can be used to provide extra
-   * information e.g. ownership of client instance
+   * information e.g. ownership of client instance, to helper better identify producers in logs,
+   * threads and client instances etc., along with other relevant information like systemName
    *
    * @param systemName The name of the system to create producer for.
    * @param config The config to create producer with.
@@ -62,13 +67,14 @@
   }
 
   /**
-   *This function provides an extra input parameter than {@link #getAdmin}, which can be used to provide extra
-   * information e.g. ownership of client instance
+   * This function provides an extra input parameter than {@link #getAdmin}, which can be used to provide extra
+   * information e.g. ownership of client instance, to helper better identify admins in logs,
+   * threads and client instances etc., along with other relevant information like systemName
    *
    * @param systemName The name of the system to create admin for.
    * @param config The config to create admin with.
    * @param adminLabel a string used to provide info the admin instance.
-   * @return A SystemAmind
+   * @return A SystemAdmin
    */
   default SystemAdmin getAdmin(String systemName, Config config, String adminLabel) {
     return getAdmin(systemName, config);
diff --git a/samza-core/src/main/java/org/apache/samza/util/DiagnosticsUtil.java b/samza-core/src/main/java/org/apache/samza/util/DiagnosticsUtil.java
index 3a0c017..6fa4388 100644
--- a/samza-core/src/main/java/org/apache/samza/util/DiagnosticsUtil.java
+++ b/samza-core/src/main/java/org/apache/samza/util/DiagnosticsUtil.java
@@ -19,7 +19,6 @@
 package org.apache.samza.util;
 
 import java.io.File;
-import java.lang.invoke.MethodHandles;
 import java.time.Duration;
 import java.util.Optional;
 import org.apache.commons.lang3.tuple.ImmutablePair;