Revert "Add storage selection (2/2)"

This reverts commit 9d37e04c59ba559bfbc21fa4fc461792e93f08b6.