NXP-11211: remove unused code + format