Cleanup

settling loop & update cancel query