Claim system, removing unused database