remove storage abstraction