remove 2.6 special handling in traits