Remove dictionary comprehension