Revert "Add storage selection (2/2)"

 * Not needed.

This reverts commit bffa11174ba8f85ada239e3044b441d61ac4c3ba.

Change-Id: Ibf1dfa1fc70dba5a5cc1cb2cf16d0e25de74f376