[DF-4239] - added missed Unregister() calls.