Remove misleading expectations in map step