Remove duplicate settings file

And put both settings files in the same place.