Cleaning stuff
Handle new mappings