Revert "Add storage selection (2/2)"

This reverts commit b3762c4942744fe7fa93a66e3d31d7ffda9d1ba5.