Revert "Bring in DeviceSettings"

This reverts commit 43469e7661a2bdbefc58da23554b99924ad45b91.