NXP-16076: cleanup
NXP-16076: use System property if defined