NXP-12361: Clean-up tabs