clean up and new mappings