Claim Behavior changes (removed unused comments and others)