Cleaning up login flow