Update to current 10.1 manifest.
Clean up devices.
Merge pull request #1 from IngCr3at1on/cm-10.1

Merging pull into upstream.