Revert "Add storage selection (1/2)"

This reverts commit c15de34249b94ce8bb83aeb01670c4b144bfd390.