fixed the issue where pp-related claimMetadata was not properly cleaned up

Signed-off-by: zhzhuang-zju <[email protected]>

Author: zhzhuang-zju