Got rid of persistent storage

Implements blueprint remove-persistent-storage

Change-Id: I640abbf3472eba35e8b456a0ba42c45dc88d3d31