diff --git a/src/Task/Composer.php b/src/Task/Composer.php
index fcad6bd13..fff4de22d 100644
--- a/src/Task/Composer.php
+++ b/src/Task/Composer.php
@@ -34,35 +34,37 @@ public static function cleanup(
     ) {
         $composer = $event->getComposer();
         $extra = $composer->getPackage()->getExtra();
-        $servicesToKeep = isset($extra['google/apiclient-services'])
-            ? $extra['google/apiclient-services']
-            : [];
-        if ($servicesToKeep) {
-            $vendorDir = $composer->getConfig()->get('vendor-dir');
+        $servicesToKeep = $extra['google/apiclient-services'] ?? [];
+        if (empty($servicesToKeep)) {
+            return;
+        }
+        $vendorDir = $composer->getConfig()->get('vendor-dir');
+        $serviceDir = sprintf(
+            '%s/google/apiclient-services/src/Google/Service',
+            $vendorDir
+        );
+        if (!is_dir($serviceDir)) {
+            // path for google/apiclient-services >= 0.200.0
             $serviceDir = sprintf(
-                '%s/google/apiclient-services/src/Google/Service',
+                '%s/google/apiclient-services/src',
                 $vendorDir
             );
-            if (!is_dir($serviceDir)) {
-                // path for google/apiclient-services >= 0.200.0
-                $serviceDir = sprintf(
-                    '%s/google/apiclient-services/src',
-                    $vendorDir
-                );
-            }
-            self::verifyServicesToKeep($serviceDir, $servicesToKeep);
-            $finder = self::getServicesToRemove($serviceDir, $servicesToKeep);
-            $filesystem = $filesystem ?: new Filesystem();
-            if (0 !== $count = count($finder)) {
-                $event->getIO()->write(
-                    sprintf('Removing %s google services', $count)
-                );
-                foreach ($finder as $file) {
-                    $realpath = $file->getRealPath();
-                    $filesystem->remove($realpath);
-                    $filesystem->remove($realpath . '.php');
-                }
-            }
+        }
+        self::verifyServicesToKeep($serviceDir, $servicesToKeep);
+        $finder = self::getServicesToRemove($serviceDir, $servicesToKeep);
+        $filesystem = $filesystem ?: new Filesystem();
+        $servicesToRemoveCount = $finder->count();
+        if (0 === $servicesToRemoveCount) {
+            return;
+        }
+        $event->getIO()->write(
+            sprintf('Removing %d google services', $servicesToRemoveCount)
+        );
+        $pathsToRemove = iterator_to_array($finder);
+        foreach ($pathsToRemove as $pathToRemove) {
+            $realpath = $pathToRemove->getRealPath();
+            $filesystem->remove($realpath);
+            $filesystem->remove($realpath . '.php');
         }
     }