Cleanup and second local storage try. WIP