NEXUS-6537: Simplify flow