remove device settings that sh.. don't work

Change-Id: Ie04b361bf84a8e6385e9dee47878311f02db2e78