Updated location tracking toggle

Cleaned up code and removed vestigial functions