diff --git a/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceProvider.java b/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceProvider.java
index 955a657..5934939 100644
--- a/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceProvider.java
+++ b/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceProvider.java
@@ -78,8 +78,7 @@
         rpcRegistry.unregister(this);
 
         // shutdown all channels
-        channels.values().stream()
-            .forEach(ManagedChannel::shutdown);
+        channels.values().forEach(ManagedChannel::shutdown);
         // Should we wait for shutdown? How?
         channels.clear();
         log.info("Stopped");
diff --git a/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceServer.java b/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceServer.java
index 099ed20..260a709 100644
--- a/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceServer.java
+++ b/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceServer.java
@@ -143,8 +143,7 @@
             Thread.currentThread().interrupt();
         }
 
-        registeredProviders.stream()
-            .forEach(deviceProviderRegistry::unregister);
+        registeredProviders.forEach(deviceProviderRegistry::unregister);
 
         server.shutdown();
         // Should we wait for shutdown?