Cleanup leftovers on LocationServiceWrapper.