Fixed removing location and phone state listener