removed calls to map