NXP-10972: clean up