localStorage: cleanup
Merge pull request #334 from macbre/localStorage-cleanup

localStorage: cleanup