Update to 2.3.1
Use hostname for server name and alias

Hard coding a value that is actually available Ohai doesn't really make sense.
Remove some old stray settings files

I can't see where these are used...