Cleaning things up. [1765]