NXBT-569 - take profile and system properties into account
cleanup