cleanup
Work in progress to improve the commandline

and remove the settings file to simplify deployment