NXP-16093: cleanup (remove unused code)