Clean some cfg and adding maps