Removed unnecesary mappings