Update refrenses to config files
Remove old code