Move the dropping of principals to the finalizer