Revert "Include Device Settings"

This reverts commit 0302d4987f1452b9b94bbc5a025a9a56d8f972eb.