Removed localstorage dependency