Remove terms helpers. Cleanup person model methods.