fix destructors of storage related classes