NXP-14278: remove unused code, simplify internal APIs