Update/remove old references