NXP-15421: Remove code added for debug purpose