got rid of a few unneeded mappings