[NX-19] simplify