Refactor
Rid from TPSharedLocation singleton