Removed storage

I can see the argument for removing storage, it's packed with enough
stuff as it it.