Remove more old references