Cleaning up old references