Removed a load of unneeded mappings