stripped location stuff from main activity