Remove some unused mappings and add some cool ones