Remove dict comprehensions: not supporte by 2.6