wip
remove journey code