[STORAGE] Storage driver cleanup part 2