NXP-16176: cleanup
NXP-16093: cleanup