Rid me of old references