Remove dict-comprehension