CurrentLocation handling changed. Now not stored in NSUserDefault.