Remove commented out code.
Remove coupling on data._id by using our own pId variable.