Clean up storage backend

Pluggable backends can now happen :)