diff --git a/platformio/commands/upgrade.py b/platformio/commands/upgrade.py
index 98430483..ec4fe864 100644
--- a/platformio/commands/upgrade.py
+++ b/platformio/commands/upgrade.py
@@ -84,9 +84,7 @@ WARNING! Don't use `sudo` for the rest PlatformIO commands.
                 fg="yellow",
                 err=True)
             raise exception.ReturnErrorCode(1)
-        else:
-            raise exception.UpgradeError("\n".join(
-                [str(cmd), r['out'], r['err']]))
+        raise exception.UpgradeError("\n".join([str(cmd), r['out'], r['err']]))
 
     return True
 
diff --git a/platformio/managers/lib.py b/platformio/managers/lib.py
index eaea4412..3ca89d49 100644
--- a/platformio/managers/lib.py
+++ b/platformio/managers/lib.py
@@ -277,8 +277,7 @@ class LibraryManager(BasePkgManager):
         if not lib_info:
             if list(filters) == ["name"]:
                 raise exception.LibNotFound(filters['name'])
-            else:
-                raise exception.LibNotFound(str(filters))
+            raise exception.LibNotFound(str(filters))
         if not silent:
             click.echo("Found: %s" % click.style(
                 "https://platformio.org/lib/show/{id}/{name}".format(
diff --git a/platformio/managers/package.py b/platformio/managers/package.py
index 4026d3f4..05f330d2 100644
--- a/platformio/managers/package.py
+++ b/platformio/managers/package.py
@@ -481,7 +481,7 @@ class PkgInstallerMixin(object):
         if versions is None:
             util.internet_on(raise_exception=True)
             raise exception.UnknownPackage(name)
-        elif not pkgdata:
+        if not pkgdata:
             raise exception.UndefinedPackageVersion(requirements or "latest",
                                                     util.get_systype())
         return pkg_dir
diff --git a/platformio/util.py b/platformio/util.py
index 57c7b16e..62882353 100644
--- a/platformio/util.py
+++ b/platformio/util.py
@@ -643,10 +643,9 @@ def _get_api_result(
     except requests.exceptions.HTTPError as e:
         if result and "message" in result:
             raise exception.APIRequestError(result['message'])
-        elif result and "errors" in result:
+        if result and "errors" in result:
             raise exception.APIRequestError(result['errors'][0]['title'])
-        else:
-            raise exception.APIRequestError(e)
+        raise exception.APIRequestError(e)
     except ValueError:
         raise exception.APIRequestError(
             "Invalid response: %s" % r.text.encode("utf-8"))