Settings: cleanup

Change-Id: I31714aae8e2aeccc38265934b1f143d15dac5ce0