cleaning up user flow