diff --git a/amarillo/plugins/enhancer/models/gtfs.py b/amarillo/plugins/enhancer/models/gtfs.py
index 33d38a0..ee7f701 100644
--- a/amarillo/plugins/enhancer/models/gtfs.py
+++ b/amarillo/plugins/enhancer/models/gtfs.py
@@ -1,4 +1,3 @@
-# TODO: move to enhancer
 from collections import namedtuple
 from datetime import timedelta
 
diff --git a/amarillo/plugins/enhancer/services/trips.py b/amarillo/plugins/enhancer/services/trips.py
index c63a810..6faa749 100644
--- a/amarillo/plugins/enhancer/services/trips.py
+++ b/amarillo/plugins/enhancer/services/trips.py
@@ -1,11 +1,10 @@
 from amarillo.plugins.enhancer.models.gtfs import GtfsTimeDelta, GtfsStopTime
-from amarillo.models.Carpool import MAX_STOPS_PER_TRIP, Carpool, Weekday, StopTime, PickupDropoffType
+from amarillo.models.Carpool import MAX_STOPS_PER_TRIP, Carpool, Weekday, StopTime, PickupDropoffType, Driver, RidesharingInfo
 from amarillo.services.config import config
 from amarillo.plugins.enhancer.services.gtfs_constants import *
 from amarillo.plugins.enhancer.services.routing import RoutingService, RoutingException
 from amarillo.plugins.enhancer.services.stops import is_carpooling_stop
 from amarillo.utils.utils import assert_folder_exists, is_older_than_days, yesterday, geodesic_distance_in_m
-from amarillo.models.Carpool import Driver, RidesharingInfo
 from shapely.geometry import Point, LineString, box
 from geojson_pydantic.geometries import LineString as GeoJSONLineString
 from datetime import datetime, timedelta
@@ -18,7 +17,6 @@ logger = logging.getLogger(__name__)
 
 class Trip:
 
-    # TODO: add driver attributes, additional ridesharing info
     def __init__(self, trip_id, route_name, headsign, url, calendar, departureTime, path, agency, lastUpdated, stop_times, driver: Driver, additional_ridesharing_info: RidesharingInfo, bbox):
         if isinstance(calendar, set):
             self.runs_regularly = True