FIX: 2.6 compatibility COSMITS

cosmetics, remove unnecessary function.
Remove dictionary comprehension.