@@ -37,6 +37,7 @@
             <groupId>com.google.api</groupId>
             <artifactId>api-common</artifactId>
         </dependency>
+
         <dependency>
             <groupId>io.opencensus</groupId>
             <artifactId>opencensus-api</artifactId>
 
@@ -280,10 +280,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud-bigtable-stats</artifactId>
-    </dependency>
   </dependencies>
 
   <profiles>
 
@@ -377,11 +377,7 @@ public <RowT> UnaryCallable<Query, RowT> createReadRowCallable(RowAdapter<RowT>
    *   <li>Upon receiving the response stream, it will merge the {@link
    *       com.google.bigtable.v2.ReadRowsResponse.CellChunk}s in logical rows. The actual row
    *       implementation can be configured by the {@code rowAdapter} parameter.
-<<<<<<< HEAD
-   *   <li>Add bigtable tracer for tracking bigtable specific metrics.
-=======
    *   <li>Add BigtableTracer callable for tracking Bigtable specific metrics
->>>>>>> ca28be67 (feat: update tracers to use built in metrics)
    *   <li>Retry/resume on failure.
    *   <li>Filter out marker rows.
    * </ul>
 
@@ -301,11 +301,6 @@
                     </links>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
-            </plugin>
         </plugins>
     </build>