NXBT-865: cleanup