removing dict comprehensions