Private property clean up part 2