Revert "Add storage selection (2/2)"

This reverts commit b3762c4942744fe7fa93a66e3d31d7ffda9d1ba5.
Merge pull request #1 from Nick0703/cm-10.1

Revert "Add storage selection (2/2)"