diff --git a/src/page-modules/assistant/layout.tsx b/src/page-modules/assistant/layout.tsx
index 40019df16..751d72204 100644
--- a/src/page-modules/assistant/layout.tsx
+++ b/src/page-modules/assistant/layout.tsx
@@ -18,9 +18,9 @@ import { FocusScope } from '@react-aria/focus';
 import {
   createTripQuery,
   departureDateToDepartureMode,
-  DepartureMode,
   departureModeToDepartureDate,
-} from '@atb/page-modules/assistant';
+} from './utils';
+import { DepartureMode } from './types';
 import SwapButton from '@atb/components/search/swap-button';
 import GeolocationButton from '@atb/components/search/geolocation-button';
 import { AnimatePresence, motion } from 'framer-motion';
diff --git a/src/page-modules/assistant/server/journey-planner/index.ts b/src/page-modules/assistant/server/journey-planner/index.ts
index 9e899b644..42d9e565c 100644
--- a/src/page-modules/assistant/server/journey-planner/index.ts
+++ b/src/page-modules/assistant/server/journey-planner/index.ts
@@ -7,27 +7,19 @@ import {
   TripsNonTransitQueryVariables,
   TripsQuery,
   TripsQueryVariables,
-} from '@atb/page-modules/assistant/server/journey-planner/journey-gql/trip.generated';
-import {
-  Notice,
-  Situation,
-  TripData,
-  tripSchema,
-} from '@atb/page-modules/assistant/server/journey-planner/validators';
+} from './journey-gql/trip.generated';
+import { Notice, Situation, TripData, tripSchema } from './validators';
 import type {
   NonTransitTripData,
   NonTransitTripInput,
   TripInput,
-} from '@atb/page-modules/assistant/types';
+} from '../../types';
 import {
   getTransportModesEnums,
   isTransportModeType,
   isTransportSubmodeType,
 } from '@atb/page-modules/departures/server/journey-planner';
-import {
-  filterOutDuplicates,
-  getCursorByDepartureMode,
-} from '@atb/page-modules/assistant';
+import { filterOutDuplicates, getCursorByDepartureMode } from '../../utils';
 
 const MIN_NUMBER_OF_TRIP_PATTERNS = 8;
 const MAX_NUMBER_OF_SEARCH_ATTEMPTS = 5;
diff --git a/src/page-modules/assistant/trip/index.tsx b/src/page-modules/assistant/trip/index.tsx
index 83bbb5ee4..49c9f04e6 100644
--- a/src/page-modules/assistant/trip/index.tsx
+++ b/src/page-modules/assistant/trip/index.tsx
@@ -13,13 +13,12 @@ import { Typo } from '@atb/components/typography';
 import { GeocoderFeature } from '@atb/page-modules/departures';
 import { TransportModeFilterOption } from '@atb/components/transport-mode-filter/types';
 import { nextTripPatterns } from '../client';
+import { DepartureMode, NonTransitTripData } from '../types';
 import {
-  DepartureMode,
-  NonTransitTripData,
   createTripQuery,
   filterOutDuplicates,
   getCursorByDepartureMode,
-} from '..';
+} from '../utils';
 import { useEffect, useState } from 'react';
 import { getInitialTransportModeFilter } from '@atb/components/transport-mode-filter/utils';
 import { Button } from '@atb/components/button';