diff --git a/Event/EventManager.php b/Event/EventManager.php
index cd38a3275..d2aab8c11 100644
--- a/Event/EventManager.php
+++ b/Event/EventManager.php
@@ -178,7 +178,7 @@ final class EventManager
     {
         if (isset($this->callbacks[$group])) {
             unset($this->callbacks[$group]);
-            $found = true;
+            return true;
         }
 
         return false;
@@ -197,7 +197,7 @@ final class EventManager
     {
         if (isset($this->groups[$group])) {
             unset($this->groups[$group]);
-            $found = true;
+            return true;
         }
 
         return false;
diff --git a/tests/Uri/UriFactoryTest.php b/tests/Uri/UriFactoryTest.php
index 583629b54..fcf98da43 100644
--- a/tests/Uri/UriFactoryTest.php
+++ b/tests/Uri/UriFactoryTest.php
@@ -48,7 +48,7 @@ class UriFactoryTest extends \PHPUnit\Framework\TestCase
         self::assertNull(UriFactory::getQuery('Valid'));
         self::assertEquals('query4', UriFactory::getQuery('/valid2'));
 
-        self::assertTrue(UriFactory::clean('*'));
+        UriFactory::clean('*');
         self::assertNull(UriFactory::getQuery('/valid2'));
 
         self::assertTrue(UriFactory::setQuery('/abc', 'query1'));
@@ -60,7 +60,7 @@ class UriFactoryTest extends \PHPUnit\Framework\TestCase
         self::assertNull(UriFactory::getQuery('/valid3'));
         self::assertEquals('query1', UriFactory::getQuery('/abc'));
 
-        self::assertTrue(UriFactory::clean('/'));
+        UriFactory::clean('/');
         self::assertNull(UriFactory::getQuery('/abc'));
     }