Fixed logout issue and removed gelocation code