SSP-2332 - Clean up Person API after perf improvements