diff --git a/src/Forum/Controller/ResetPasswordController.php b/src/Forum/Controller/ResetPasswordController.php
index 2f3b025e2..3752ead21 100644
--- a/src/Forum/Controller/ResetPasswordController.php
+++ b/src/Forum/Controller/ResetPasswordController.php
@@ -27,7 +27,6 @@ class ResetPasswordController extends AbstractHtmlController
 
     /**
      * @param Factory $view
-     * @param TranslatorInterface $translator
      */
     public function __construct(Factory $view)
     {
diff --git a/src/Forum/Controller/SavePasswordController.php b/src/Forum/Controller/SavePasswordController.php
index 0a1a25400..ea3257062 100644
--- a/src/Forum/Controller/SavePasswordController.php
+++ b/src/Forum/Controller/SavePasswordController.php
@@ -17,7 +17,7 @@ use Flarum\Http\UrlGenerator;
 use Flarum\User\PasswordToken;
 use Flarum\User\UserValidator;
 use Illuminate\Contracts\Validation\Factory;
-use Illuminate\Contracts\Validation\ValidationException;
+use Illuminate\Validation\ValidationException;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Zend\Diactoros\Response\RedirectResponse;
 
diff --git a/src/Forum/ForumServiceProvider.php b/src/Forum/ForumServiceProvider.php
index 8e95b0072..f0a68d342 100644
--- a/src/Forum/ForumServiceProvider.php
+++ b/src/Forum/ForumServiceProvider.php
@@ -27,6 +27,7 @@ use Flarum\Http\Middleware\StartSession;
 use Flarum\Http\RouteCollection;
 use Flarum\Http\RouteHandlerFactory;
 use Flarum\Http\UrlGenerator;
+use Flarum\Settings\Event\Saved;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Zend\Stratigility\MiddlewarePipe;
diff --git a/src/Foundation/AbstractValidator.php b/src/Foundation/AbstractValidator.php
index ee1062af5..25108526f 100644
--- a/src/Foundation/AbstractValidator.php
+++ b/src/Foundation/AbstractValidator.php
@@ -13,8 +13,8 @@ namespace Flarum\Foundation;
 
 use Flarum\Foundation\Event\Validating;
 use Illuminate\Contracts\Events\Dispatcher;
-use Illuminate\Contracts\Validation\ValidationException;
 use Illuminate\Validation\Factory;
+use Illuminate\Validation\ValidationException;
 use Symfony\Component\Translation\TranslatorInterface;
 
 abstract class AbstractValidator
diff --git a/src/User/User.php b/src/User/User.php
index 577ab1dcb..7c02c882d 100755
--- a/src/User/User.php
+++ b/src/User/User.php
@@ -16,7 +16,6 @@ use Flarum\Database\AbstractModel;
 use Flarum\Database\ScopeVisibilityTrait;
 use Flarum\Event\ConfigureUserPreferences;
 use Flarum\Event\GetDisplayName;
-use Flarum\Event\PostWasDeleted;
 use Flarum\Event\PrepareUserGroups;
 use Flarum\Foundation\Application;
 use Flarum\Foundation\EventGeneratorTrait;
diff --git a/src/User/UserServiceProvider.php b/src/User/UserServiceProvider.php
index dc7774e2e..03f3cbf55 100644
--- a/src/User/UserServiceProvider.php
+++ b/src/User/UserServiceProvider.php
@@ -15,6 +15,7 @@ use Flarum\Event\ConfigureUserPreferences;
 use Flarum\Event\GetPermission;
 use Flarum\Foundation\AbstractServiceProvider;
 use Illuminate\Contracts\Container\Container;
+use RuntimeException;
 
 class UserServiceProvider extends AbstractServiceProvider
 {