more code simplification with 1.7 features
try to fix CI failures