checkpoint remove more stuff