Revert "Assign specific types to block devices."

This reverts commit 70850dfefa342ed3fece3570c3e8868edac294c3.
Revert "label block devices"

This reverts commit 89859731447d8ce89f99ee3c93367b693d5d417f.