Get rid of Claim stuff

Lets just use entities for now....