upd: cleanup