Clean up mappings changes