cleanup and config file
merge