NXP-13009 fixup components tear down