Change datafile to the datafile that is referenced in the config file
Remove obsolete comments