This MR is the part of the initiative to remove all the code related to the legacy storage.
Related issues: