Remove all .map as they were not working properly. Will add them back in the future