Cleaning up client flow