diff --git a/lib/dotcom/trip_plan/related_link.ex b/lib/dotcom/trip_plan/related_link.ex
index fa95d134a3..05225ed07a 100644
--- a/lib/dotcom/trip_plan/related_link.ex
+++ b/lib/dotcom/trip_plan/related_link.ex
@@ -69,7 +69,6 @@ defmodule Dotcom.TripPlan.RelatedLink do
   defp optional_icon(nil), do: []
 
   defp optional_icon(icon_name) do
-    # IO.inspect(icon_name, label: "icon name")
     SvgIconWithCircle.svg_icon_with_circle(%SvgIconWithCircle{icon: icon_name, size: :small})
   end
 
diff --git a/lib/trip_plan/itinerary.ex b/lib/trip_plan/itinerary.ex
index affe72d3e1..7fada75152 100644
--- a/lib/trip_plan/itinerary.ex
+++ b/lib/trip_plan/itinerary.ex
@@ -98,6 +98,7 @@ defmodule TripPlan.Itinerary do
   def intermediate_stop_ids(itinerary) do
     itinerary
     |> Enum.flat_map(&leg_intermediate/1)
+    |> Enum.reject(&is_nil/1)
     |> Enum.uniq()
   end
 
diff --git a/mix.exs b/mix.exs
index dc4629ffd9..487275c812 100644
--- a/mix.exs
+++ b/mix.exs
@@ -105,9 +105,7 @@ defmodule DotCom.Mixfile do
       {:nebulex, "2.6.1"},
       {:nebulex_redis_adapter, "2.4.0"},
       {:open_trip_planner_client,
-       [
-         path: "../open_trip_planner_client"
-       ]},
+       [github: "thecristen/open_trip_planner_client", ref: "plan-parsing"]},
       {:parallel_stream, "1.1.0"},
       # latest version 1.7.12
       {:phoenix, "1.6.16"},
diff --git a/mix.lock b/mix.lock
index 573db6a9c2..a6db4d1067 100644
--- a/mix.lock
+++ b/mix.lock
@@ -62,6 +62,7 @@
   "nimble_ownership": {:hex, :nimble_ownership, "0.3.1", "99d5244672fafdfac89bfad3d3ab8f0d367603ce1dc4855f86a1c75008bce56f", [:mix], [], "hexpm", "4bf510adedff0449a1d6e200e43e57a814794c8b5b6439071274d248d272a549"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
   "nimble_pool": {:hex, :nimble_pool, "1.1.0", "bf9c29fbdcba3564a8b800d1eeb5a3c58f36e1e11d7b7fb2e084a643f645f06b", [:mix], [], "hexpm", "af2e4e6b34197db81f7aad230c1118eac993acc0dae6bc83bac0126d4ae0813a"},
+  "open_trip_planner_client": {:git, "https://github.com/thecristen/open_trip_planner_client.git", "def427177a660ebd58381ffea6d1b669c1b6c913", [ref: "plan-parsing"]},
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
   "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
   "phoenix": {:hex, :phoenix, "1.6.16", "e5bdd18c7a06da5852a25c7befb72246de4ddc289182285f8685a40b7b5f5451", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e15989ff34f670a96b95ef6d1d25bad0d9c50df5df40b671d8f4a669e050ac39"},