Kill dead code
Refactor
Add app.storage