Fix storage bug and clean up.

Was removing saved location on app launch