Remove arrows mappings, add other ones more useful