Cleanup storage adapter

[johannesduesing]

The storage adapter has several problems:

• It's too large a class
• Uses Await.result way to often
• Does not always need to resolve entity trees as deeply as it does

[johannesduesing]

Closed with #25