Remove person and make it entity