Settings: cleanup

Change-Id: Ib691fb0457311938d606df2ddd9d8379c6794926