Revert "Add DeviceSettings"

This reverts commit 52b995bf56af49fd1b2d716b1d45753d5c10baa5.