NXP-10717: cleanup and use an unrestricted session