refactored Claim Cleanup to work better on a world-specific basis.