remove 2.7 set/dict comprehensions