Merge "Remove unused config.CONF"