diff --git a/client-runtime/pom.xml b/client-runtime/pom.xml
index 029c12e26022..a7c0b7441b02 100644
--- a/client-runtime/pom.xml
+++ b/client-runtime/pom.xml
@@ -105,11 +105,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-      </plugin>
-
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
diff --git a/client-runtime/src/main/java/com/microsoft/rest/RestClient.java b/client-runtime/src/main/java/com/microsoft/rest/RestClient.java
index ffc52643040d..e1a94ee6b7b4 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/RestClient.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/RestClient.java
@@ -10,16 +10,15 @@
 import com.microsoft.rest.credentials.ServiceClientCredentials;
 import com.microsoft.rest.retry.RetryHandler;
 import com.microsoft.rest.serializer.JacksonMapperAdapter;
-
-import java.net.CookieManager;
-import java.net.CookiePolicy;
-
 import okhttp3.Interceptor;
 import okhttp3.JavaNetCookieJar;
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
 
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+
 /**
  * An instance of this class stores the client information for making REST calls.
  */
@@ -92,7 +91,7 @@ public Retrofit retrofit() {
      * URL instead of the raw one might be returned.
      *
      * @return the base URL.
-     * @see {@link RestClient#setBaseUrl(String...)}
+     * @see RestClient#setBaseUrl(String...)
      */
     public String baseUrl() {
         return baseUrlHandler.baseUrl();
diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
index ef2f8cae9cfe..674b6a1bc625 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
@@ -20,6 +20,8 @@ public abstract class ServiceClient {
 
     /**
      * Initializes a new instance of the ServiceClient class.
+     *
+     * @param baseUrl the service endpoint
      */
     protected ServiceClient(String baseUrl) {
         this(new RestClient.Builder(baseUrl)
diff --git a/pom.xml b/pom.xml
index 98b38905b457..a6f30c1d67dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,28 +44,8 @@
 
   <repositories>
     <repository>
-      <id>azureoss-snapshots-pr</id>
-      <name>Azure Private Snapshots</name>
-      <url>http://azureoss.westus.cloudapp.azure.com:8080/nexus/content/repositories/snapshots-pr/</url>
-      <layout>default</layout>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>adx-snapshots</id>
-      <name>Azure ADX Snapshots</name>
-      <url>http://adxsnapshots.azurewebsites.net</url>
-      <layout>default</layout>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>oss-snapshots</id>
-      <name>Open Source Snapshots</name>
+      <id>ossrh</id>
+      <name>Sonatype Snapshots</name>
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
       <layout>default</layout>
       <snapshots>
@@ -77,12 +57,17 @@
 
   <distributionManagement>
     <snapshotRepository>
-      <id>adx-snapshots</id>
-      <name>Azure ADX Snapshots</name>
-      <url>ftp://waws-prod-bay-005.ftp.azurewebsites.windows.net/site/wwwroot</url>
+      <id>ossrh</id>
+      <name>Maven Central Snapshots</name>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
       <uniqueVersion>true</uniqueVersion>
       <layout>default</layout>
     </snapshotRepository>
+    <repository>
+      <id>ossrh</id>
+      <name>Maven Central</name>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
   </distributionManagement>
 
   <dependencyManagement>
@@ -201,12 +186,6 @@
 <br />*/</code>]]></bottom>
         </configuration>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.3</version>
-      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
@@ -238,7 +217,6 @@
             </environmentVariables>
           </configuration>
         </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>