NXP-14069: Clean up the addon UserRegistration