NXBT-730: cleanup