remove dictionary comprehensions for 2.6 compatability