Revert "Extract DeviceSettings"

This reverts commit db0019274d0e792ca076dc1dd1670557f491da83.