Getting rid of old references