refactor workflow, remove wait route, improve trips route