clean and prepare the integration

need a merge and delete old configuration file.