Revert "LocationService"

This reverts commit 7739e694f44a2d2b45eeaedafdead58a4a2bd522.