A lot of fixes and refactoring
Removed last location storage features