upd: cleanup more references