NXP-14069: Clean up addon UserRegistration