new mappings and plugins clean up