Merge "removing config files not used anymore"