Remove unnecessary maps call