Add cleanup at the end