Cleanup of Settings, Adding LocationManager stub