another try to clean the mapping from the yaml