Revert "cm -- device"

This reverts commit eb7d426cb1d05965c5930ecc4be255ca34d0cf4c.