remove remaining bits of devicesettings

Change-Id: I19c16f111d1bea2075ec0c3d22235016eb4d0bb5