Improved the clean up of Journeys, still not working on the UI