Follow up on fixed persistence:
 - turned local storage back on.
 - code cleanup.