Remove old references to Config