Ritu Commits

- Fixed Location issues
- Fixed Network info call
- Removed unused imports
- Optimized service code