webapp: some cleanup for flow creation