diff --git a/SceneManager/SceneManager.csproj b/SceneManager/SceneManager.csproj
index 9c579ae..08c9382 100644
--- a/SceneManager/SceneManager.csproj
+++ b/SceneManager/SceneManager.csproj
@@ -51,11 +51,11 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AITasking.cs" />
+    <Compile Include="CollectedVehicle.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="Object Classes\Barrier.cs" />
     <Compile Include="Hints.cs" />
     <Compile Include="Menus\BarrierMenu.cs" />
-    <Compile Include="Object Classes\CollectedVehicle.cs" />
     <Compile Include="Menus\EditPathMenu.cs" />
     <Compile Include="Menus\EditWaypointMenu.cs" />
     <Compile Include="EntryPoint.cs" />
@@ -68,7 +68,6 @@
     <Compile Include="Menus\PathMainMenu.cs" />
     <Compile Include="Menus\SettingsMenu.cs" />
     <Compile Include="Settings.cs" />
-    <Compile Include="VehicleCollector.cs" />
     <Compile Include="Object Classes\Waypoint.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/SceneManager/VehicleCollector.cs b/SceneManager/VehicleCollector.cs
deleted file mode 100644
index 50893d1..0000000
--- a/SceneManager/VehicleCollector.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using Rage;
-
-namespace SceneManager
-{
-    internal static class VehicleCollector
-    {
-        internal static List<CollectedVehicle> collectedVehicles = new List<CollectedVehicle>();
-
-        internal static void StartCollectingAtWaypoint(List<Path> paths, Path path, Waypoint waypoint)
-        {
-            LoopForVehiclesToBeDismissed(paths, path);
-
-            while (paths.Contains(path) && path.Waypoints.Contains(waypoint))
-            {
-                if (path.IsEnabled && waypoint.IsCollector)
-                {
-                    LoopForNearbyValidVehicles(path, waypoint);
-                }
-
-                var collectedVehiclePlayerIsIn = collectedVehicles.Where(x => x.Vehicle == Game.LocalPlayer.Character.CurrentVehicle).FirstOrDefault();
-                if (collectedVehiclePlayerIsIn != null)
-                {
-                    collectedVehiclePlayerIsIn.Dismiss(DismissOption.FromPlayer);
-                    Logger.Log($"Dismissed a collected vehicle the player was in.");
-                }
-                GameFiber.Sleep(100);
-            }
-        }
-
-        private static void LoopForVehiclesToBeDismissed(List<Path> paths, Path path)
-        {
-            GameFiber.StartNew(() =>
-            {
-                while (paths.Contains(path))
-                {
-                    //Logger.Log($"Dismissing unused vehicles for cleanup");
-                    foreach (CollectedVehicle cv in collectedVehicles.Where(cv => cv.Vehicle))
-                    {
-                        if (!cv.Vehicle.IsDriveable || cv.Vehicle.IsUpsideDown || !cv.Vehicle.HasDriver)
-                        {
-                            if (cv.Vehicle.HasDriver)
-                            {
-                                cv.Vehicle.Driver.Dismiss();
-                            }
-                            cv.Vehicle.Dismiss();
-                        }
-                    }
-
-                    collectedVehicles.RemoveAll(cv => !cv.Vehicle);
-                    GameFiber.Sleep(60000);
-                }
-            });
-        }
-
-        private static void LoopForNearbyValidVehicles(Path path, Waypoint waypoint)
-        {
-            foreach (Vehicle vehicle in GetNearbyVehiclesForCollection(waypoint.Position, waypoint.CollectorRadius))
-            {
-                if (!vehicle)
-                {
-                    break;
-                }
-
-                //Logger.Log($"Vehicle: {vehicle.Model.Name}, Waypoint collector radius: {waypoint.CollectorRadius}, Distance to waypoint: {vehicle.DistanceTo2D(waypoint.Position)}");
-
-                var collectedVehicle = collectedVehicles.Where(cv => cv.Vehicle == vehicle).FirstOrDefault();
-                if(collectedVehicle == null)
-                {
-                    //SetVehicleAndDriverPersistence(vehicle);
-                    CollectedVehicle newCollectedVehicle = AddVehicleToCollection(path, waypoint, vehicle);
-                    //Logger.Log($"Vehicle's front position distance to waypoint: {vehicle.FrontPosition.DistanceTo2D(waypoint.Position)}, collector radius: {waypoint.CollectorRadius}");
-                    GameFiber AssignTasksFiber = new GameFiber(() => AITasking.AssignWaypointTasks(newCollectedVehicle, path, waypoint));
-                    AssignTasksFiber.Start();
-                }
-            }
-
-            Vehicle[] GetNearbyVehiclesForCollection(Vector3 collectorWaypointPosition, float collectorRadius)
-            {
-                return (from v in World.GetAllVehicles() where v.FrontPosition.DistanceTo2D(collectorWaypointPosition) <= collectorRadius && Math.Abs(collectorWaypointPosition.Z - v.Position.Z) < 3 && v.IsValidForCollection() select v).ToArray();
-            }
-        }
-
-        private static CollectedVehicle AddVehicleToCollection(Path path, Waypoint waypoint, Vehicle v)
-        {
-            var collectedVehicle = new CollectedVehicle(v, path, waypoint);
-            collectedVehicles.Add(collectedVehicle);
-            Logger.Log($"Added {v.Model.Name} to collection from path {path.Number} waypoint {waypoint.Number}.");
-            return collectedVehicle;
-        }
-
-        private static bool IsValidForCollection(this Vehicle v)
-        {
-            if(v && v.Speed > 1 && v.IsOnAllWheels && v.IsEngineOn && v != Game.LocalPlayer.Character.CurrentVehicle && v != Game.LocalPlayer.Character.LastVehicle && (v.IsCar || v.IsBike || v.IsBicycle || v.IsQuadBike) && !v.IsSirenOn && !collectedVehicles.Any(cv => cv?.Vehicle == v))
-            {
-                if(v.HasDriver && v.Driver && !v.Driver.IsAlive)
-                {
-                    return false;
-                }
-                if (!v.HasDriver)
-                {
-                    v.CreateRandomDriver();
-                    while (!v.HasDriver)
-                    {
-                        GameFiber.Yield();
-                    }
-                    if(v && v.Driver)
-                    {
-                        //var driverBlip = v.Driver.AttachBlip();
-                        //driverBlip.Color = Color.Green;
-                        //driverBlip.Scale = 0.25f;
-                        v.Driver.IsPersistent = true;
-                        v.Driver.BlockPermanentEvents = true;
-                        //Logger.Log($"A missing driver was created for {v.Model.Name}.");
-                    }
-                    else
-                    {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-    }
-}