Remove use of device type in Cabana classes

[streeve]

Deprecated and planned for removal. Some type/variable style changes as well