Revert "Make multiple storages"

This reverts commit e0b98fe9b75f8a2d87e182d3feaa009aaee27a42.
Multiple storage implementation try2