Experimental Code Cleanup
Removed Location Service
Trying out removing restart service flags