diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 8f1c71121..469502d0e 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -12,6 +12,7 @@ use App\Http\Controllers\Admin\AdminMediaController;
 use App\Http\Controllers\Admin\AdminReportController;
 use App\Http\Controllers\Admin\AdminSettingsController;
 use App\Http\Controllers\Admin\AdminUserController;
+use App\Http\Resources\AdminProfile;
 use App\Instance;
 use App\Jobs\AdminPipeline\AdminProfileActionPipeline;
 use App\Mail\AdminMessageResponse;
diff --git a/app/Http/Controllers/Api/ApiV2Controller.php b/app/Http/Controllers/Api/ApiV2Controller.php
index 900a2611c..54c5c504f 100644
--- a/app/Http/Controllers/Api/ApiV2Controller.php
+++ b/app/Http/Controllers/Api/ApiV2Controller.php
@@ -8,10 +8,15 @@ use App\Jobs\MediaPipeline\MediaDeletePipeline;
 use App\Jobs\VideoPipeline\VideoThumbnail;
 use App\Media;
 use App\Services\AccountService;
+use App\Services\FollowerService;
 use App\Services\InstanceService;
+use App\Services\LikeService;
 use App\Services\MediaBlocklistService;
 use App\Services\MediaPathService;
+use App\Services\ReblogService;
 use App\Services\SearchApiV2Service;
+use App\Services\StatusService;
+use App\Services\UserFilterService;
 use App\Services\UserRoleService;
 use App\Services\UserStorageService;
 use App\Transformer\Api\Mastodon\v1\MediaTransformer;
@@ -21,6 +26,7 @@ use App\Util\Media\Filter;
 use App\Util\Site\Nodeinfo;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 46c870cef..4442006cc 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -11,6 +11,7 @@ use Illuminate\Auth\Events\Registered;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
index 9efe36296..565a9fde9 100644
--- a/app/Http/Controllers/CommentController.php
+++ b/app/Http/Controllers/CommentController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Jobs\CommentPipeline\CommentPipeline;
 use App\Jobs\StatusPipeline\NewStatusPipeline;
 use App\Profile;
+use App\Services\FollowerService;
 use App\Services\StatusService;
 use App\Status;
 use App\Transformer\Api\StatusTransformer;
diff --git a/app/Http/Controllers/Import/Instagram.php b/app/Http/Controllers/Import/Instagram.php
index 1cbfa9c31..2d1707f1d 100644
--- a/app/Http/Controllers/Import/Instagram.php
+++ b/app/Http/Controllers/Import/Instagram.php
@@ -8,6 +8,7 @@ use App\Jobs\ImportPipeline\ImportInstagram;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 
 trait Instagram
diff --git a/app/Http/Controllers/ImportPostController.php b/app/Http/Controllers/ImportPostController.php
index 283079bb9..95234bdce 100644
--- a/app/Http/Controllers/ImportPostController.php
+++ b/app/Http/Controllers/ImportPostController.php
@@ -8,6 +8,7 @@ use App\Models\ImportPost;
 use App\Services\ImportService;
 use App\User;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 
 class ImportPostController extends Controller
 {
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 33e84797f..99af6cf93 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -10,6 +10,7 @@ use App\Http\Controllers\Settings\RelationshipSettings;
 use App\Http\Controllers\Settings\SecuritySettings;
 use App\Jobs\DeletePipeline\DeleteAccountPipeline;
 use App\Jobs\MediaPipeline\MediaSyncLicensePipeline;
+use App\OauthClient;
 use App\ProfileSponsor;
 use App\Services\AccountService;
 use App\UserSetting;
@@ -18,6 +19,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cookie;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Str;
 
diff --git a/app/Http/Controllers/Stories/StoryApiV1Controller.php b/app/Http/Controllers/Stories/StoryApiV1Controller.php
index 79aaf3305..4ceb96484 100644
--- a/app/Http/Controllers/Stories/StoryApiV1Controller.php
+++ b/app/Http/Controllers/Stories/StoryApiV1Controller.php
@@ -23,6 +23,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Controllers/TimelineController.php b/app/Http/Controllers/TimelineController.php
index c4b219f3b..b16101e90 100644
--- a/app/Http/Controllers/TimelineController.php
+++ b/app/Http/Controllers/TimelineController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Profile;
 use App\Status;
-use App\Transformer\Api\StatusTimelineTransformer;
+use App\Transformer\Api\StatusTransformer;
 use App\UserFilter;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -136,7 +136,7 @@ class TimelineController extends Controller
                 ->simplePaginate($limit);
         }
 
-        $fractal = new Fractal\Resource\Collection($timeline, new StatusTimelineTransformer);
+        $fractal = new Fractal\Resource\Collection($timeline, new StatusTransformer);
         $res = $this->fractal->createData($fractal)->toArray();
 
         return response()->json($res, 200, [], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
diff --git a/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php b/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php
index 3796d705f..538dc8a2c 100644
--- a/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php
+++ b/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php
@@ -12,6 +12,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Queue\Middleware\ThrottlesExceptionsWithRedis;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 
diff --git a/app/Models/CustomFilter.php b/app/Models/CustomFilter.php
index 98e2d9edc..67f8bc197 100644
--- a/app/Models/CustomFilter.php
+++ b/app/Models/CustomFilter.php
@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Profile;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Log;
 
 class CustomFilter extends Model
 {
diff --git a/app/Services/ActivityPubDeliveryService.php b/app/Services/ActivityPubDeliveryService.php
index 624a80e18..e095f5f43 100644
--- a/app/Services/ActivityPubDeliveryService.php
+++ b/app/Services/ActivityPubDeliveryService.php
@@ -4,6 +4,7 @@ namespace App\Services;
 
 use App\Util\ActivityPub\Helpers;
 use App\Util\ActivityPub\HttpSignature;
+use Illuminate\Support\Facades\Log;
 
 class ActivityPubDeliveryService
 {