cleanup + update status