Revert "device updates"

This reverts commit 8e66e291b58078755981a97d2f994a8a36dac31c.