Quit rather than restart when changing data directory
Remove obsolete code